details: https://code.openbravo.com/erp/stable/2.50/rev/922c2a590074 changeset: 9618:922c2a590074 user: Mikel Irurita <mikel.irurita <at> openbravo.com> date: Wed Aug 10 11:35:10 2011 +0200 summary: Format code 2.50 preferences: DocFINReconcliation
details: https://code.openbravo.com/erp/stable/2.50/rev/a3d500824262 changeset: 9619:a3d500824262 user: Mikel Irurita <mikel.irurita <at> openbravo.com> date: Wed Aug 10 11:36:59 2011 +0200 summary: Fixes issue 18239: Posting reconciliation does not take in account trx accounting dimensions diffstat: src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 186 ++++----- 1 files changed, 81 insertions(+), 105 deletions(-) diffs (truncated from 392 to 300 lines): diff -r 3566ab13442f -r a3d500824262 src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java --- a/src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java Mon Aug 08 14:32:35 2011 +0200 +++ b/src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java Wed Aug 10 11:36:59 2011 +0200 @@ -183,8 +183,8 @@ String dateFormat = OBPropertiesProvider.getInstance().getOpenbravoProperties() .getProperty("dateFormat.java"); SimpleDateFormat outputFormat = new SimpleDateFormat(dateFormat); - FieldProviderFactory.setField(data[i], "dateacct", - outputFormat.format(transaction.getDateAcct())); + FieldProviderFactory.setField(data[i], "dateacct", outputFormat.format(transaction + .getDateAcct())); FieldProviderFactory.setField(data[i], "DepositAmount", transaction.getDepositAmount() .toString()); FieldProviderFactory.setField(data[i], "PaymentAmount", transaction.getPaymentAmount() @@ -212,9 +212,7 @@ FieldProviderFactory.setField(data[i], "Refund", paymentDetails.get(i).isRefund() ? "Y" : "N"); FieldProviderFactory.setField(data[i], "adOrgId", transaction.getOrganization().getId()); - FieldProviderFactory.setField( - data[i], - "cGlItemId", + FieldProviderFactory.setField(data[i], "cGlItemId", transaction.getGLItem() != null ? transaction.getGLItem().getId() : data[i] .getField("cGlItemId")); FieldProviderFactory.setField(data[i], "description", transaction.getDescription()); @@ -288,16 +286,14 @@ String dateFormat = OBPropertiesProvider.getInstance().getOpenbravoProperties() .getProperty("dateFormat.java"); SimpleDateFormat outputFormat = new SimpleDateFormat(dateFormat); - FieldProviderFactory.setField(data[i], "dateacct", - outputFormat.format(transaction.getDateAcct())); + FieldProviderFactory.setField(data[i], "dateacct", outputFormat.format(transaction + .getDateAcct())); FieldProviderFactory.setField(data[i], "WriteOffAmt", payment.getWriteoffAmount() .toString()); FieldProviderFactory.setField(data[i], "cBpartnerId", payment.getBusinessPartner() != null ? payment.getBusinessPartner().getId() : ""); FieldProviderFactory.setField(data[i], "adOrgId", transaction.getOrganization().getId()); - FieldProviderFactory.setField( - data[i], - "cGlItemId", + FieldProviderFactory.setField(data[i], "cGlItemId", transaction.getGLItem() != null ? transaction.getGLItem().getId() : data[i] .getField("cGlItemId")); FieldProviderFactory.setField(data[i], "description", transaction.getDescription()); @@ -334,15 +330,13 @@ .toString()); FieldProviderFactory.setField(data[0], "description", transaction.getDescription()); FieldProviderFactory.setField(data[0], "cCurrencyId", transaction.getCurrency().getId()); - FieldProviderFactory - .setField(data[0], "cBpartnerId", (transaction.getFinPayment() == null || transaction - .getFinPayment().getBusinessPartner() == null) ? "" : transaction.getFinPayment() - .getBusinessPartner().getId()); - String dateFormat = OBPropertiesProvider.getInstance().getOpenbravoProperties() - .getProperty("dateFormat.java"); + FieldProviderFactory.setField(data[0], "cBpartnerId", + transaction.getBusinessPartner() != null ? transaction.getBusinessPartner().getId() : ""); + String dateFormat = OBPropertiesProvider.getInstance().getOpenbravoProperties().getProperty( + "dateFormat.java"); SimpleDateFormat outputFormat = new SimpleDateFormat(dateFormat); - FieldProviderFactory.setField(data[0], "dateacct", - outputFormat.format(transaction.getDateAcct())); + FieldProviderFactory.setField(data[0], "dateacct", outputFormat.format(transaction + .getDateAcct())); if (transaction.getActivity() != null) FieldProviderFactory.setField(data[0], "cActivityId", transaction.getActivity().getId()); if (transaction.getProject() != null) @@ -350,6 +344,11 @@ if (transaction.getSalesCampaign() != null) FieldProviderFactory.setField(data[0], "cCampaignId", transaction.getSalesCampaign() .getId()); + if (transaction.getProduct() != null) + FieldProviderFactory.setField(data[0], "mProductId", transaction.getProduct().getId()); + if (transaction.getSalesRegion() != null) + FieldProviderFactory.setField(data[0], "cSalesregionId", transaction.getSalesRegion() + .getId()); FieldProviderFactory.setField(data[0], "lineno", transaction.getLineNo().toString()); } finally { OBContext.restorePreviousMode(); @@ -373,11 +372,11 @@ .toString()); FieldProviderFactory.setField(data[0], "description", transaction.getDescription()); FieldProviderFactory.setField(data[0], "cCurrencyId", transaction.getCurrency().getId()); - String dateFormat = OBPropertiesProvider.getInstance().getOpenbravoProperties() - .getProperty("dateFormat.java"); + String dateFormat = OBPropertiesProvider.getInstance().getOpenbravoProperties().getProperty( + "dateFormat.java"); SimpleDateFormat outputFormat = new SimpleDateFormat(dateFormat); - FieldProviderFactory.setField(data[0], "dateacct", - outputFormat.format(transaction.getDateAcct())); + FieldProviderFactory.setField(data[0], "dateacct", outputFormat.format(transaction + .getDateAcct())); if (transaction.getActivity() != null) FieldProviderFactory.setField(data[0], "cActivityId", transaction.getActivity().getId()); if (transaction.getProject() != null) @@ -502,8 +501,8 @@ C_Currency_ID, line.getPaymentAmount(), line.getDepositAmount(), Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn); else - fact.createLine(line, getAccountFee(as, transaction.getAccount(), conn), C_Currency_ID, - line.getPaymentAmount(), line.getDepositAmount(), Fact_Acct_Group_ID, nextSeqNo(SeqNo), + fact.createLine(line, getAccountFee(as, transaction.getAccount(), conn), C_Currency_ID, line + .getPaymentAmount(), line.getDepositAmount(), Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn); fact.createLine(line, getClearOutAccount(as, transaction.getAccount(), conn), C_Currency_ID, line.getDepositAmount(), line.getPaymentAmount(), Fact_Acct_Group_ID, nextSeqNo(SeqNo), @@ -560,8 +559,8 @@ .isReceipt() ? bpAmountConverted : "", payment.isReceipt() ? bpAmountConverted : "", Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn); } - fact.createLine(line, getAccountReconciliation(conn, payment, as), C_Currency_ID, - payment.isReceipt() ? line.getAmount() : "", !payment.isReceipt() ? line.getAmount() : "", + fact.createLine(line, getAccountReconciliation(conn, payment, as), C_Currency_ID, payment + .isReceipt() ? line.getAmount() : "", !payment.isReceipt() ? line.getAmount() : "", Fact_Acct_Group_ID, "999999", DocumentType, conn); if (!getDocumentPaymentConfirmation(payment) && !getDocumentTransactionConfirmation(transaction)) { @@ -569,12 +568,10 @@ // credit is generated if (payment.getUsedCredit().compareTo(ZERO) != 0 && payment.getGeneratedCredit().compareTo(ZERO) == 0) { - fact.createLine( - line, - getAccountBPartner(payment.getBusinessPartner().getId(), as, payment.isReceipt(), true, - conn), C_Currency_ID, (payment.isReceipt() ? payment.getUsedCredit().toString() - : ""), (payment.isReceipt() ? "" : payment.getUsedCredit().toString()), - Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn); + fact.createLine(line, getAccountBPartner(payment.getBusinessPartner().getId(), as, payment + .isReceipt(), true, conn), C_Currency_ID, (payment.isReceipt() ? payment + .getUsedCredit().toString() : ""), (payment.isReceipt() ? "" : payment.getUsedCredit() + .toString()), Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn); } } SeqNo = "0"; @@ -611,17 +608,15 @@ DocumentType, conn); bpAmount = bpAmount.add(new BigDecimal(line.getWriteOffAmt())); } - fact.createLine( - line, - getAccountBPartner( - (line.m_C_BPartner_ID == null || line.m_C_BPartner_ID.equals("")) ? this.C_BPartner_ID - : line.m_C_BPartner_ID, as, isReceipt, isPrepayment, conn), C_Currency_ID, + fact.createLine(line, getAccountBPartner( + (line.m_C_BPartner_ID == null || line.m_C_BPartner_ID.equals("")) ? this.C_BPartner_ID + : line.m_C_BPartner_ID, as, isReceipt, isPrepayment, conn), C_Currency_ID, !isReceipt ? line.getAmount() : "", isReceipt ? line.getAmount() : "", Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn); } else { - fact.createLine(line, getAccountPayment(conn, payment, as), C_Currency_ID, - !isReceipt ? line.getAmount() : "", isReceipt ? line.getAmount() : "", - Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn); + fact.createLine(line, getAccountPayment(conn, payment, as), C_Currency_ID, !isReceipt ? line + .getAmount() : "", isReceipt ? line.getAmount() : "", Fact_Acct_Group_ID, + nextSeqNo(SeqNo), DocumentType, conn); } SeqNo = "0"; @@ -660,10 +655,8 @@ : ""; } if (line.cGlItemId != null && !"".equals(line.cGlItemId)) { - fact.createLine( - line, - getAccountGLItem(OBDal.getInstance().get(GLItem.class, line.cGlItemId), as, isReceipt, - conn), C_Currency_ID, (isReceipt ? "" : bpAmount.toString()), + fact.createLine(line, getAccountGLItem(OBDal.getInstance().get(GLItem.class, line.cGlItemId), + as, isReceipt, conn), C_Currency_ID, (isReceipt ? "" : bpAmount.toString()), (isReceipt ? bpAmount.toString() : ""), Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn); } else { @@ -706,11 +699,9 @@ C_Currency_ID, line.getPaymentAmount(), line.getDepositAmount(), Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn); else if (!"".equals(line.getCGlItemId())) - fact.createLine( - line, - getAccountGLItem(OBDal.getInstance().get(GLItem.class, line.getCGlItemId()), as, - isReceipt, conn), C_Currency_ID, line.getPaymentAmount(), line.getDepositAmount(), - Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn); + fact.createLine(line, getAccountGLItem(OBDal.getInstance().get(GLItem.class, + line.getCGlItemId()), as, isReceipt, conn), C_Currency_ID, line.getPaymentAmount(), line + .getDepositAmount(), Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn); fact.createLine(line, getAccount(conn, transaction.getAccount(), as, isReceipt), C_Currency_ID, line.getDepositAmount(), line.getPaymentAmount(), Fact_Acct_Group_ID, "999999", DocumentType, conn); @@ -758,8 +749,8 @@ OBCriteria<FinAccPaymentMethod> obCriteria = OBDal.getInstance().createCriteria( FinAccPaymentMethod.class); obCriteria.add(Expression.eq(FinAccPaymentMethod.PROPERTY_ACCOUNT, payment.getAccount())); - obCriteria.add(Expression.eq(FinAccPaymentMethod.PROPERTY_PAYMENTMETHOD, - payment.getPaymentMethod())); + obCriteria.add(Expression.eq(FinAccPaymentMethod.PROPERTY_PAYMENTMETHOD, payment + .getPaymentMethod())); obCriteria.setFilterOnReadableClients(false); obCriteria.setFilterOnReadableOrganization(false); List<FinAccPaymentMethod> lines = obCriteria.list(); @@ -807,8 +798,8 @@ OBCriteria<FinAccPaymentMethod> obCriteria = OBDal.getInstance().createCriteria( FinAccPaymentMethod.class); obCriteria.add(Expression.eq(FinAccPaymentMethod.PROPERTY_ACCOUNT, payment.getAccount())); - obCriteria.add(Expression.eq(FinAccPaymentMethod.PROPERTY_PAYMENTMETHOD, - payment.getPaymentMethod())); + obCriteria.add(Expression.eq(FinAccPaymentMethod.PROPERTY_PAYMENTMETHOD, payment + .getPaymentMethod())); obCriteria.setFilterOnReadableClients(false); obCriteria.setFilterOnReadableOrganization(false); List<FinAccPaymentMethod> lines = obCriteria.list(); @@ -881,8 +872,8 @@ OBCriteria<FinAccPaymentMethod> obCriteria = OBDal.getInstance().createCriteria( FinAccPaymentMethod.class); obCriteria.add(Expression.eq(FinAccPaymentMethod.PROPERTY_ACCOUNT, payment.getAccount())); - obCriteria.add(Expression.eq(FinAccPaymentMethod.PROPERTY_PAYMENTMETHOD, - payment.getPaymentMethod())); + obCriteria.add(Expression.eq(FinAccPaymentMethod.PROPERTY_PAYMENTMETHOD, payment + .getPaymentMethod())); obCriteria.setFilterOnReadableClients(false); obCriteria.setFilterOnReadableOrganization(false); List<FinAccPaymentMethod> lines = obCriteria.list(); @@ -941,12 +932,9 @@ FIN_ReconciliationLine_v.class); obCriteria.add(Expression.eq(FIN_ReconciliationLine_v.PROPERTY_RECONCILIATION, reconciliation)); - obCriteria - .add(Expression.or( - Expression.ge(FIN_ReconciliationLine_v.PROPERTY_ACCOUNTINGDATE, - period.getEndingDate()), - Expression.le(FIN_ReconciliationLine_v.PROPERTY_ACCOUNTINGDATE, - period.getStartingDate()))); + obCriteria.add(Expression.or(Expression.ge( + FIN_ReconciliationLine_v.PROPERTY_ACCOUNTINGDATE, period.getEndingDate()), Expression + .le(FIN_ReconciliationLine_v.PROPERTY_ACCOUNTINGDATE, period.getStartingDate()))); obCriteria.setFilterOnReadableOrganization(false); obCriteria.addOrder(Order.asc(FIN_ReconciliationLine_v.PROPERTY_ACCOUNTINGDATE)); obCriteria.toString(); @@ -988,11 +976,11 @@ FieldProviderFactory.setField(data[0], "C_Doctype_ID", reconciliation.getDocumentType() .getId()); FieldProviderFactory.setField(data[0], "DocumentNo", reconciliation.getDocumentNo()); - String dateFormat = OBPropertiesProvider.getInstance().getOpenbravoProperties() - .getProperty("dateFormat.java"); + String dateFormat = OBPropertiesProvider.getInstance().getOpenbravoProperties().getProperty( + "dateFormat.java"); SimpleDateFormat outputFormat = new SimpleDateFormat(dateFormat); - FieldProviderFactory.setField(data[0], "statementDate", - outputFormat.format(reconciliation.getTransactionDate())); + FieldProviderFactory.setField(data[0], "statementDate", outputFormat.format(reconciliation + .getTransactionDate())); FieldProviderFactory.setField(data[0], "Posted", reconciliation.getPosted()); FieldProviderFactory.setField(data[0], "Processed", reconciliation.isProcessed() ? "Y" : "N"); FieldProviderFactory.setField(data[0], "Processing", reconciliation.isProcessNow() ? "Y" @@ -1021,10 +1009,8 @@ OBCriteria<FIN_FinancialAccountAccounting> accounts = OBDal.getInstance().createCriteria( FIN_FinancialAccountAccounting.class); accounts.add(Expression.eq(FIN_FinancialAccountAccounting.PROPERTY_ACCOUNT, finAccount)); - accounts.add(Expression.eq( - FIN_FinancialAccountAccounting.PROPERTY_ACCOUNTINGSCHEMA, - OBDal.getInstance().get( - org.openbravo.model.financialmgmt.accounting.coa.AcctSchema.class, + accounts.add(Expression.eq(FIN_FinancialAccountAccounting.PROPERTY_ACCOUNTINGSCHEMA, OBDal + .getInstance().get(org.openbravo.model.financialmgmt.accounting.coa.AcctSchema.class, as.m_C_AcctSchema_ID))); accounts.add(Expression.eq(FIN_FinancialAccountAccounting.PROPERTY_ACTIVE, true)); accounts.setFilterOnReadableClients(false); @@ -1049,12 +1035,10 @@ try { OBCriteria<FIN_FinancialAccountAccounting> accounts = OBDal.getInstance().createCriteria( FIN_FinancialAccountAccounting.class); - accounts.add(Expression.eq(FIN_FinancialAccountAccounting.PROPERTY_ACCOUNT, - payment.getAccount())); - accounts.add(Expression.eq( - FIN_FinancialAccountAccounting.PROPERTY_ACCOUNTINGSCHEMA, - OBDal.getInstance().get( - org.openbravo.model.financialmgmt.accounting.coa.AcctSchema.class, + accounts.add(Expression.eq(FIN_FinancialAccountAccounting.PROPERTY_ACCOUNT, payment + .getAccount())); + accounts.add(Expression.eq(FIN_FinancialAccountAccounting.PROPERTY_ACCOUNTINGSCHEMA, OBDal + .getInstance().get(org.openbravo.model.financialmgmt.accounting.coa.AcctSchema.class, as.m_C_AcctSchema_ID))); accounts.add(Expression.eq(FIN_FinancialAccountAccounting.PROPERTY_ACTIVE, true)); accounts.setFilterOnReadableClients(false); @@ -1063,8 +1047,8 @@ OBCriteria<FinAccPaymentMethod> obCriteria = OBDal.getInstance().createCriteria( FinAccPaymentMethod.class); obCriteria.add(Expression.eq(FinAccPaymentMethod.PROPERTY_ACCOUNT, payment.getAccount())); - obCriteria.add(Expression.eq(FinAccPaymentMethod.PROPERTY_PAYMENTMETHOD, - payment.getPaymentMethod())); + obCriteria.add(Expression.eq(FinAccPaymentMethod.PROPERTY_PAYMENTMETHOD, payment + .getPaymentMethod())); obCriteria.setFilterOnReadableClients(false); obCriteria.setFilterOnReadableOrganization(false); List<FinAccPaymentMethod> lines = obCriteria.list(); @@ -1112,10 +1096,8 @@ OBCriteria<FIN_FinancialAccountAccounting> accounts = OBDal.getInstance().createCriteria( FIN_FinancialAccountAccounting.class); accounts.add(Expression.eq(FIN_FinancialAccountAccounting.PROPERTY_ACCOUNT, finAccount)); - accounts.add(Expression.eq( - FIN_FinancialAccountAccounting.PROPERTY_ACCOUNTINGSCHEMA, - OBDal.getInstance().get( - org.openbravo.model.financialmgmt.accounting.coa.AcctSchema.class, ------------------------------------------------------------------------------ uberSVN's rich system and user administration capabilities and model configuration take the hassle out of deploying and managing Subversion and the tools developers use with it. Learn more about uberSVN and get a free download at: http://p.sf.net/sfu/wandisco-dev2dev _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
