details: /erp/stable/2.50/rev/076027044766
changeset: 9375:076027044766
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Fri Apr 15 16:53:17 2011 +0200
summary: Fixes issue 16833: Error when posting an invoice with payments in
different currencies
diffstat:
src-db/database/sourcedata/AD_FIELD.xml | 4 +-
src/org/openbravo/erpCommon/ad_forms/DocInvoice.java | 26 ++++++++++----------
2 files changed, 15 insertions(+), 15 deletions(-)
diffs (93 lines):
diff -r 31fa3266b55b -r 076027044766 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Fri Apr 15 15:21:32 2011 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml Fri Apr 15 16:53:17 2011 +0200
@@ -117283,7 +117283,7 @@
<!--800523--> <AD_COLUMN_ID><![CDATA[800301]]></AD_COLUMN_ID>
<!--800523--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--800523--> <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
-<!--800523--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--800523--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
<!--800523--> <SEQNO><![CDATA[20]]></SEQNO>
<!--800523--> <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
<!--800523--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
@@ -119842,7 +119842,7 @@
<!--800660--> <AD_COLUMN_ID><![CDATA[800301]]></AD_COLUMN_ID>
<!--800660--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--800660--> <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
-<!--800660--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--800660--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
<!--800660--> <SEQNO><![CDATA[20]]></SEQNO>
<!--800660--> <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
<!--800660--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
diff -r 31fa3266b55b -r 076027044766
src/org/openbravo/erpCommon/ad_forms/DocInvoice.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocInvoice.java Fri Apr 15
15:21:32 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/DocInvoice.java Fri Apr 15
16:53:17 2011 +0200
@@ -11,7 +11,7 @@
* Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
* created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved.
* Contributor(s): Openbravo SLU
- * Contributions are Copyright (C) 2001-2009 Openbravo S.L.U.
+ * Contributions are Copyright (C) 2001-2011 Openbravo S.L.U.
******************************************************************************
*/
package org.openbravo.erpCommon.ad_forms;
@@ -286,14 +286,14 @@
fact.createLine(m_debt_payments[i],
getAccountBPartner(C_BPartner_ID, as, true,
m_debt_payments[i].dpStatus, conn), this.C_Currency_ID,
getConvertedAmt(
m_debt_payments[i].Amount,
m_debt_payments[i].C_Currency_ID_From,
- this.C_Currency_ID, DateAcct, "", conn), "",
Fact_Acct_Group_ID, nextSeqNo(SeqNo),
- DocumentType, conn);
+ this.C_Currency_ID, DateAcct, "", AD_Client_ID, AD_Org_ID,
conn), "",
+ Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn);
else
fact.createLine(m_debt_payments[i],
getAccountBPartner(C_BPartner_ID, as, false,
m_debt_payments[i].dpStatus, conn), this.C_Currency_ID, "",
getConvertedAmt(
m_debt_payments[i].Amount,
m_debt_payments[i].C_Currency_ID_From,
- this.C_Currency_ID, DateAcct, "", conn), Fact_Acct_Group_ID,
nextSeqNo(SeqNo),
- DocumentType, conn);
+ this.C_Currency_ID, DateAcct, "", AD_Client_ID, AD_Org_ID,
conn),
+ Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn);
}
else
for (int i = 0; m_payments != null && i < m_payments.length; i++) {
@@ -354,8 +354,8 @@
fact.createLine(m_debt_payments[i],
getAccountBPartner(C_BPartner_ID, as, true,
m_debt_payments[i].dpStatus, conn), this.C_Currency_ID, "",
getConvertedAmt(((amount
.negate())).toPlainString(),
m_debt_payments[i].C_Currency_ID_From,
- this.C_Currency_ID, DateAcct, "", conn), Fact_Acct_Group_ID,
nextSeqNo(SeqNo),
- DocumentType, conn);
+ this.C_Currency_ID, DateAcct, "", AD_Client_ID, AD_Org_ID,
conn), Fact_Acct_Group_ID,
+ nextSeqNo(SeqNo), DocumentType, conn);
}
else
for (int i = 0; m_payments != null && i < m_payments.length; i++) {
@@ -415,14 +415,14 @@
fact.createLine(m_debt_payments[i],
getAccountBPartner(C_BPartner_ID, as, true,
m_debt_payments[i].dpStatus, conn), this.C_Currency_ID,
getConvertedAmt(
m_debt_payments[i].Amount,
m_debt_payments[i].C_Currency_ID_From,
- this.C_Currency_ID, DateAcct, "", conn), "",
Fact_Acct_Group_ID, nextSeqNo(SeqNo),
- DocumentType, conn);
+ this.C_Currency_ID, DateAcct, "", AD_Client_ID, AD_Org_ID,
conn), "",
+ Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn);
else
fact.createLine(m_debt_payments[i],
getAccountBPartner(C_BPartner_ID, as, false,
m_debt_payments[i].dpStatus, conn), this.C_Currency_ID, "",
getConvertedAmt(
m_debt_payments[i].Amount,
m_debt_payments[i].C_Currency_ID_From,
- this.C_Currency_ID, DateAcct, "", conn), Fact_Acct_Group_ID,
nextSeqNo(SeqNo),
- DocumentType, conn);
+ this.C_Currency_ID, DateAcct, "", AD_Client_ID, AD_Org_ID,
conn),
+ Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn);
}
else
for (int i = 0; m_payments != null && i < m_payments.length; i++) {
@@ -486,8 +486,8 @@
fact.createLine(m_debt_payments[i],
getAccountBPartner(C_BPartner_ID, as, false,
m_debt_payments[i].dpStatus, conn), this.C_Currency_ID,
getConvertedAmt(((amount
.negate())).toPlainString(),
m_debt_payments[i].C_Currency_ID_From,
- this.C_Currency_ID, DateAcct, "", conn), "", Fact_Acct_Group_ID,
nextSeqNo(SeqNo),
- DocumentType, conn);
+ this.C_Currency_ID, DateAcct, "", AD_Client_ID, AD_Org_ID,
conn), "",
+ Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn);
}
else
for (int i = 0; m_payments != null && i < m_payments.length; i++) {
------------------------------------------------------------------------------
Benefiting from Server Virtualization: Beyond Initial Workload
Consolidation -- Increasing the use of server virtualization is a top
priority.Virtualization can reduce costs, simplify management, and improve
application availability and disaster protection. Learn more about boosting
the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
