details: https://code.openbravo.com/erp/devel/pi/rev/b92d77dfa7d3 changeset: 14366:b92d77dfa7d3 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Mon Nov 21 09:38:04 2011 +0100 summary: Fixes issue 18752: FIN_AddPayment - savePayment method not managing properly exceptions.
details: https://code.openbravo.com/erp/devel/pi/rev/45ee9420aa7b changeset: 14367:45ee9420aa7b user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Tue Nov 22 11:54:06 2011 +0100 summary: Fixes issue 18612: Assets - create amortization process not calculating properly percetages/amounts. details: https://code.openbravo.com/erp/devel/pi/rev/e3c5594a2f2f changeset: 14368:e3c5594a2f2f user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Wed Nov 23 13:34:12 2011 +0100 summary: Fixes issue 18542: Asset: The currency can be updated in the main tab while the Asset Amortization is already created. details: https://code.openbravo.com/erp/devel/pi/rev/26cf9de39021 changeset: 14369:26cf9de39021 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Wed Nov 23 13:35:29 2011 +0100 summary: Fixes issue 18725: Business partner selector in Purchasing Plan is filtering by customers by default. diffstat: modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java | 65 ++++----- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java | 6 +- src-db/database/model/functions/A_ASSET_POST.xml | 2 +- src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 11 + src-db/database/sourcedata/AD_COLUMN.xml | 1 + src-db/database/sourcedata/AD_WINDOW.xml | 2 +- 6 files changed, 49 insertions(+), 38 deletions(-) diffs (151 lines): diff -r 039b15326db9 -r 26cf9de39021 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java Thu Nov 24 00:36:22 2011 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java Wed Nov 23 13:35:29 2011 +0100 @@ -219,45 +219,40 @@ if (strAction.equals("PRP") || strAction.equals("PPP") || strAction.equals("PRD") || strAction.equals("PPW")) { - try { - message = FIN_AddPayment.processPayment(vars, this, - (strAction.equals("PRP") || strAction.equals("PPP")) ? "P" : "D", payment); - String strNewPaymentMessage = Utility.parseTranslation(this, vars, vars.getLanguage(), - "@PaymentCreated@" + " " + payment.getDocumentNo()) + "."; - message.setMessage(strNewPaymentMessage + " " + message.getMessage()); - if (strDifferenceAction.equals("refund")) { - Boolean newPayment = !payment.getFINPaymentDetailList().isEmpty(); - FIN_Payment refundPayment = FIN_AddPayment.createRefundPayment(this, vars, payment, - refundAmount.negate(), exchangeRate); - OBError auxMessage = FIN_AddPayment.processPayment(vars, this, - (strAction.equals("PRP") || strAction.equals("PPP")) ? "P" : "D", refundPayment); - if (newPayment) { - final String strNewRefundPaymentMessage = Utility.parseTranslation(this, vars, - vars.getLanguage(), - "@APRM_RefundPayment@" + ": " + refundPayment.getDocumentNo()) - + "."; - message.setMessage(strNewRefundPaymentMessage + " " + message.getMessage()); - if (payment.getGeneratedCredit().compareTo(BigDecimal.ZERO) != 0) { - payment.setDescription(payment.getDescription() + strNewRefundPaymentMessage - + "\n"); - OBDal.getInstance().save(payment); - OBDal.getInstance().flush(); - } - } else { - message = auxMessage; + + message = FIN_AddPayment.processPayment(vars, this, + (strAction.equals("PRP") || strAction.equals("PPP")) ? "P" : "D", payment); + String strNewPaymentMessage = Utility.parseTranslation(this, vars, vars.getLanguage(), + "@PaymentCreated@" + " " + payment.getDocumentNo()) + "."; + message.setMessage(strNewPaymentMessage + " " + message.getMessage()); + if (strDifferenceAction.equals("refund")) { + Boolean newPayment = !payment.getFINPaymentDetailList().isEmpty(); + FIN_Payment refundPayment = FIN_AddPayment.createRefundPayment(this, vars, payment, + refundAmount.negate(), exchangeRate); + OBError auxMessage = FIN_AddPayment.processPayment(vars, this, + (strAction.equals("PRP") || strAction.equals("PPP")) ? "P" : "D", refundPayment); + if (newPayment) { + final String strNewRefundPaymentMessage = Utility + .parseTranslation(this, vars, vars.getLanguage(), "@APRM_RefundPayment@" + ": " + + refundPayment.getDocumentNo()) + + "."; + message.setMessage(strNewRefundPaymentMessage + " " + message.getMessage()); + if (payment.getGeneratedCredit().compareTo(BigDecimal.ZERO) != 0) { + payment + .setDescription(payment.getDescription() + strNewRefundPaymentMessage + "\n"); + OBDal.getInstance().save(payment); + OBDal.getInstance().flush(); } - } - - } catch (Exception ex) { - message = Utility.translateError(this, vars, vars.getLanguage(), ex.getMessage()); - log4j.error(ex); - if (!message.isConnectionAvailable()) { - bdErrorConnection(response); - return; + } else { + message = auxMessage; } } } - + } catch (Exception ex) { + message = Utility.translateError(this, vars, vars.getLanguage(), ex.getMessage()); + log4j.error(ex); + bdErrorGeneralPopUp(request, response, "Error", message.getMessage()); + return; } finally { OBContext.restorePreviousMode(); } diff -r 039b15326db9 -r 26cf9de39021 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java Thu Nov 24 00:36:22 2011 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java Wed Nov 23 13:35:29 2011 +0100 @@ -141,7 +141,11 @@ payment = dao.getNewPayment(isReceipt, organization, docType, strPaymentDocumentNo, businessPartner, paymentMethod, finAccount, strPaymentAmount, paymentDate, referenceNo, paymentCurrency, finTxnConvertRate, finTxnAmount); - OBDal.getInstance().flush(); + try { + OBDal.getInstance().flush(); + } catch (Exception e) { + throw new OBException(FIN_Utility.getExceptionMessage(e)); + } } for (FIN_PaymentDetail paymentDetail : payment.getFINPaymentDetailList()) diff -r 039b15326db9 -r 26cf9de39021 src-db/database/model/functions/A_ASSET_POST.xml --- a/src-db/database/model/functions/A_ASSET_POST.xml Thu Nov 24 00:36:22 2011 +0100 +++ b/src-db/database/model/functions/A_ASSET_POST.xml Wed Nov 23 13:35:29 2011 +0100 @@ -212,7 +212,7 @@ FROM A_AMORTIZATIONLINE WHERE A_AMORTIZATIONLINE.A_ASSET_ID = v_Record_ID; IF(v_COUNT=1 AND to_number(v_BEGINING_DATE-v_FIRST_DAY_DATE)<>0) THEN - v_Percentage:=to_number(to_number(TO_DATE('31-12-'||to_char(v_AMORTIZATIONSTARTDATE, 'YYYY'), 'DD-MM-YYYY') -v_AMORTIZATIONSTARTDATE) /(TO_DATE('31-12-'||to_char(v_AMORTIZATIONSTARTDATE, 'YYYY'), 'DD-MM-YYYY') -TO_DATE('01-01-'||to_char(v_AMORTIZATIONSTARTDATE, 'YYYY'), 'DD-MM-YYYY'))) * v_PercentageGeneral; + v_Percentage:=to_number(to_number(TO_DATE('31-12-'||to_char(v_AMORTIZATIONSTARTDATE, 'YYYY'), 'DD-MM-YYYY') -v_AMORTIZATIONSTARTDATE) / (TO_DATE('01-01-'||to_char(to_number(to_char(v_AMORTIZATIONSTARTDATE, 'YYYY')) + 1), 'DD-MM-YYYY') -TO_DATE('01-01-'||to_char(v_AMORTIZATIONSTARTDATE, 'YYYY'), 'DD-MM-YYYY'))) * v_PercentageGeneral; v_USELIFEYEARS:=v_USELIFEYEARS+1; ELSE v_Percentage:=v_PercentageGeneral; diff -r 039b15326db9 -r 26cf9de39021 src-db/database/sourcedata/AD_AUXILIARINPUT.xml --- a/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Thu Nov 24 00:36:22 2011 +0100 +++ b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Wed Nov 23 13:35:29 2011 +0100 @@ -1513,6 +1513,17 @@ <!--ACA00D8708854C3E80E50FE99724C4E8--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--ACA00D8708854C3E80E50FE99724C4E8--></AD_AUXILIARINPUT> +<!--AD306651FEC841DF9D01E831482C6A09--><AD_AUXILIARINPUT> +<!--AD306651FEC841DF9D01E831482C6A09--> <AD_AUXILIARINPUT_ID><![CDATA[AD306651FEC841DF9D01E831482C6A09]]></AD_AUXILIARINPUT_ID> +<!--AD306651FEC841DF9D01E831482C6A09--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--AD306651FEC841DF9D01E831482C6A09--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--AD306651FEC841DF9D01E831482C6A09--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--AD306651FEC841DF9D01E831482C6A09--> <AD_TAB_ID><![CDATA[800078]]></AD_TAB_ID> +<!--AD306651FEC841DF9D01E831482C6A09--> <NAME><![CDATA[existAmortizationLines]]></NAME> +<!--AD306651FEC841DF9D01E831482C6A09--> <CODE><![CDATA[@SQL=select 'Y' from dual where exists (select 1 from a_amortizationline where a_amortizationline.a_asset_id = @A_Asset_ID@)]]></CODE> +<!--AD306651FEC841DF9D01E831482C6A09--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--AD306651FEC841DF9D01E831482C6A09--></AD_AUXILIARINPUT> + <!--AF9E12E94CE24A958FCE3609A8B976AF--><AD_AUXILIARINPUT> <!--AF9E12E94CE24A958FCE3609A8B976AF--> <AD_AUXILIARINPUT_ID><![CDATA[AF9E12E94CE24A958FCE3609A8B976AF]]></AD_AUXILIARINPUT_ID> <!--AF9E12E94CE24A958FCE3609A8B976AF--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 039b15326db9 -r 26cf9de39021 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Thu Nov 24 00:36:22 2011 +0100 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Wed Nov 23 13:35:29 2011 +0100 @@ -140824,6 +140824,7 @@ <!--801065--> <ISPARENT><![CDATA[N]]></ISPARENT> <!--801065--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> <!--801065--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> +<!--801065--> <READONLYLOGIC><![CDATA[@existAmortizationLines@ = 'Y']]></READONLYLOGIC> <!--801065--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> <!--801065--> <SEQNO><![CDATA[61]]></SEQNO> <!--801065--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> diff -r 039b15326db9 -r 26cf9de39021 src-db/database/sourcedata/AD_WINDOW.xml --- a/src-db/database/sourcedata/AD_WINDOW.xml Thu Nov 24 00:36:22 2011 +0100 +++ b/src-db/database/sourcedata/AD_WINDOW.xml Wed Nov 23 13:35:29 2011 +0100 @@ -2422,7 +2422,7 @@ <!--800097--> <DESCRIPTION><![CDATA[Create a comprehensive and organized plan to request purchases over a specified time period.]]></DESCRIPTION> <!--800097--> <HELP><![CDATA[Create a comprehensive and organized plan to request purchases over a specified time period.]]></HELP> <!--800097--> <WINDOWTYPE><![CDATA[M]]></WINDOWTYPE> -<!--800097--> <ISSOTRX><![CDATA[Y]]></ISSOTRX> +<!--800097--> <ISSOTRX><![CDATA[N]]></ISSOTRX> <!--800097--> <PROCESSING><![CDATA[N]]></PROCESSING> <!--800097--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT> <!--800097--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> ------------------------------------------------------------------------------ All the data continuously generated in your IT infrastructure contains a definitive record of customers, application performance, security threats, fraudulent activity, and more. Splunk takes this data and makes sense of it. IT sense. And common sense. http://p.sf.net/sfu/splunk-novd2d _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
