details: https://code.openbravo.com/erp/devel/pi/rev/0ad9eb144124 changeset: 14215:0ad9eb144124 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Thu Nov 10 12:15:42 2011 +0100 summary: Fixes bug 18940: Reconciliation posting does not work: This record is being posted by another process
details: https://code.openbravo.com/erp/devel/pi/rev/0b47af36ef7a changeset: 14216:0b47af36ef7a user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Thu Nov 10 12:16:28 2011 +0100 summary: Fixes bug 18661, 18559 diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 11 ++++ modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml | 22 ++++++++ modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 26 ++++++++++ 3 files changed, 59 insertions(+), 0 deletions(-) diffs (95 lines): diff -r 8b350ade3166 -r 0b47af36ef7a modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_AUXILIARINPUT.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Thu Nov 10 11:42:34 2011 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Thu Nov 10 12:16:28 2011 +0100 @@ -1,5 +1,16 @@ <?xml version='1.0' encoding='UTF-8'?> <data> +<!--21943DF0B89F4AE3AF14A9C06F1181C2--><AD_AUXILIARINPUT> +<!--21943DF0B89F4AE3AF14A9C06F1181C2--> <AD_AUXILIARINPUT_ID><![CDATA[21943DF0B89F4AE3AF14A9C06F1181C2]]></AD_AUXILIARINPUT_ID> +<!--21943DF0B89F4AE3AF14A9C06F1181C2--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--21943DF0B89F4AE3AF14A9C06F1181C2--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--21943DF0B89F4AE3AF14A9C06F1181C2--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--21943DF0B89F4AE3AF14A9C06F1181C2--> <AD_TAB_ID><![CDATA[FF8080813320657F0133209DE21B0042]]></AD_TAB_ID> +<!--21943DF0B89F4AE3AF14A9C06F1181C2--> <NAME><![CDATA[Forced_Table_ID]]></NAME> +<!--21943DF0B89F4AE3AF14A9C06F1181C2--> <CODE><![CDATA[@AD_TABLE_ID@]]></CODE> +<!--21943DF0B89F4AE3AF14A9C06F1181C2--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--21943DF0B89F4AE3AF14A9C06F1181C2--></AD_AUXILIARINPUT> + <!--9D630C9E4C734361BFB09B153EEE3BCB--><AD_AUXILIARINPUT> <!--9D630C9E4C734361BFB09B153EEE3BCB--> <AD_AUXILIARINPUT_ID><![CDATA[9D630C9E4C734361BFB09B153EEE3BCB]]></AD_AUXILIARINPUT_ID> <!--9D630C9E4C734361BFB09B153EEE3BCB--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 8b350ade3166 -r 0b47af36ef7a modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Thu Nov 10 11:42:34 2011 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Thu Nov 10 12:16:28 2011 +0100 @@ -386,6 +386,17 @@ <!--8A4E2745545245ED81BFBC5324648833--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--8A4E2745545245ED81BFBC5324648833--></AD_MESSAGE> +<!--92EC1935A8B947BA83EF82DBD169CA8B--><AD_MESSAGE> +<!--92EC1935A8B947BA83EF82DBD169CA8B--> <AD_MESSAGE_ID><![CDATA[92EC1935A8B947BA83EF82DBD169CA8B]]></AD_MESSAGE_ID> +<!--92EC1935A8B947BA83EF82DBD169CA8B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--92EC1935A8B947BA83EF82DBD169CA8B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--92EC1935A8B947BA83EF82DBD169CA8B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--92EC1935A8B947BA83EF82DBD169CA8B--> <VALUE><![CDATA[APRM_CreditCurrency]]></VALUE> +<!--92EC1935A8B947BA83EF82DBD169CA8B--> <MSGTEXT><![CDATA[For credit generation and/or credit consumption payment currency should map business partner currency: %s]]></MSGTEXT> +<!--92EC1935A8B947BA83EF82DBD169CA8B--> <MSGTYPE><![CDATA[E]]></MSGTYPE> +<!--92EC1935A8B947BA83EF82DBD169CA8B--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--92EC1935A8B947BA83EF82DBD169CA8B--></AD_MESSAGE> + <!--9350C57F0C194634B4FC83028AC4D31D--><AD_MESSAGE> <!--9350C57F0C194634B4FC83028AC4D31D--> <AD_MESSAGE_ID><![CDATA[9350C57F0C194634B4FC83028AC4D31D]]></AD_MESSAGE_ID> <!--9350C57F0C194634B4FC83028AC4D31D--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -551,6 +562,17 @@ <!--B6F8970C7470421FA5375E61D71A8E73--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--B6F8970C7470421FA5375E61D71A8E73--></AD_MESSAGE> +<!--B9F31E06A19240DE87666454DB8A16E1--><AD_MESSAGE> +<!--B9F31E06A19240DE87666454DB8A16E1--> <AD_MESSAGE_ID><![CDATA[B9F31E06A19240DE87666454DB8A16E1]]></AD_MESSAGE_ID> +<!--B9F31E06A19240DE87666454DB8A16E1--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--B9F31E06A19240DE87666454DB8A16E1--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--B9F31E06A19240DE87666454DB8A16E1--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--B9F31E06A19240DE87666454DB8A16E1--> <VALUE><![CDATA[APRM_CreditWithoutBPartner]]></VALUE> +<!--B9F31E06A19240DE87666454DB8A16E1--> <MSGTEXT><![CDATA[Payments without a business partner can not generate/use credit]]></MSGTEXT> +<!--B9F31E06A19240DE87666454DB8A16E1--> <MSGTYPE><![CDATA[E]]></MSGTYPE> +<!--B9F31E06A19240DE87666454DB8A16E1--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--B9F31E06A19240DE87666454DB8A16E1--></AD_MESSAGE> + <!--BBB2F06979BA4A84BC67B134F9155862--><AD_MESSAGE> <!--BBB2F06979BA4A84BC67B134F9155862--> <AD_MESSAGE_ID><![CDATA[BBB2F06979BA4A84BC67B134F9155862]]></AD_MESSAGE_ID> <!--BBB2F06979BA4A84BC67B134F9155862--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 8b350ade3166 -r 0b47af36ef7a modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java Thu Nov 10 11:42:34 2011 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java Thu Nov 10 12:16:28 2011 +0100 @@ -188,6 +188,32 @@ payment.setWriteoffAmount(paymentWriteOfAmount); payment.setProcessed(true); payment.setAPRMProcessPayment("R"); + if (BigDecimal.ZERO.compareTo(payment.getUsedCredit()) != 0 + || BigDecimal.ZERO.compareTo(payment.getGeneratedCredit()) != 0) { + BusinessPartner businessPartner = payment.getBusinessPartner(); + if (businessPartner == null) { + msg.setType("Error"); + msg.setTitle(Utility.messageBD(conProvider, "Error", language)); + msg.setMessage(Utility.parseTranslation(conProvider, vars, language, + "@APRM_CreditWithoutBPartner@")); + bundle.setResult(msg); + OBDal.getInstance().rollbackAndClose(); + return; + } else if (!payment + .getCurrency() + .getId() + .equals( + businessPartner.getPriceList() != null ? businessPartner.getPriceList() + .getCurrency().getId() : "")) + msg.setType("Error"); + msg.setTitle(Utility.messageBD(conProvider, "Error", language)); + msg.setMessage(String.format( + Utility.parseTranslation(conProvider, vars, language, "@APRM_CreditCurrency@"), + businessPartner.getPriceList().getCurrency().getISOCode())); + bundle.setResult(msg); + OBDal.getInstance().rollbackAndClose(); + return; + } // Execution Process if (dao.isAutomatedExecutionPayment(payment.getAccount(), payment.getPaymentMethod(), payment.isReceipt())) { ------------------------------------------------------------------------------ RSA(R) Conference 2012 Save $700 by Nov 18 Register now http://p.sf.net/sfu/rsa-sfdev2dev1 _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
