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

IDEMPIERE-4077 RealizedGainLoss if 2 orgs : force invoice's organization to support the gain or loss

This commit is contained in:
Nicolas Micoud 2019-11-13 14:17:32 +01:00
parent 69c0c2c67b
commit 8e34b8c463
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.adempiere.base/src/org/compiere/acct/Doc_AllocationHdr.java
View File

@ -873,14 +873,17 @@ public class Doc_AllocationHdr extends Doc
description.append(" / ").append(descriptionPay); description.append(" / ").append(descriptionPay);
} }
fl.setDescription(description.toString()); fl.setDescription(description.toString());
fl.setAD_Org_ID(invoice.getAD_Org_ID());
} }
if (invoiceDifference.signum() != 0) { if (invoiceDifference.signum() != 0) {
FactLine fl = fact.createLine (line, invAcct, as.getC_Currency_ID(), invoiceDifference.negate()); FactLine fl = fact.createLine (line, invAcct, as.getC_Currency_ID(), invoiceDifference.negate());
fl.setDescription(descriptionInv.toString()); fl.setDescription(descriptionInv.toString());
fl.setAD_Org_ID(invoice.getAD_Org_ID());
} }
if (paymentDifference.signum() != 0) { if (paymentDifference.signum() != 0) {
FactLine fl = fact.createLine (line, payAcct, as.getC_Currency_ID(), paymentDifference); FactLine fl = fact.createLine (line, payAcct, as.getC_Currency_ID(), paymentDifference);
fl.setDescription(descriptionPay.toString()); fl.setDescription(descriptionPay.toString());
fl.setAD_Org_ID(invoice.getAD_Org_ID());
} }
} }
else else
@ -888,10 +891,12 @@ public class Doc_AllocationHdr extends Doc
if (invoiceDifference.signum() != 0) { if (invoiceDifference.signum() != 0) {
FactLine fl = fact.createLine (line, invAcct, as.getC_Currency_ID(), invoiceDifference); FactLine fl = fact.createLine (line, invAcct, as.getC_Currency_ID(), invoiceDifference);
fl.setDescription(descriptionInv.toString()); fl.setDescription(descriptionInv.toString());
fl.setAD_Org_ID(invoice.getAD_Org_ID());
} }
if (paymentDifference.signum() != 0) { if (paymentDifference.signum() != 0) {
FactLine fl = fact.createLine (line, payAcct, as.getC_Currency_ID(), paymentDifference.negate()); FactLine fl = fact.createLine (line, payAcct, as.getC_Currency_ID(), paymentDifference.negate());
fl.setDescription(descriptionPay.toString()); fl.setDescription(descriptionPay.toString());
fl.setAD_Org_ID(invoice.getAD_Org_ID());
} }
if (acctDifference.signum() != 0) { if (acctDifference.signum() != 0) {
FactLine fl = fact.createLine (line, loss, gain, as.getC_Currency_ID(), acctDifference.negate()); FactLine fl = fact.createLine (line, loss, gain, as.getC_Currency_ID(), acctDifference.negate());
@ -900,6 +905,7 @@ public class Doc_AllocationHdr extends Doc
description.append(" / ").append(descriptionPay); description.append(" / ").append(descriptionPay);
} }
fl.setDescription(description.toString()); fl.setDescription(description.toString());
fl.setAD_Org_ID(invoice.getAD_Org_ID());
} }
} }
return null; return null;