details: /erp/devel/main/rev/e73c475cb6e8
changeset: 7123:e73c475cb6e8
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Tue May 04 10:19:16 2010 +0200
summary: Fixed issue 13191. Reverted change in the continueOnError properties
so that upgrade to mp15 works
details: /erp/devel/main/rev/5b5b7d79b0a9
changeset: 7124:5b5b7d79b0a9
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Tue May 04 11:34:01 2010 +0200
summary: Fixes bug 0013205: Accounting for financial account transactions
diffstat:
src-db/database/lib/dbsourcemanager.jar | 0
src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 20
+++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diffs (46 lines):
diff -r 74a23b6142a3 -r 5b5b7d79b0a9 src-db/database/lib/dbsourcemanager.jar
Binary file src-db/database/lib/dbsourcemanager.jar has changed
diff -r 74a23b6142a3 -r 5b5b7d79b0a9
src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java Mon May
03 10:28:18 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java Tue May
04 11:34:01 2010 +0200
@@ -108,9 +108,9 @@
FieldProviderFactory.setField(data[i], "FIN_Payment_Detail_ID",
paymentDetails.get(i)
.getId());
FieldProviderFactory.setField(data[i], "FIN_Payment_ID",
payment.getId());
- FieldProviderFactory.setField(data[0], "DepositAmount",
transaction.getDepositAmount()
+ FieldProviderFactory.setField(data[i], "DepositAmount",
transaction.getDepositAmount()
.toString());
- FieldProviderFactory.setField(data[0], "PaymentAmount",
transaction.getPaymentAmount()
+ FieldProviderFactory.setField(data[i], "PaymentAmount",
transaction.getPaymentAmount()
.toString());
FieldProviderFactory.setField(data[i], "Amount",
paymentDetails.get(i).getAmount()
.toString());
@@ -124,20 +124,20 @@
FieldProviderFactory.setField(data[i], "cBpartnerId",
payment.getBusinessPartner().getId());
FieldProviderFactory.setField(data[i], "Refund",
paymentDetails.get(i).isRefund() ? "Y"
: "N");
- FieldProviderFactory.setField(data[0], "adOrgId",
transaction.getOrganization().getId());
- FieldProviderFactory.setField(data[0], "cGlItemId",
+ FieldProviderFactory.setField(data[i], "adOrgId",
transaction.getOrganization().getId());
+ FieldProviderFactory.setField(data[i], "cGlItemId",
transaction.getGLItem() != null ? transaction.getGLItem().getId()
: data[i]
.getField("cGlItemId"));
- FieldProviderFactory.setField(data[0], "description",
transaction.getDescription());
- FieldProviderFactory.setField(data[0], "cCurrencyId",
transaction.getCurrency().getId());
+ FieldProviderFactory.setField(data[i], "description",
transaction.getDescription());
+ FieldProviderFactory.setField(data[i], "cCurrencyId",
transaction.getCurrency().getId());
if (transaction.getActivity() != null)
- FieldProviderFactory.setField(data[0], "cActivityId",
transaction.getActivity().getId());
+ FieldProviderFactory.setField(data[i], "cActivityId",
transaction.getActivity().getId());
if (transaction.getProject() != null)
- FieldProviderFactory.setField(data[0], "cProjectId",
transaction.getProject().getId());
+ FieldProviderFactory.setField(data[i], "cProjectId",
transaction.getProject().getId());
if (transaction.getSalesCampaign() != null)
- FieldProviderFactory.setField(data[0], "cCampaignId",
transaction.getSalesCampaign()
+ FieldProviderFactory.setField(data[i], "cCampaignId",
transaction.getSalesCampaign()
.getId());
- FieldProviderFactory.setField(data[0], "lineno",
transaction.getLineNo().toString());
+ FieldProviderFactory.setField(data[i], "lineno",
transaction.getLineNo().toString());
}
} finally {
OBContext.getOBContext().setInAdministratorMode(wasAdministrator);
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
