details: https://code.openbravo.com/erp/devel/pi/rev/401047aa8e05 changeset: 25004:401047aa8e05 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Mon Oct 06 11:46:42 2014 +0200 summary: Fixed bug 27753: Tax Payment Unprocess when Generate Payment = Y (ORACLE only)
The extension point when unprocessing a Tax Payment didn't work in Oracle, reason: a SQL query was expecting to receive always a GL Item, but when unprocessing a record, the GL Item is not sent to the extension point. This created an Oracle exception that wasn't properly captured. The solution is to move the SQL query that requires the GL Item inside the processing flow only. details: https://code.openbravo.com/erp/devel/pi/rev/be7a8c0af5dc changeset: 25005:be7a8c0af5dc user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Mon Oct 06 11:25:38 2014 +0200 summary: Fixed bug 26562: Error message Unprocessing TaxPayment related to posted Payment Improved the error message shown when unprocessing a Tax Payment related to a posted Payment. Besides, the Payment field is shown when the Tax Payment is related to a payment to make it easier to identify the payment. Finally the "Generate Payment" field is always shown because it had no sense to hide it when the record was processed. diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml | 12 ++- src-db/database/sourcedata/AD_FIELD.xml | 31 +++++++++- src-db/database/sourcedata/AD_MESSAGE.xml | 12 +++ 3 files changed, 49 insertions(+), 6 deletions(-) diffs (113 lines): diff -r 8792ae5475eb -r be7a8c0af5dc modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml Tue Sep 30 17:15:15 2014 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml Mon Oct 06 11:25:38 2014 +0200 @@ -16,7 +16,7 @@ * 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 portions are Copyright (C) 2010-2014 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ @@ -92,9 +92,7 @@ from c_taxpayment where c_taxpayment_id=p_record_id; - SELECT NAME - INTO v_GLItemName - FROM C_GLITEM WHERE C_GLITEM_ID=p_GLItem; + IF (v_ispayment = 'Y' AND v_processed = 'N') THEN v_ResultStr:='Generating FIN_PAYMENT'; @@ -134,6 +132,10 @@ RAISE_APPLICATION_ERROR(-20000, '@APRM_OUTMULTICURRENCYNOTSUPPORTED@' || ' ' || v_PaymentMethodName || ', ' || '@APRM_INFINANCIALACCOUNT@' || ' ' || v_FinancialAccountName || '.'); END IF; END IF; + + SELECT NAME + INTO v_GLItemName + FROM C_GLITEM WHERE C_GLITEM_ID=p_GLItem; INSERT INTO fin_payment( fin_payment_id, ad_client_id, ad_org_id, created, createdby, @@ -209,7 +211,7 @@ ELSIF (v_ispayment = 'Y' AND v_Processed = 'Y') THEN select posted into v_posted from FIN_PAYMENT where FIN_PAYMENT_ID = v_FIN_PAYMENT_ID; if v_posted = 'Y' then - RAISE_APPLICATION_ERROR(-20000, '@PostedDocument@') ; + RAISE_APPLICATION_ERROR(-20000, '@RelatedPaymentPosted@') ; end if; select count(*) INTO v_Count from fin_finacc_transaction diff -r 8792ae5475eb -r be7a8c0af5dc src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml Tue Sep 30 17:15:15 2014 +0200 +++ b/src-db/database/sourcedata/AD_FIELD.xml Mon Oct 06 11:25:38 2014 +0200 @@ -167472,7 +167472,6 @@ <!--1002100196--> <AD_COLUMN_ID><![CDATA[1002100053]]></AD_COLUMN_ID> <!--1002100196--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> <!--1002100196--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> -<!--1002100196--> <DISPLAYLOGIC><![CDATA[@Processed@='N']]></DISPLAYLOGIC> <!--1002100196--> <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH> <!--1002100196--> <ISREADONLY><![CDATA[N]]></ISREADONLY> <!--1002100196--> <SEQNO><![CDATA[90]]></SEQNO> @@ -264894,6 +264893,36 @@ <!--B69E1F6A0B104339B0FDAB3F65C905EB--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> <!--B69E1F6A0B104339B0FDAB3F65C905EB--></AD_FIELD> +<!--B6A10E91CE4E49D5BBF649EBC2414ED9--><AD_FIELD> +<!--B6A10E91CE4E49D5BBF649EBC2414ED9--> <AD_FIELD_ID><![CDATA[B6A10E91CE4E49D5BBF649EBC2414ED9]]></AD_FIELD_ID> +<!--B6A10E91CE4E49D5BBF649EBC2414ED9--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--B6A10E91CE4E49D5BBF649EBC2414ED9--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--B6A10E91CE4E49D5BBF649EBC2414ED9--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--B6A10E91CE4E49D5BBF649EBC2414ED9--> <NAME><![CDATA[Payment]]></NAME> +<!--B6A10E91CE4E49D5BBF649EBC2414ED9--> <DESCRIPTION><![CDATA[Payment event]]></DESCRIPTION> +<!--B6A10E91CE4E49D5BBF649EBC2414ED9--> <HELP><![CDATA[Payment event]]></HELP> +<!--B6A10E91CE4E49D5BBF649EBC2414ED9--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> +<!--B6A10E91CE4E49D5BBF649EBC2414ED9--> <AD_TAB_ID><![CDATA[1002100011]]></AD_TAB_ID> +<!--B6A10E91CE4E49D5BBF649EBC2414ED9--> <AD_COLUMN_ID><![CDATA[60CA42CC2D6246D6AF02CFED573960F1]]></AD_COLUMN_ID> +<!--B6A10E91CE4E49D5BBF649EBC2414ED9--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> +<!--B6A10E91CE4E49D5BBF649EBC2414ED9--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--B6A10E91CE4E49D5BBF649EBC2414ED9--> <DISPLAYLOGIC><![CDATA[@FIN_Payment_ID@!'']]></DISPLAYLOGIC> +<!--B6A10E91CE4E49D5BBF649EBC2414ED9--> <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH> +<!--B6A10E91CE4E49D5BBF649EBC2414ED9--> <ISREADONLY><![CDATA[Y]]></ISREADONLY> +<!--B6A10E91CE4E49D5BBF649EBC2414ED9--> <SEQNO><![CDATA[130]]></SEQNO> +<!--B6A10E91CE4E49D5BBF649EBC2414ED9--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> +<!--B6A10E91CE4E49D5BBF649EBC2414ED9--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> +<!--B6A10E91CE4E49D5BBF649EBC2414ED9--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--B6A10E91CE4E49D5BBF649EBC2414ED9--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION> +<!--B6A10E91CE4E49D5BBF649EBC2414ED9--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> +<!--B6A10E91CE4E49D5BBF649EBC2414ED9--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--B6A10E91CE4E49D5BBF649EBC2414ED9--> <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO> +<!--B6A10E91CE4E49D5BBF649EBC2414ED9--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> +<!--B6A10E91CE4E49D5BBF649EBC2414ED9--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> +<!--B6A10E91CE4E49D5BBF649EBC2414ED9--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--B6A10E91CE4E49D5BBF649EBC2414ED9--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +<!--B6A10E91CE4E49D5BBF649EBC2414ED9--></AD_FIELD> + <!--B6A7DCF4BA1B4A889556DE12FB796968--><AD_FIELD> <!--B6A7DCF4BA1B4A889556DE12FB796968--> <AD_FIELD_ID><![CDATA[B6A7DCF4BA1B4A889556DE12FB796968]]></AD_FIELD_ID> <!--B6A7DCF4BA1B4A889556DE12FB796968--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 8792ae5475eb -r be7a8c0af5dc src-db/database/sourcedata/AD_MESSAGE.xml --- a/src-db/database/sourcedata/AD_MESSAGE.xml Tue Sep 30 17:15:15 2014 +0200 +++ b/src-db/database/sourcedata/AD_MESSAGE.xml Mon Oct 06 11:25:38 2014 +0200 @@ -21702,6 +21702,18 @@ <!--92320BA042AA4CB5A0273A5AB2149602--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> <!--92320BA042AA4CB5A0273A5AB2149602--></AD_MESSAGE> +<!--92371997B6B5418E9A7AAA952A7429CE--><AD_MESSAGE> +<!--92371997B6B5418E9A7AAA952A7429CE--> <AD_MESSAGE_ID><![CDATA[92371997B6B5418E9A7AAA952A7429CE]]></AD_MESSAGE_ID> +<!--92371997B6B5418E9A7AAA952A7429CE--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--92371997B6B5418E9A7AAA952A7429CE--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--92371997B6B5418E9A7AAA952A7429CE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--92371997B6B5418E9A7AAA952A7429CE--> <VALUE><![CDATA[RelatedPaymentPosted]]></VALUE> +<!--92371997B6B5418E9A7AAA952A7429CE--> <MSGTEXT><![CDATA[The Payment related to the Tax Payment you are trying to unprocess is posted. To be able to unprocess it you need to unpost that payment first.]]></MSGTEXT> +<!--92371997B6B5418E9A7AAA952A7429CE--> <MSGTYPE><![CDATA[E]]></MSGTYPE> +<!--92371997B6B5418E9A7AAA952A7429CE--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--92371997B6B5418E9A7AAA952A7429CE--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> +<!--92371997B6B5418E9A7AAA952A7429CE--></AD_MESSAGE> + <!--924D7DB6952C421094911AFACFDCED7F--><AD_MESSAGE> <!--924D7DB6952C421094911AFACFDCED7F--> <AD_MESSAGE_ID><![CDATA[924D7DB6952C421094911AFACFDCED7F]]></AD_MESSAGE_ID> <!--924D7DB6952C421094911AFACFDCED7F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> ------------------------------------------------------------------------------ Slashdot TV. Videos for Nerds. Stuff that Matters. http://pubads.g.doubleclick.net/gampad/clk?id=160591471&iu=/4140/ostg.clktrk _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
