details: /erp/devel/pi/rev/3591dbfb824b
changeset: 12361:3591dbfb824b
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Tue May 24 09:32:58 2011 +0200
summary: fixes accounting for transactions when payment accounting is
deactivated and payment contains GL Item
diffstat:
src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 19
+++++++--
1 files changed, 14 insertions(+), 5 deletions(-)
diffs (29 lines):
diff -r b2fb89c9dc95 -r 3591dbfb824b
src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java Tue May
24 09:24:55 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java Tue May
24 09:32:58 2011 +0200
@@ -333,11 +333,20 @@
.getWriteOffAmt()), Fact_Acct_Group_ID, nextSeqNo(SeqNo),
DocumentType, conn);
bpamount = bpamount.add(new BigDecimal(line.getWriteOffAmt()));
}
- fact.createLine(line, getAccountBPartner(
- (line.m_C_BPartner_ID == null || line.m_C_BPartner_ID.equals(""))
? this.C_BPartner_ID
- : line.m_C_BPartner_ID, as, isReceipt, isPrepayment, conn),
C_Currency_ID,
- !isReceipt ? bpamount.toString() : "", isReceipt ?
bpamount.toString() : "",
- Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn);
+ // Bug critical: Before GL Item was not taken into account
+ if (!"".equals(line.cGlItemId)) {
+ fact.createLine(line,
getAccountGLItem(OBDal.getInstance().get(GLItem.class,
+ line.getCGlItemId()), as, isReceipt, conn), C_Currency_ID,
line.getPaymentAmount(),
+ line.getDepositAmount(), Fact_Acct_Group_ID, nextSeqNo(SeqNo),
DocumentType, conn);
+ } else {
+ fact
+ .createLine(line,
+ getAccountBPartner((line.m_C_BPartner_ID == null ||
line.m_C_BPartner_ID
+ .equals("")) ? this.C_BPartner_ID :
line.m_C_BPartner_ID, as, isReceipt,
+ isPrepayment, conn), C_Currency_ID, !isReceipt ?
bpamount.toString() : "",
+ isReceipt ? bpamount.toString() : "", Fact_Acct_Group_ID,
nextSeqNo(SeqNo),
+ DocumentType, conn);
+ }
}
// Pre-payment is consumed when Used Credit Amount not equals Zero. When
consuming Credit no
// credit is generated
------------------------------------------------------------------------------
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery,
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now.
http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
