details: https://code.openbravo.com/erp/devel/pi/rev/630ac971a56d changeset: 34186:630ac971a56d user: Mark <markmm82 <at> gmail.com> date: Mon Dec 04 18:33:34 2017 -0500 summary: Fixes issue 37141: Added missed country: Isle of Man
details: https://code.openbravo.com/erp/devel/pi/rev/e048d67b76d3 changeset: 34187:e048d67b76d3 user: David Miguelez <david.miguelez <at> openbravo.com> date: Fri Jun 08 14:03:19 2018 +0200 summary: Fixes issue 36651: Clean up of repeated logs found in try-addpayment jobs for Payment's workflows Functional validations are not logged any more, only not specific exceptions are now logged. Also this fix to avoid to log the same error more than once, log4j.error() is executed only in the processPayment function. details: https://code.openbravo.com/erp/devel/pi/rev/cd3262c908aa changeset: 34188:cd3262c908aa user: David Miguelez <david.miguelez <at> openbravo.com> date: Fri Jun 08 13:56:01 2018 +0200 summary: Fixes issue 32862: "Enable Stock Reservations" preference throws an error when a Sales Order is booked If more than one "Enable Stock Reservations" preference is defined, and are specified to specific users, C_ORDER_POST1 calls AD_GET_PREFERENCE_VALUE function without specify the user, for this reason function throw an exception explaining that Preference can't be found. To fix that, user is specified when the AD_GET_PREFERENCE_VALUE is called. details: https://code.openbravo.com/erp/devel/pi/rev/30563bebf57c changeset: 34189:30563bebf57c user: David Miguelez <david.miguelez <at> openbravo.com> date: Tue Jun 12 10:00:05 2018 +0200 summary: Related to Issue 36651. Code Review changes. Renamed exception variable names diffstat: modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 11 +++-- src-db/database/model/functions/C_ORDER_POST1.xml | 4 +- src-db/database/sourcedata/referencedData/C_COUNTRY.xml | 20 ++++++++++ 3 files changed, 29 insertions(+), 6 deletions(-) diffs (77 lines): diff -r 8e28ba8c1eb9 -r 30563bebf57c 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 Mon Jun 11 13:31:50 2018 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java Tue Jun 12 10:00:05 2018 +0200 @@ -93,7 +93,7 @@ processPayment(payment, strAction, paymentDate, comingFrom, selectedCreditLineIds, doFlush); bundle.setResult(msg); } catch (Exception e) { - log4j.error(e.getMessage()); + log4j.debug(e.getMessage()); msg.setType("Error"); msg.setTitle(OBMessageUtils.messageBD("Error")); msg.setMessage(FIN_Utility.getExceptionMessage(e)); @@ -1137,9 +1137,12 @@ OBContext.restorePreviousMode(); } } - } catch (final Exception e) { - log4j.error(e.getMessage()); - msg = OBMessageUtils.translateError(FIN_Utility.getExceptionMessage(e)).getMessage(); + } catch (final OBException obException) { + throw obException; + } catch (final Exception genericException) { + log4j.error(genericException.getMessage(), genericException); + msg = OBMessageUtils.translateError(FIN_Utility.getExceptionMessage(genericException)) + .getMessage(); throw new OBException(msg); } } diff -r 8e28ba8c1eb9 -r 30563bebf57c src-db/database/model/functions/C_ORDER_POST1.xml --- a/src-db/database/model/functions/C_ORDER_POST1.xml Mon Jun 11 13:31:50 2018 +0000 +++ b/src-db/database/model/functions/C_ORDER_POST1.xml Tue Jun 12 10:00:05 2018 +0200 @@ -676,7 +676,7 @@ FROM ad_preference WHERE property = 'StockReservations'; IF (v_count > 1) THEN - v_dummy := AD_GET_PREFERENCE_VALUE('StockReservations', 'Y', v_client_id, v_org_id, NULL, NULL, NULL); + v_dummy := AD_GET_PREFERENCE_VALUE('StockReservations', 'Y', v_client_id, v_org_id, v_User, NULL, NULL); DBMS_OUTPUT.PUT_LINE('StockReservations preference value: ' || v_dummy); ELSIF (v_count = 1) THEN UPDATE c_orderline @@ -1308,7 +1308,7 @@ WHERE property = 'StockReservations'; IF (v_count > 0) THEN IF (v_count > 1) THEN - v_dummy := AD_GET_PREFERENCE_VALUE('StockReservations', 'Y', v_client_id, v_org_id, NULL, NULL, NULL); + v_dummy := AD_GET_PREFERENCE_VALUE('StockReservations', 'Y', v_client_id, v_org_id, v_User, NULL, NULL); DBMS_OUTPUT.PUT_LINE('StockReservations preference value: ' || v_dummy); END IF; DECLARE diff -r 8e28ba8c1eb9 -r 30563bebf57c src-db/database/sourcedata/referencedData/C_COUNTRY.xml --- a/src-db/database/sourcedata/referencedData/C_COUNTRY.xml Mon Jun 11 13:31:50 2018 +0000 +++ b/src-db/database/sourcedata/referencedData/C_COUNTRY.xml Tue Jun 12 10:00:05 2018 +0200 @@ -5006,4 +5006,24 @@ <!--350--> <IBANCOUNTRY><![CDATA[ME]]></IBANCOUNTRY> <!--350--></C_COUNTRY> +<!--9F557A143F1D4295897F07DFDFDB4074--><C_COUNTRY> +<!--9F557A143F1D4295897F07DFDFDB4074--> <C_COUNTRY_ID><![CDATA[9F557A143F1D4295897F07DFDFDB4074]]></C_COUNTRY_ID> +<!--9F557A143F1D4295897F07DFDFDB4074--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--9F557A143F1D4295897F07DFDFDB4074--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--9F557A143F1D4295897F07DFDFDB4074--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--9F557A143F1D4295897F07DFDFDB4074--> <CREATED><![CDATA[2017-12-04 17:06:39.0]]></CREATED> +<!--9F557A143F1D4295897F07DFDFDB4074--> <CREATEDBY><![CDATA[0]]></CREATEDBY> +<!--9F557A143F1D4295897F07DFDFDB4074--> <UPDATED><![CDATA[2017-12-04 17:06:39.0]]></UPDATED> +<!--9F557A143F1D4295897F07DFDFDB4074--> <UPDATEDBY><![CDATA[0]]></UPDATEDBY> +<!--9F557A143F1D4295897F07DFDFDB4074--> <NAME><![CDATA[Isle of Man]]></NAME> +<!--9F557A143F1D4295897F07DFDFDB4074--> <DESCRIPTION><![CDATA[Isle of Man]]></DESCRIPTION> +<!--9F557A143F1D4295897F07DFDFDB4074--> <COUNTRYCODE><![CDATA[IM]]></COUNTRYCODE> +<!--9F557A143F1D4295897F07DFDFDB4074--> <HASREGION><![CDATA[N]]></HASREGION> +<!--9F557A143F1D4295897F07DFDFDB4074--> <REGIONNAME><![CDATA[State]]></REGIONNAME> +<!--9F557A143F1D4295897F07DFDFDB4074--> <DISPLAYSEQUENCE><![CDATA[@C@, @P@]]></DISPLAYSEQUENCE> +<!--9F557A143F1D4295897F07DFDFDB4074--> <HASPOSTAL_ADD><![CDATA[N]]></HASPOSTAL_ADD> +<!--9F557A143F1D4295897F07DFDFDB4074--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT> +<!--9F557A143F1D4295897F07DFDFDB4074--> <C_CURRENCY_ID><![CDATA[114]]></C_CURRENCY_ID> +<!--9F557A143F1D4295897F07DFDFDB4074--></C_COUNTRY> + </data> ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits