details: /erp/devel/main/rev/2691c857479e
changeset: 8425:2691c857479e
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Wed Sep 15 17:02:21 2010 +0200
summary: Fixes accounting for credit in reconciliation
details: /erp/devel/main/rev/26952fae0077
changeset: 8426:26952fae0077
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Wed Sep 15 22:14:59 2010 +0000
summary: CI: promote changesets from pi to main
diffstat:
src-db/database/sourcedata/AD_MODULE.xml | 2 +-
src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 6 ++++++
2 files changed, 7 insertions(+), 1 deletions(-)
diffs (35 lines):
diff -r 71cf3dcc3b33 -r 26952fae0077 src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml Wed Sep 15 15:38:15 2010 +0200
+++ b/src-db/database/sourcedata/AD_MODULE.xml Wed Sep 15 22:14:59 2010 +0000
@@ -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.18350]]></VERSION>
+<!--0--> <VERSION><![CDATA[2.50.18425]]></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>
diff -r 71cf3dcc3b33 -r 26952fae0077
src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java Wed Sep
15 15:38:15 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java Wed Sep
15 22:14:59 2010 +0000
@@ -156,6 +156,10 @@
OBContext.setAdminMode();
try {
for (int i = 0; i < data.length; i++) {
+ // Details refunded used credit are excluded as the entry will be
created using the credit
+ // used
+ if (paymentDetails.get(i).isRefund() &&
paymentDetails.get(i).isPrepayment())
+ continue;
data[i] = new FieldProviderFactory(new HashMap());
FieldProviderFactory.setField(data[i], "FIN_Reconciliation_ID",
transaction
.getReconciliation().getId());
@@ -445,6 +449,8 @@
else if (!getDocumentPaymentConfirmation(payment)) {
FieldProviderFactory[] data =
loadLinesPaymentDetailsFieldProvider(transaction);
for (int i = 0; i < data.length; i++) {
+ if (data[i] == null)
+ continue;
FIN_PaymentDetail paymentDetail =
OBDal.getInstance().get(FIN_PaymentDetail.class,
data[i].getField("FIN_Payment_Detail_ID"));
fact = createFactPaymentDetails(line, paymentDetail, as, conn, fact,
Fact_Acct_Group_ID);
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
