details: /erp/devel/main/rev/4b170f235044
changeset: 6736:4b170f235044
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Tue Mar 16 19:38:50 2010 +0100
summary: Fixes issue 12574: Uncorrect gl entry in cancelled settlement
details: /erp/devel/main/rev/acdaec12dda3
changeset: 6737:acdaec12dda3
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Wed Mar 17 14:01:11 2010 +0100
summary: Merge stable changesets from int to main
details: /erp/devel/main/rev/83c618c2aa79
changeset: 6738:83c618c2aa79
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Wed Mar 17 14:01:13 2010 +0100
summary: Update AD_MODULE version for obx generation
diffstat:
src-db/database/sourcedata/AD_MODULE.xml | 4 +-
src/org/openbravo/erpCommon/ad_forms/DocPayment.java | 18 ++++++++++----
src/org/openbravo/erpCommon/ad_forms/DocPayment_data.xsql | 4 +-
3 files changed, 17 insertions(+), 9 deletions(-)
diffs (70 lines):
diff -r 21e4581bac73 -r 83c618c2aa79 src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml Tue Mar 16 11:21:49 2010 +0100
+++ b/src-db/database/sourcedata/AD_MODULE.xml Wed Mar 17 14:01:13 2010 +0100
@@ -6,7 +6,7 @@
<!--0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--0--> <NAME><![CDATA[core]]></NAME>
-<!--0--> <VERSION><![CDATA[2.50.16510]]></VERSION>
+<!--0--> <VERSION><![CDATA[2.50.16737]]></VERSION>
<!--0--> <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
<!--0--> <HELP><![CDATA[Core module is the base one, all developments in core
are included as part of the standard Openbravo ERP.]]></HELP>
<!--0--> <URL><![CDATA[www.openbravo.com]]></URL>
@@ -21,7 +21,7 @@
<!--0--> <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
<!--0--> <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
<!--0--> <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
-<!--0--> <VERSION_LABEL><![CDATA[dev]]></VERSION_LABEL>
+<!--0--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
<!--0--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
<!--0--></AD_MODULE>
diff -r 21e4581bac73 -r 83c618c2aa79
src/org/openbravo/erpCommon/ad_forms/DocPayment.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocPayment.java Tue Mar 16
11:21:49 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/DocPayment.java Wed Mar 17
14:01:13 2010 +0100
@@ -306,11 +306,19 @@
DocLine_Payment lineAux = DocLine_Payment.clone(line);
lineAux.setM_C_WithHolding_ID(data[j].cWithholdingId);
lineAux.setM_C_Tax_ID(data[j].cTaxId);
- fact.createLine(lineAux, new Account(conn,
- (lineAux.isReceipt.equals("Y") ? data[j].creditAcct :
data[j].debitAcct)),
- C_Currency_ID, (amountdebit.equals("0") ? "" : amountdebit),
(amountcredit
- .equals("0") ? "" : amountcredit), Fact_Acct_Group_ID,
nextSeqNo(SeqNo),
- DocumentType, conn);
+
+ if (data[j].statusInitial.equals(data[j].status)) {
+ fact.createLine(lineAux, new Account(conn,
+ (lineAux.isReceipt.equals("Y") ? data[j].creditAcct :
data[j].debitAcct)),
+ C_Currency_ID, (amountdebit.equals("0") ? "" : amountdebit),
(amountcredit
+ .equals("0") ? "" : amountcredit), Fact_Acct_Group_ID,
nextSeqNo(SeqNo),
+ DocumentType, conn);
+ } else {
+ fact.createLine(lineAux,
getAccountBPartner(lineAux.m_C_BPartner_ID, as,
+ lineAux.isReceipt.equals("Y"), lineAux.dpStatus, conn),
C_Currency_ID,
+ (amountdebit.equals("0") ? "" : amountdebit),
(amountcredit.equals("0") ? ""
+ : amountcredit), Fact_Acct_Group_ID, nextSeqNo(SeqNo),
DocumentType, conn);
+ }
}
}
} // END debt-payment conditions
diff -r 21e4581bac73 -r 83c618c2aa79
src/org/openbravo/erpCommon/ad_forms/DocPayment_data.xsql
--- a/src/org/openbravo/erpCommon/ad_forms/DocPayment_data.xsql Tue Mar 16
11:21:49 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/DocPayment_data.xsql Wed Mar 17
14:01:13 2010 +0100
@@ -28,7 +28,7 @@
'' AS PROCESSING, '' AS PROCESSED, '' AS POSTED, '' AS C_PROJECT_ID,
'' AS C_CAMPAIGN_ID, '' AS C_ACTIVITY_ID,
'' AS USER1_ID, '' AS USER2_ID, '' AS CREATEFROM, '' AS C_CURRENCY_ID,
'' AS CANCELEDNOTCHARGEAMT, '' AS GENERATEDAMT,
'' AS CHARGEDAMT, '' AS DESCRIPTION, '' AS CREATEFILE, '' AS DATEACCT,
'' AS SETTLEMENTTYPE, '' AS CREDIT_ACCT, '' AS DEBIT_ACCT,
- '' AS AMOUNTDEBIT, '' AS AMOUNTCREDIT, '' AS AMOUNT, '' AS C_TAX_ID,
'' AS C_WITHHOLDING_ID
+ '' AS AMOUNTDEBIT, '' AS AMOUNTCREDIT, '' AS AMOUNT, '' AS C_TAX_ID,
'' AS C_WITHHOLDING_ID, '' AS STATUS, '' AS STATUS_INITIAL
FROM DUAL
]]>
</Sql>
@@ -148,7 +148,7 @@
<Sql>
<![CDATA[
SELECT B.AMOUNTCREDIT AS AMOUNTCREDIT, B.AMOUNTDEBIT AS AMOUNTDEBIT,
GA.Glitem_Credit_Acct AS CREDIT_ACCT, GA.Glitem_Debit_Acct AS DEBIT_ACCT,
- G.C_TAX_ID, G.C_WITHHOLDING_ID
+ G.C_TAX_ID, G.C_WITHHOLDING_ID, D.STATUS, D.STATUS_INITIAL
FROM C_DEBT_PAYMENT D, C_DEBT_PAYMENT_BALANCING B, C_GLITEM G,
C_Glitem_Acct GA
WHERE D.C_DEBT_PAYMENT_ID = B.C_DEBT_PAYMENT_ID
AND B.C_GLITEM_ID = G.C_GLITEM_ID
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
