details: https://code.openbravo.com/erp/devel/main/rev/3604f48bbebb changeset: 21340:3604f48bbebb user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Mon Oct 21 16:43:50 2013 +0530 summary: Fixes issue 24978: Impossible to process a purchase order in one case
details: https://code.openbravo.com/erp/devel/main/rev/0c73b69e61c5 changeset: 21341:0c73b69e61c5 user: RM packaging bot <staff.rm <at> openbravo.com> date: Mon Oct 21 14:40:34 2013 +0000 summary: Update AD_MODULE version to 3.0MP28.2 details: https://code.openbravo.com/erp/devel/main/rev/3dff4a5ade8a changeset: 21342:3dff4a5ade8a user: RM packaging bot <staff.rm <at> openbravo.com> date: Mon Oct 21 14:40:35 2013 +0000 summary: Added tag 3.0MP28.2 for changeset 0c73b69e61c5 details: https://code.openbravo.com/erp/devel/main/rev/f7f0fc7cdb1f changeset: 21343:f7f0fc7cdb1f user: RM packaging bot <staff.rm <at> openbravo.com> date: Mon Oct 21 14:40:35 2013 +0000 summary: Added signature for changeset 3dff4a5ade8a details: https://code.openbravo.com/erp/devel/main/rev/42957ca66c62 changeset: 21344:42957ca66c62 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Oct 22 08:46:16 2013 +0000 summary: Merge temporary head for 3.0MP28.2 diffstat: .hgsigs | 4 + .hgtags | 4 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ProcessInvoiceHook.java | 39 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java | 2 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java | 61 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ReconciliationProcess.java | 150 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 25 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl | 8 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java | 56 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java | 47 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java | 66 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/calendar/ob-calendar.js | 18 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/calendar/ob-multicalendar.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 32 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 78 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 211 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view-datasource.js | 45 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 35 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js | 15 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-date.js | 42 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_CALLOUT.xml | 13 + modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_COLUMN.xml | 1 + modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 15 + modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 13 + modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/CheckOptionalFilterCallout.java | 72 + modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java | 4 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js | 6 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 24 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 18 +- referencedata/sampledata/QA_Testing/AD_PINSTANCE.xml | 880 + referencedata/sampledata/QA_Testing/AD_PINSTANCE_PARA.xml | 136 + referencedata/sampledata/QA_Testing/AD_PROCESS_ACCESS.xml | 84 + referencedata/sampledata/QA_Testing/AD_PROCESS_REQUEST.xml | 68 + referencedata/sampledata/QA_Testing/AD_WINDOW_ACCESS.xml | 168 + referencedata/sampledata/QA_Testing/C_ORDER.xml | 21 + referencedata/sampledata/QA_Testing/C_PERIOD.xml | 864 + referencedata/sampledata/QA_Testing/C_PERIODCONTROL.xml | 56832 ++++++++++ referencedata/sampledata/QA_Testing/C_PERIODCONTROL_LOG.xml | 912 + referencedata/sampledata/QA_Testing/C_YEAR.xml | 64 + referencedata/sampledata/QA_Testing/M_PRODUCT.xml | 52 + referencedata/sampledata/QA_Testing/OBUIAPP_PROCESS_ACCESS.xml | 168 + src-db/database/model/functions/AD_SEQUENCE_DOC.xml | 1 - src-db/database/model/functions/C_COMMISSIONRUN_PROCESS.xml | 11 +- src-db/database/model/functions/C_ORDER_POST1.xml | 2 +- src-db/database/model/functions/MA_PRODUCTION_COST.xml | 2 +- src-db/database/model/functions/M_INOUT_POST.xml | 33 +- src-db/database/model/functions/M_MOVEMENT_POST.xml | 40 +- src-db/database/model/functions/M_RESERVATION_CONSUMPTION.xml | 252 +- src-db/database/model/functions/M_RESERVATION_REALLOCATE.xml | 375 + src-db/database/model/tables/M_PRODUCTPRICE.xml | 4 + src-db/database/model/triggers/C_ORDERLINE2_TRG.xml | 41 +- src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 11 + src-db/database/sourcedata/AD_COLUMN.xml | 37 +- src-db/database/sourcedata/AD_ELEMENT.xml | 12 + src-db/database/sourcedata/AD_EXTENSION_POINTS.xml | 10 + src-db/database/sourcedata/AD_FIELD.xml | 27 + src-db/database/sourcedata/AD_MESSAGE.xml | 14 +- src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_REFERENCE.xml | 13 + src-db/database/sourcedata/AD_REF_LIST.xml | 33 + src-db/database/sourcedata/AD_VAL_RULE.xml | 2 +- src-test/org/openbravo/test/dal/IssuesTest.java | 8 - src-util/modulescript/build/classes/org/openbravo/modulescript/UpdateReservationQtys.class | 0 src-util/modulescript/build/classes/org/openbravo/modulescript/UpdateReservationQtysData.class | 0 src-util/modulescript/src/org/openbravo/modulescript/UpdateReservationQtys.java | 43 + src-util/modulescript/src/org/openbravo/modulescript/UpdateReservationQtys_data.xsql | 98 + src/org/openbravo/base/secureApp/HttpSecureAppServlet.java | 4 +- src/org/openbravo/common/hooks/OrderLineQtyChangedHook.java | 34 + src/org/openbravo/common/hooks/OrderLineQtyChangedHookManager.java | 20 + src/org/openbravo/common/hooks/OrderLineQtyChangedHookObject.java | 66 + src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java | 47 +- src/org/openbravo/erpCommon/ad_callouts/SimpleCallout.java | 60 + src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 88 +- src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 18 +- src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 19 +- src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 18 +- src/org/openbravo/erpCommon/ad_forms/DocInOut.java | 8 + src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesHook.java | 38 + src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual.java | 110 +- src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual_data.xsql | 13 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR_data.xsql | 7 +- src/org/openbravo/erpCommon/obps/ActivationKey.java | 1 + src/org/openbravo/erpCommon/reference/PInstanceProcess_data.xsql | 10 + src/org/openbravo/event/OrderEventHandler.java | 27 +- src/org/openbravo/service/db/DalBaseProcess.java | 11 +- 124 files changed, 62617 insertions(+), 573 deletions(-) diffs (truncated from 78673 to 300 lines): diff -r 750dc95742e0 -r 42957ca66c62 .hgsigs --- a/.hgsigs Thu Oct 17 09:45:47 2013 +0000 +++ b/.hgsigs Tue Oct 22 08:46:16 2013 +0000 @@ -124,4 +124,8 @@ 03423edd830d99ac30c5938c915bd59b5805f39c 0 iEYEABECAAYFAlIXIXMACgkQCX/oGf+2qkOBnQCfVTDJFemSCCNyONytrElhgPzT7SEAnimrHqNU+GRUeeMHaY+/cVoYAwRD 2cba8a4800b004a03d6bdc1863084421a17a496e 0 iEYEABECAAYFAlIoL7sACgkQCX/oGf+2qkPyTQCfVLRC/dJweMhAtUQUf0ysLeJuU1YAoMjPgLwhtEHs7DYZKMGkgrRKxfUP 92028616e00a984620b7b5cb5185d5347a7d8e27 0 iEYEABECAAYFAlJWJuwACgkQCX/oGf+2qkOI6wCgpWwN1yrx+LccTz/Unl85E/iB1lkAoKkM5ffnfpaOxl+sSPqCwHfS7oDe +1216d879483850c7a6ebd1b87b989bbdfebc7f38 0 iEYEABECAAYFAlJhLy0ACgkQCX/oGf+2qkPOzQCeKwXy9EQPSyYq/b5eALoFRQsHescAoL8RolWFBxkn+CGl4yR5gBgBp7mR b79dd1dc55aa66c08d26a88c004c167253307b9a 0 iEYEABECAAYFAlIyoXQACgkQCX/oGf+2qkPMWACg2suFjCYsdws4IU2H5S0wdXHkI+MAnjiRIQd2XaN/Yw6iAsj6jgI+y3Bx +f56c14fc0212d08ec0e9663d957dfdbf4ff42543 0 iEYEABECAAYFAlJbyIkACgkQCX/oGf+2qkOXiACgggW09+Z5WL1BrxaSVcZB0ykapr4AoKSn91Y1yvImj5/sEmdM5f37Y2RM +ffdd47e41d59e56bf2f85033679accff7feaa941 0 iEYEABECAAYFAlJfscwACgkQCX/oGf+2qkOJFQCg/olIlg4QV8DcH3aJWB9NVlpgvG4An1P8ZPJjX7Rtaav0sb+N1DF9YaSh +3dff4a5ade8aa7966fde9139428e968fb7f04218 0 iEYEABECAAYFAlJlPOMACgkQCX/oGf+2qkPsbgCg4w/JC1tFhyxz6mXa6UBOaEYz6esAnRCq24eVAcoNGrAfIfhXvKUBuQMQ diff -r 750dc95742e0 -r 42957ca66c62 .hgtags --- a/.hgtags Thu Oct 17 09:45:47 2013 +0000 +++ b/.hgtags Tue Oct 22 08:46:16 2013 +0000 @@ -135,4 +135,8 @@ 28fa441122298d5cd7cabe28490ec7d6435e7809 3.0MP26.1 1e51c66c0c395e41fc5384608dcd539a255c210d 3.0MP26.2 f731bd4e0332d5976149e92aed53d49ed1852557 3.0MP26.3 +98e29b4482b8200f26d0409b025ee58a5ead5a05 3.0MP26.4 5bc4ca20d6f5c30e0cb179912df555607df04577 3.0MP27 +db86a9cfecc308c3382feb357d53091f51ad3a4a 3.0MP28 +750dc95742e0d15c3ed8b484fa8dbc4aa689c627 3.0MP28.1 +0c73b69e61c55d8de0b3a0dfcc2e7511fa8a295f 3.0MP28.2 diff -r 750dc95742e0 -r 42957ca66c62 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Oct 17 09:45:47 2013 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Tue Oct 22 08:46:16 2013 +0000 @@ -6,7 +6,7 @@ <!--A918E3331C404B889D69AA9BFAFB23AC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--A918E3331C404B889D69AA9BFAFB23AC--> <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME> -<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.21253]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.21338]]></VERSION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements. If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP> @@ -25,7 +25,7 @@ <!--A918E3331C404B889D69AA9BFAFB23AC--> <UPDATEINFO><![CDATA[Fixed issue with document sequence numbers reset in case of applying dataset second time. Fixed issue 15305.]]></UPDATEINFO> <!--A918E3331C404B889D69AA9BFAFB23AC--> <REFERENCEDATAINFO><![CDATA[Document types and default algorithm for bank statement auto matching]]></REFERENCEDATAINFO> -<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION_LABEL><![CDATA[MP28.1]]></VERSION_LABEL> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED> <!--A918E3331C404B889D69AA9BFAFB23AC--></AD_MODULE> diff -r 750dc95742e0 -r 42957ca66c62 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Oct 17 09:45:47 2013 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Oct 22 08:46:16 2013 +0000 @@ -7,7 +7,7 @@ <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID> -<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.21253]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.21338]]></STARTVERSION> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--B97FC854C6DD41E692161585645A900F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--B97FC854C6DD41E692161585645A900F--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--B97FC854C6DD41E692161585645A900F--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.21253]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.21338]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 750dc95742e0 -r 42957ca66c62 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ProcessInvoiceHook.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ProcessInvoiceHook.java Tue Oct 22 08:46:16 2013 +0000 @@ -0,0 +1,39 @@ +/* + ************************************************************************* + * The contents of this file are subject to the Openbravo Public License + * Version 1.0 (the "License"), being the Mozilla Public License + * Version 1.1 with a permitted attribution clause; you may not use this + * file except in compliance with the License. You may obtain a copy of + * the License at http://www.openbravo.com/legal/license.html + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + * License for the specific language governing rights and limitations + * under the License. + * The Original Code is Openbravo ERP. + * The Initial Developer of the Original Code is Openbravo SLU + * All portions are Copyright (C) 2013 Openbravo SLU + * All Rights Reserved. + * Contributor(s): + ************************************************************************* + */ +package org.openbravo.advpaymentmngt; + +import org.openbravo.erpCommon.utility.OBError; +import org.openbravo.model.common.invoice.Invoice; + +/** + * @author <a href="mailto:daniel.mart...@xpand-it.com";>Daniel Martins</a> + * + */ +public interface ProcessInvoiceHook { + + /* + * Returns an OBError when an error occurred and null if it succeed + */ + public OBError preProcess(Invoice invoice, String strDocAction); + + /* + * Returns an OBError when an error occurred and null if it succeed + */ + public OBError postProcess(Invoice invoice, String strDocAction); +} diff -r 750dc95742e0 -r 42957ca66c62 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 Oct 17 09:45:47 2013 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java Tue Oct 22 08:46:16 2013 +0000 @@ -270,7 +270,7 @@ refundAmount.negate(), exchangeRate); OBError auxMessage = FIN_AddPayment.processPayment(vars, this, (strAction.equals("PRP") || strAction.equals("PPP")) ? "P" : "D", refundPayment); - if (newPayment) { + if (newPayment && !"Error".equalsIgnoreCase(auxMessage.getType())) { final String strNewRefundPaymentMessage = Utility.parseTranslation(this, vars, vars.getLanguage(), "@APRM_RefundPayment@" + ": " + refundPayment.getDocumentNo()) diff -r 750dc95742e0 -r 42957ca66c62 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java Thu Oct 17 09:45:47 2013 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java Tue Oct 22 08:46:16 2013 +0000 @@ -29,11 +29,15 @@ import java.util.List; import java.util.Map; +import javax.enterprise.inject.Any; +import javax.enterprise.inject.Instance; +import javax.inject.Inject; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.hibernate.criterion.Restrictions; +import org.openbravo.advpaymentmngt.ProcessInvoiceHook; import org.openbravo.advpaymentmngt.dao.AdvPaymentMngtDao; import org.openbravo.advpaymentmngt.process.FIN_AddPayment; import org.openbravo.advpaymentmngt.process.FIN_PaymentProcess; @@ -75,6 +79,10 @@ private final AdvPaymentMngtDao dao = new AdvPaymentMngtDao(); private static final String Purchase_Invoice_Window = "183"; + @Inject + @Any + private Instance<ProcessInvoiceHook> hooks; + public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { VariablesSecureApp vars = new VariablesSecureApp(request); @@ -133,6 +141,19 @@ OBDal.getInstance().save(invoice); OBDal.getInstance().flush(); + OBError msg = null; + for (ProcessInvoiceHook hook : hooks) { + msg = hook.preProcess(invoice, strdocaction); + if (msg != null && "Error".equals(msg.getType())) { + vars.setMessage(strTabId, msg); + String strWindowPath = Utility.getTabURL(strTabId, "R", true); + if (strWindowPath.equals("")) + strWindowPath = strDefaultServlet; + printPageClosePopUp(response, vars, strWindowPath); + return; + } + } + OBContext.setAdminMode(true); Process process = null; try { @@ -186,16 +207,51 @@ } OBDal.getInstance().save(invoice); OBDal.getInstance().flush(); + + OBContext.setAdminMode(); + try { + // on error close popup + if (pinstance.getResult() == 0L) { + OBDal.getInstance().commitAndClose(); + final PInstanceProcessData[] pinstanceData = PInstanceProcessData.select(this, + pinstance.getId()); + myMessage = Utility.getProcessInstanceMessage(this, vars, pinstanceData); + log4j.debug(myMessage.getMessage()); + vars.setMessage(strTabId, myMessage); + + String strWindowPath = Utility.getTabURL(strTabId, "R", true); + if (strWindowPath.equals("")) + strWindowPath = strDefaultServlet; + printPageClosePopUp(response, vars, strWindowPath); + return; + } + } finally { + OBContext.restorePreviousMode(); + } + + for (ProcessInvoiceHook hook : hooks) { + msg = hook.postProcess(invoice, strdocaction); + if (msg != null && "Error".equals(msg.getType())) { + vars.setMessage(strTabId, msg); + String strWindowPath = Utility.getTabURL(strTabId, "R", true); + if (strWindowPath.equals("")) + strWindowPath = strDefaultServlet; + printPageClosePopUp(response, vars, strWindowPath); + OBDal.getInstance().rollbackAndClose(); + return; + } + } + OBDal.getInstance().commitAndClose(); final PInstanceProcessData[] pinstanceData = PInstanceProcessData.select(this, pinstance.getId()); myMessage = Utility.getProcessInstanceMessage(this, vars, pinstanceData); log4j.debug(myMessage.getMessage()); vars.setMessage(strTabId, myMessage); + OBContext.setAdminMode(); try { - // on error close popup - if (pinstance.getResult() == 0L || !"CO".equals(strdocaction)) { + if (!"CO".equals(strdocaction)) { String strWindowPath = Utility.getTabURL(strTabId, "R", true); if (strWindowPath.equals("")) strWindowPath = strDefaultServlet; @@ -625,3 +681,4 @@ return "Servlet to Process Invoice"; } } + diff -r 750dc95742e0 -r 42957ca66c62 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ReconciliationProcess.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ReconciliationProcess.java Thu Oct 17 09:45:47 2013 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ReconciliationProcess.java Tue Oct 22 08:46:16 2013 +0000 @@ -11,14 +11,16 @@ * 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-2011 Openbravo SLU + * All portions are Copyright (C) 2010-2013 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************* */ package org.openbravo.advpaymentmngt.process; +import java.util.HashSet; import java.util.List; +import java.util.Set; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; @@ -33,13 +35,18 @@ import org.openbravo.erpCommon.utility.OBDateUtils; import org.openbravo.erpCommon.utility.OBError; import org.openbravo.erpCommon.utility.Utility; +import org.openbravo.model.financialmgmt.accounting.FIN_FinancialAccountAccounting; import org.openbravo.model.financialmgmt.payment.FIN_BankStatement; +import org.openbravo.model.financialmgmt.payment.FIN_FinaccTransaction; +import org.openbravo.model.financialmgmt.payment.FIN_Payment; import org.openbravo.model.financialmgmt.payment.FIN_Reconciliation; import org.openbravo.model.financialmgmt.payment.FIN_ReconciliationLine_v; +import org.openbravo.model.financialmgmt.payment.FinAccPaymentMethod; import org.openbravo.scheduling.ProcessBundle; public class FIN_ReconciliationProcess implements org.openbravo.scheduling.Process { private static AdvPaymentMngtDao dao; + Set<FIN_FinaccTransaction> transactionsToBePosted = new HashSet<FIN_FinaccTransaction>(); public void execute(ProcessBundle bundle) throws Exception { dao = new AdvPaymentMngtDao(); @@ -78,24 +85,35 @@ bundle.setResult(msg); return; } else { - for (FIN_ReconciliationLine_v recLine : reconciliation.getFINReconciliationLineVList()) { - boolean orgLegalWithAccounting = FIN_Utility.periodControlOpened(recLine - .getFinancialAccountTransaction().getReconciliation().TABLE_NAME, recLine - .getFinancialAccountTransaction().getReconciliation().getId(), recLine - .getFinancialAccountTransaction().getReconciliation().TABLE_NAME + "_ID", "LE"); - if (!FIN_Utility.isPeriodOpen(recLine.getFinancialAccountTransaction().getClient() - .getId(), AcctServer.DOCTYPE_Reconciliation, recLine - .getFinancialAccountTransaction().getOrganization().getId(), - OBDateUtils.formatDate(recLine.getFinancialAccountTransaction().getDateAcct())) - && orgLegalWithAccounting) { - msg.setType("Error"); - msg.setTitle(Utility.messageBD(conProvider, "Error", language)); - msg.setMessage(String.format(Utility.parseTranslation(conProvider, vars, language, - "@APRM_PeriodNotAvailableClearedItem@"), recLine.getIdentifier())); - bundle.setResult(msg); - OBDal.getInstance().rollbackAndClose(); - return; + if (getDocumentConfirmation(conProvider, recordID)) { + for (FIN_ReconciliationLine_v recLine : reconciliation.getFINReconciliationLineVList()) { + boolean orgLegalWithAccounting = FIN_Utility.periodControlOpened(recLine + .getFinancialAccountTransaction().getReconciliation().TABLE_NAME, recLine + .getFinancialAccountTransaction().getReconciliation().getId(), recLine + .getFinancialAccountTransaction().getReconciliation().TABLE_NAME + "_ID", "LE"); + if (!FIN_Utility.isPeriodOpen(recLine.getFinancialAccountTransaction().getClient() + .getId(), AcctServer.DOCTYPE_Reconciliation, recLine + .getFinancialAccountTransaction().getOrganization().getId(), ------------------------------------------------------------------------------ October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60135991&iu=/4140/ostg.clktrk _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
