midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AP2-512 Need to post GL Journal for balance forward that includes CAD and USD (IDEMPIERE-3777)

This commit is contained in:
Elaine Tan 2018-08-03 12:00:26 +08:00
parent a82536b2c6
commit e0ab57bb42
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.adempiere.base/src/org/compiere/acct/Doc_GLJournal.java
View File

@ -93,7 +93,10 @@ public class Doc_GLJournal extends Doc
MAccount account = line.getAccount_Combi(); MAccount account = line.getAccount_Combi();
docLine.setAccount (account); docLine.setAccount (account);
// -- Organization of Line was set to Org of Account // -- Organization of Line was set to Org of Account
list.add(docLine); list.add(docLine);
if (docLine.getC_Currency_ID() != getC_Currency_ID())
setIsMultiCurrency(true);
} }
// Return Array // Return Array
int size = list.size(); int size = list.size();

4
org.adempiere.base/src/org/compiere/model/MJournal.java
View File

@ -527,8 +527,8 @@ public class MJournal extends X_GL_Journal implements DocAction
} }
// end BF [2789319] No check of Actual, Budget, Statistical attribute // end BF [2789319] No check of Actual, Budget, Statistical attribute
AmtSourceDr = AmtSourceDr.add(line.getAmtSourceDr()); AmtSourceDr = AmtSourceDr.add(line.getAmtAcctDr()); // multi-currency
AmtSourceCr = AmtSourceCr.add(line.getAmtSourceCr()); AmtSourceCr = AmtSourceCr.add(line.getAmtAcctCr());
} }
setTotalDr(AmtSourceDr); setTotalDr(AmtSourceDr);
setTotalCr(AmtSourceCr); setTotalCr(AmtSourceCr);