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=21cc6dbff22130980ca02e624d2c01ef0d13efbb;hpb=54002a662d97289a739d3cdb9888bbab58a8064f;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 21cc6dbf..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;
@@ -42,6 +42,12 @@ public class ParsedPosting {
     public static ParsedPosting fromLedgerAccount(LedgerTransactionAccount acc) {
         ParsedPosting result = new ParsedPosting();
         result.setPaccount(acc.getAccountName());
+
+        String comment = acc.getComment();
+        if (comment == null)
+            comment = "";
+        result.setPcomment(comment);
+
         ArrayList<ParsedAmount> amounts = new ArrayList<>();
         ParsedAmount amt = new ParsedAmount();
         amt.setAcommodity((acc.getCurrency() == null) ? "" : acc.getCurrency());
@@ -51,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;
@@ -88,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<List<String>> getPtags() {
         return ptags;
@@ -129,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());
     }
 
 }