X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fjson%2Fv1_14%2FParsedPosting.java;h=472fee7c91864aabbcd58b947a4a12383e63eb33;hb=HEAD;hp=f1a6e1ff9975c214f6b0519f86f58f9fe12d2e31;hpb=7ae5407090d9ffe2026775ba9e569014f879b54d;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/json/v1_14/ParsedPosting.java b/app/src/main/java/net/ktnx/mobileledger/json/v1_14/ParsedPosting.java index f1a6e1ff..472fee7c 100644 --- a/app/src/main/java/net/ktnx/mobileledger/json/v1_14/ParsedPosting.java +++ b/app/src/main/java/net/ktnx/mobileledger/json/v1_14/ParsedPosting.java @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.List; @JsonIgnoreProperties(ignoreUnknown = true) -public class ParsedPosting { +public class ParsedPosting extends net.ktnx.mobileledger.json.ParsedPosting { private Void pbalanceassertion; private String pstatus = "Unmarked"; private String paccount; @@ -57,11 +57,13 @@ public class ParsedPosting { qty.setDecimalMantissa(Math.round(acc.getAmount() * 100)); amt.setAquantity(qty); ParsedStyle style = new ParsedStyle(); - style.setAscommodityside('L'); - style.setAscommodityspaced(false); + style.setAscommodityside(getCommoditySide()); + style.setAscommodityspaced(getCommoditySpaced()); style.setAsprecision(2); style.setAsdecimalpoint('.'); amt.setAstyle(style); + if (acc.getCurrency() != null) + amt.setAcommodity(acc.getCurrency()); amounts.add(amt); result.setPamount(amounts); return result; @@ -94,7 +96,7 @@ public class ParsedPosting { return pcomment; } public void setPcomment(String pcomment) { - this.pcomment = pcomment; + this.pcomment = (pcomment == null) ? null : pcomment.trim(); } public List> getPtags() { return ptags; @@ -135,7 +137,8 @@ public class ParsedPosting { public LedgerTransactionAccount asLedgerAccount() { ParsedAmount amt = pamount.get(0); return new LedgerTransactionAccount(paccount, amt.getAquantity() - .asFloat(), amt.getAcommodity()); + .asFloat(), amt.getAcommodity(), + getPcomment()); } }