details: /erp/devel/pi/rev/88affc8192bb changeset: 7181:88affc8192bb 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
details: /erp/devel/pi/rev/a30eb4153067 changeset: 7182:a30eb4153067 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Tue May 04 11:40:52 2010 +0200 summary: Fixes bug 0013206: Call out in column tab is failing diffstat: src/org/openbravo/erpCommon/ad_callouts/SL_Column.java | 14 +++--- src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 20 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diffs (78 lines): diff -r c9286b75879c -r a30eb4153067 src/org/openbravo/erpCommon/ad_callouts/SL_Column.java --- a/src/org/openbravo/erpCommon/ad_callouts/SL_Column.java Tue May 04 10:19:16 2010 +0200 +++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Column.java Tue May 04 11:40:52 2010 +0200 @@ -4,15 +4,15 @@ * Version 1.0 (the "License"), being the Mozilla Public License * Version 1.1 with a permitted attribution clause; you may not use this * file except in compliance with the License. You may obtain a copy of - * the License at http://www.openbravo.com/legal/license.html + * the License at http://www.openbravo.com/legal/license.html * Software distributed under the License is distributed on an "AS IS" * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the * License for the specific language governing rights and limitations - * under the License. - * The Original Code is Openbravo ERP. - * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2010 Openbravo SLU - * All Rights Reserved. + * under the License. + * The Original Code is Openbravo ERP. + * The Initial Developer of the Original Code is Openbravo SLU + * All portions are Copyright (C) 2010 Openbravo SLU + * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ */ @@ -68,7 +68,7 @@ if ("Y".equals(vars.getStringParameter("inpiskey"))) { OBCriteria<Column> keyCriteria = OBDal.getInstance().createCriteria(Column.class); keyCriteria.add(Expression.eq(Column.PROPERTY_TABLE + ".id", vars - .getStringParameter("inpTableId"))); + .getStringParameter("inpadTableId"))); keyCriteria.add(Expression.eq(Column.PROPERTY_KEYCOLUMN, true)); if (keyCriteria.list().size() > 0) { resultData.append("new Array(\"inpiskey\",\"N\"),\n"); diff -r c9286b75879c -r a30eb4153067 src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java --- a/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java Tue May 04 10:19:16 2010 +0200 +++ b/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java Tue May 04 11:40:52 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
