details: https://code.openbravo.com/erp/devel/pi/rev/61cde4f78074 changeset: 19440:61cde4f78074 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Jan 18 14:22:33 2013 +0100 summary: [pw] retryExecution can be a boolean
details: https://code.openbravo.com/erp/devel/pi/rev/a0d95d50e44c changeset: 19441:a0d95d50e44c user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Fri Jan 25 11:29:52 2013 +0100 summary: [pw] Adds display logic to the process parameters Summary of the changes: - OBUIAPP_PARAMETER.xml: Creation of the displaylogic column in the database - AD_COLUMN.xml, AD_FIELD.xml: Definition of the new column and field in the application dictionary - DynamicExpressionParser.java: Adapts the expression parser to work with process parameters. As opposed with other fields, the parsing of process parameter e xpression require the Process instead of the Tab. - ob-param-window-parameter.ftl: Adds the showIf and the redrawOnChange properties to the process parameters. The parameters used by other parameters in their display logic will have redrawOnChange=true, so every time they are modified the showIf expressions are evaluated. - OBViewParameterHandler.java: Processes the display logic of the parameters, and determine if parameters are referenced in other parameters' display logic. - ob-parameter-window-view.js: Adds evaluation of the display logic of the process parameters in the client. - ob-smartclient.js: Adds some checks in the changed function to prevent executing a function in an undefined object. details: https://code.openbravo.com/erp/devel/pi/rev/c4774bddcb28 changeset: 19442:c4774bddcb28 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Jan 25 11:51:46 2013 +0100 summary: [pw] merge details: https://code.openbravo.com/erp/devel/pi/rev/27e73be3a035 changeset: 19443:27e73be3a035 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Jan 25 12:22:01 2013 +0100 summary: [pw] fixed jslint issues details: https://code.openbravo.com/erp/devel/pi/rev/c569fd9845b3 changeset: 19444:c569fd9845b3 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Jan 25 12:35:59 2013 +0100 summary: [pw] startrow is properly concatenated to other properties details: https://code.openbravo.com/erp/devel/pi/rev/0c20f07af2ca changeset: 19445:0c20f07af2ca user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Jan 25 13:07:15 2013 +0100 summary: [pw] don't show error icons details: https://code.openbravo.com/erp/devel/pi/rev/f33f976cadf8 changeset: 19446:f33f976cadf8 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Jan 25 13:33:51 2013 +0100 summary: [pw][ms] setting required style to multi selector details: https://code.openbravo.com/erp/devel/pi/rev/01e80562effa changeset: 19447:01e80562effa user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Jan 25 13:37:56 2013 +0100 summary: [pw] evaluate display logic with default values details: https://code.openbravo.com/erp/devel/pi/rev/2188907844eb changeset: 19448:2188907844eb user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Jan 25 14:20:51 2013 +0100 summary: [pw] synchronize terminology for display logic details: https://code.openbravo.com/erp/devel/pi/rev/17b59edeb944 changeset: 19449:17b59edeb944 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Jan 25 14:23:32 2013 +0100 summary: [pw] merged back display logic in param windows diffstat: .hgsigs | 5 + .hgtags | 5 + modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml | 11 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java | 2 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPaymentFromJournalLine.java | 15 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java | 41 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 49 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java | 32 + modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_PARAMETER.xml | 4 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml | 43 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml | 36 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 110 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java | 2 + modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java | 86 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ViewComponent.java | 9 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/WindowPersonalizationEventHandler.java | 61 + modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java | 2 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationHandler.java | 2 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-param-window-parameter.ftl | 8 + modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-pick-and-execute-view-window.js.ftl | 2 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewParameterHandler.java | 55 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-richtext.js | 155 ++ modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-text.js | 3 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js | 37 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 13 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js | 35 + modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/model/tables/OBCLKER_REF_MASK.xml | 59 + modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_COLUMN.xml | 388 +++++ modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_ELEMENT.xml | 25 + modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_FIELD.xml | 192 ++ modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_REFERENCE.xml | 47 + modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_TAB.xml | 26 + modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_TABLE.xml | 20 + modules/org.openbravo.client.kernel/src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml | 20 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponentProvider.java | 24 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/MaskedStringUIDefinition.java | 43 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/RichTextUIDefinition.java | 57 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java | 8 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- 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 | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- 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 | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ReadOnlyDataSourceService.java | 3 + modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- 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 | 2 +- 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 | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java | 9 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java | 47 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.userinterface.selector/ob-selector-item-styles.js | 9 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- 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 | 2 +- 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 | 8 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- 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 | 2 +- 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 | 2 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 18 +- referencedata/sampledata/F_B_International_Group.xml | 708 ++++++++- referencedata/sampledata/QA_Testing.xml | 436 +++++- src-db/database/model/functions/C_INVOICE_POST.xml | 4 +- src-db/database/model/functions/C_ORDER_POST1.xml | 4 +- src-db/database/model/functions/C_TAXPAYMENT_POST.xml | 4 + src-db/database/model/functions/M_INOUT_POST.xml | 89 +- src-db/database/model/functions/M_INTERNAL_CONSUMPTION_POST1.xml | 10 + src-db/database/model/functions/M_RESERVATION_POST.xml | 124 +- src-db/database/model/functions/S_TIMEEXPENSE_POST.xml | 4 +- src-db/database/model/tables/AD_ROLE.xml | 5 + src-db/database/model/tables/AD_USER.xml | 10 - src-db/database/model/tables/FIN_RECONCILIATION.xml | 3 + src-db/database/model/tables/GL_JOURNALLINE.xml | 2 +- src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 11 + src-db/database/sourcedata/AD_CALLOUT.xml | 9 - src-db/database/sourcedata/AD_COLUMN.xml | 121 +- src-db/database/sourcedata/AD_ELEMENT.xml | 42 +- src-db/database/sourcedata/AD_FIELD.xml | 107 +- src-db/database/sourcedata/AD_MESSAGE.xml | 101 +- src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 12 - src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 10 - src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_PROCESS.xml | 7 +- src-db/database/sourcedata/AD_REFERENCE.xml | 27 + src-db/database/sourcedata/AD_REF_LIST.xml | 12 + src-db/database/sourcedata/AD_TAB.xml | 2 +- src-db/database/sourcedata/AD_VAL_RULE.xml | 11 - src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 35 + src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 63 + src-util/modulescript/src/org/openbravo/modulescript/InitializeAcctDimensionsInClient_data.xsql | 4 +- src/index.jsp | 28 + src/org/openbravo/base/secureApp/DefaultOptions_data.xsql | 4 +- src/org/openbravo/base/secureApp/LoginHandler.java | 19 +- src/org/openbravo/base/structure/IdentifierProvider.java | 11 +- src/org/openbravo/base/validation/StringPropertyValidator.java | 11 +- src/org/openbravo/costing/CostingRuleProcess.java | 4 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_ShipmentPO.html | 33 +- src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java | 46 +- src/org/openbravo/erpCommon/ad_callouts/SE_IsDefaultBillingContact.java | 88 - src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 8 +- src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 81 +- src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 77 +- src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 62 +- src/org/openbravo/erpCommon/ad_forms/DocInvoice.java | 2 +- src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.xml | 6 +- src/org/openbravo/erpCommon/ad_process/RescheduleProcess.java | 16 +- src/org/openbravo/erpCommon/ad_process/ScheduleProcess.java | 19 +- src/org/openbravo/erpCommon/ad_process/UnscheduleProcess.java | 16 +- src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.java | 19 +- src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports_data.xsql | 4 + src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java | 3 +- src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.java | 10 +- src/org/openbravo/erpCommon/businessUtility/BpartnerMisc_data.xsql | 20 +- src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java | 7 +- src/org/openbravo/erpCommon/utility/OBMessageUtils.java | 3 + src/org/openbravo/erpCommon/utility/reporting/printing/Poc_data.xsql | 19 - src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java | 32 +- 146 files changed, 3725 insertions(+), 886 deletions(-) diffs (truncated from 8794 to 300 lines): diff -r ba836919bd30 -r 17b59edeb944 .hgsigs --- a/.hgsigs Fri Jan 18 10:35:50 2013 +0100 +++ b/.hgsigs Fri Jan 25 14:23:32 2013 +0100 @@ -92,6 +92,11 @@ d9dc1dcdb1f7da6ca0e0fcff57ac4f6c2f5e938c 0 iEYEABECAAYFAlCj2v8ACgkQCX/oGf+2qkPEsgCeOLWp7v5gU6Ip90kOBdOF+mejRHsAoObtRXJVe+gNq2nUa7Xu1EbVxsag 3ded67251154d0aa958eacb918de97fd5a77e3dc 0 iEYEABECAAYFAlC3tuIACgkQCX/oGf+2qkO0zgCdFACe5suzHq8pukNoc8ghZJlvO6UAn3wzW4/wmIEfmngxthdtqRTrSQ2X bf495495c05c0e9414450e54d6da22ec685bd21a 0 iEYEABECAAYFAlDT6OkACgkQCX/oGf+2qkMqegCdEjWD+dHlIP66pL/adAL3iuBYXsUAoJvOAhmZbvUSUIZhI44gkjlnCbYu +b18509f4f0244b226e8b21f360e3b6736e66db5c 0 iEYEABECAAYFAlD0GjQACgkQCX/oGf+2qkMRMgCfTKhzVeNLODzeeogmFDCiL5irOnsAoIrEa5akAnnWMbfV1PQy2oTpZv6W 9fd46b5349c522407c7fe4eaedeed678487e02a2 0 iEYEABECAAYFAlDK72cACgkQCX/oGf+2qkNv1gCfYsphl/F7dyNNh+u046YI9RwEdD4AoMPAoXJFhg9rV8gF6tZgeSMSAOV3 73102dce4ea86f1b3fab97709f1832f39f89d227 0 iEYEABECAAYFAlDYYXMACgkQCX/oGf+2qkNpJQCg09+Ojgco2TaKN6BlNC4888yhLCgAoJfCfQ/93ePShFci2Fic/lzeg/wL 1b9cd3d88a74c309ec1f97f4cf93ca161e1d6e7f 0 iEYEABECAAYFAlDvi2QACgkQCX/oGf+2qkMOhwCgvmcBpIUpUJH8otzrM3ZOu8uUgFEAoIdvXKVCLQKM5znHtX9Il/HJgzxO +0de4d6a8de6d8676576cd03417b6e3cab9a7b78d 0 iEYEABECAAYFAlD+H7EACgkQCX/oGf+2qkMMSwCbBFZ24/VJnVdauBgZ4gIebPe9tB8AnA9F03aZPEkc27RXoFC7NfVSxt3B +21ee53026babfbaa1acea42273889c2d292eb5b6 0 iEYEABECAAYFAlD2CwAACgkQCX/oGf+2qkMs8QCePue6nyUSbeurM9ltNo/cb3k0vA0An2JJzndMdd/1MAurX6DfEGCTo9Uj +9fe1637c98a6cc490582445af850cc06b3e34a8e 0 iEYEABECAAYFAlD39dUACgkQCX/oGf+2qkMB5gCg/czNu6dng2nZxXKFiyTiuXHl0/IAoPKktgGNoj8crEuTaYuCrpYCtLTA +b495316d385b5256fb3384d0c00d05e6e2eacf18 0 iEYEABECAAYFAlD/hhQACgkQCX/oGf+2qkNLsQCg5D7WvT3vF3tzs+LFk/nUZ6tSKHgAnjxJmaE7z0f0LWCD+ejguy0eDBJf diff -r ba836919bd30 -r 17b59edeb944 .hgtags --- a/.hgtags Fri Jan 18 10:35:50 2013 +0100 +++ b/.hgtags Fri Jan 25 14:23:32 2013 +0100 @@ -103,6 +103,11 @@ f731024ec763373bd02a0825d0f42e1ddb15eb32 3.0MP17 41ad849c6978ec887187853448c1f1a79fc01c4f 3.0MP17.1 814d8af3a240b363c9bcba7cf7ae839c8822ecce 3.0MP17.2 +0bd2b3f181ae4077970ccdb6f7373649125f3571 3.0MP17.3 43986bd34e503950718f87d719d70fccfc8607fe 3.0MP18 26a81bd13b9118ce8591e58ed7d04533469708f0 3.0MP18.1 f4f500d33fc0161856f8e4b0ed737053f318313d 3.0MP18.2 +4023ea37e5619c3cd75559e1795a2609a5f97088 3.0MP18.3 +f6d77303909a01da297ca96e5c23f8de1106eb0b 3.0MP19 +964842f76d10b1752cfa63b69c370deb668abe4c 3.0MP19.1 +aaf6f469e183fe0ecaacc003f08d7c1879e64357 3.0MP19.2 diff -r ba836919bd30 -r 17b59edeb944 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Fri Jan 18 10:35:50 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Fri Jan 25 14:23:32 2013 +0100 @@ -427,7 +427,7 @@ --When difference amount is not 0 the payment schedule detail of the order has to be split. The difference --amount is the amount of the new psd that is not related to any invoice. - IF (v_differenceamount <> 0) THEN + IF (v_differenceamount > 0) THEN v_new_scheduledetailid := get_uuid(); INSERT INTO fin_payment_scheduledetail ( diff -r ba836919bd30 -r 17b59edeb944 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Fri Jan 18 10:35:50 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Fri Jan 25 14:23:32 2013 +0100 @@ -11,6 +11,17 @@ <!--0267A646C8BD4042AE2422BCB83B4610--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--0267A646C8BD4042AE2422BCB83B4610--></AD_MESSAGE> +<!--02E1AA15BFCB420C8F618A14ED80F33E--><AD_MESSAGE> +<!--02E1AA15BFCB420C8F618A14ED80F33E--> <AD_MESSAGE_ID><![CDATA[02E1AA15BFCB420C8F618A14ED80F33E]]></AD_MESSAGE_ID> +<!--02E1AA15BFCB420C8F618A14ED80F33E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--02E1AA15BFCB420C8F618A14ED80F33E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--02E1AA15BFCB420C8F618A14ED80F33E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--02E1AA15BFCB420C8F618A14ED80F33E--> <VALUE><![CDATA[APRM_JSZEROUNDERPAYMENT]]></VALUE> +<!--02E1AA15BFCB420C8F618A14ED80F33E--> <MSGTEXT><![CDATA[A zero amount Payment cannot be left as an underpayment.]]></MSGTEXT> +<!--02E1AA15BFCB420C8F618A14ED80F33E--> <MSGTYPE><![CDATA[E]]></MSGTYPE> +<!--02E1AA15BFCB420C8F618A14ED80F33E--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--02E1AA15BFCB420C8F618A14ED80F33E--></AD_MESSAGE> + <!--0AF37AC554DE441DB213BA944147E82C--><AD_MESSAGE> <!--0AF37AC554DE441DB213BA944147E82C--> <AD_MESSAGE_ID><![CDATA[0AF37AC554DE441DB213BA944147E82C]]></AD_MESSAGE_ID> <!--0AF37AC554DE441DB213BA944147E82C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r ba836919bd30 -r 17b59edeb944 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri Jan 18 10:35:50 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri Jan 25 14:23:32 2013 +0100 @@ -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.19217]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.19434]]></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> diff -r ba836919bd30 -r 17b59edeb944 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 Fri Jan 18 10:35:50 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Jan 25 14:23:32 2013 +0100 @@ -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.19217]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.19434]]></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.19217]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.19434]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r ba836919bd30 -r 17b59edeb944 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java Fri Jan 18 10:35:50 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java Fri Jan 25 14:23:32 2013 +0100 @@ -276,7 +276,7 @@ (strAction.equals("PRP") || strAction.equals("PPP")) ? "P" : "D", payment); } if (strDifferenceAction.equals("refund") - && !"Error".equalsIgnoreCase(message.getType())) { + && (message == null || !"Error".equalsIgnoreCase(message.getType()))) { Boolean newPayment = !payment.getFINPaymentDetailList().isEmpty(); FIN_Payment refundPayment = FIN_AddPayment.createRefundPayment(this, vars, payment, refundAmount.negate(), exchangeRate); diff -r ba836919bd30 -r 17b59edeb944 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPaymentFromJournalLine.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPaymentFromJournalLine.java Fri Jan 18 10:35:50 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPaymentFromJournalLine.java Fri Jan 25 14:23:32 2013 +0100 @@ -11,7 +11,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) 2012 Openbravo SLU + * All portions are Copyright (C) 2013 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************* @@ -92,11 +92,11 @@ throw new OBException("@FIN_NoMultiCurrencyAllowed@"); } if (journalLine.getDebit().subtract(journalLine.getCredit()).compareTo(BigDecimal.ZERO) > 0 - && !bPartner.isCustomer()) { + && bPartner != null && !bPartner.isCustomer()) { throw new OBException("@FIN_NoCustomer@"); } if (journalLine.getDebit().subtract(journalLine.getCredit()).compareTo(BigDecimal.ZERO) < 0 - && !bPartner.isVendor()) { + && bPartner != null && !bPartner.isVendor()) { throw new OBException("@FIN_NoVendor@"); } @@ -130,7 +130,8 @@ // Print result if (message.getType().equals("Error")) { - String exceptionMessage = payment.getBusinessPartner().getName(); + String exceptionMessage = payment.getBusinessPartner() != null ? payment + .getBusinessPartner().getName() : ""; exceptionMessage += ": " + message.getMessage(); throw new OBException(exceptionMessage); } else if (message.getType().equals("Warning")) { @@ -141,7 +142,11 @@ strMessageType = "Success"; } strMessageResult.append("@Payment@ ").append(payment.getDocumentNo()); - strMessageResult.append(" (").append(payment.getBusinessPartner().getName()).append(")"); + strMessageResult + .append(" (") + .append( + payment.getBusinessPartner() != null ? payment.getBusinessPartner().getName() : "") + .append(")"); if (!"".equals(message.getMessage())) strMessageResult.append(": ").append(message.getMessage()); strMessageResult.append("<br>"); diff -r ba836919bd30 -r 17b59edeb944 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java Fri Jan 18 10:35:50 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java Fri Jan 25 14:23:32 2013 +0100 @@ -30,6 +30,7 @@ import org.openbravo.advpaymentmngt.utility.Value; import org.openbravo.base.secureApp.VariablesSecureApp; import org.openbravo.client.kernel.RequestContext; +import org.openbravo.dal.core.OBContext; import org.openbravo.dal.service.OBDal; import org.openbravo.database.ConnectionProvider; import org.openbravo.erpCommon.utility.OBError; @@ -110,24 +111,32 @@ return error; } } else { - for (FIN_PaymentDetail pd : payment.getFINPaymentDetailList()) { - for (FIN_PaymentScheduleDetail psd : pd.getFINPaymentScheduleDetailList()) { - BusinessPartner bPartner; - if (psd.getInvoicePaymentSchedule() == null) { - bPartner = psd.getOrderPaymentSchedule().getOrder().getBusinessPartner(); - } else { - bPartner = psd.getInvoicePaymentSchedule().getInvoice().getBusinessPartner(); - } - if (FIN_Utility.isBlockedBusinessPartner(bPartner.getId(), payment.isReceipt(), 4)) { - // If the Business Partner is blocked for Payments, the Payment will not be - // completed. - OBError error = new OBError(); - error.setType("Error"); - error.setMessage(strmessage1 + " " + bPartner.getIdentifier() + " " + strmessage2); - OBDal.getInstance().rollbackAndClose(); - return error; + OBContext.setAdminMode(true); + try { + for (FIN_PaymentDetail pd : payment.getFINPaymentDetailList()) { + for (FIN_PaymentScheduleDetail psd : pd.getFINPaymentScheduleDetailList()) { + BusinessPartner bPartner = null; + if (psd.getInvoicePaymentSchedule() != null) { + bPartner = psd.getInvoicePaymentSchedule().getInvoice().getBusinessPartner(); + } else if (psd.getOrderPaymentSchedule() != null) { + bPartner = psd.getOrderPaymentSchedule().getOrder().getBusinessPartner(); + } + if (bPartner != null + && FIN_Utility.isBlockedBusinessPartner(bPartner.getId(), payment.isReceipt(), + 4)) { + // If the Business Partner is blocked for Payments, the Payment will not be + // completed. + OBError error = new OBError(); + error.setType("Error"); + error + .setMessage(strmessage1 + " " + bPartner.getIdentifier() + " " + strmessage2); + OBDal.getInstance().rollbackAndClose(); + return error; + } } } + } finally { + OBContext.restorePreviousMode(); } } } diff -r ba836919bd30 -r 17b59edeb944 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 Fri Jan 18 10:35:50 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java Fri Jan 25 14:23:32 2013 +0100 @@ -11,7 +11,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-2012 Openbravo SLU + * All portions are Copyright (C) 2010-2013 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************* @@ -96,27 +96,34 @@ return; } } else { - for (FIN_PaymentDetail pd : payment.getFINPaymentDetailList()) { - for (FIN_PaymentScheduleDetail psd : pd.getFINPaymentScheduleDetailList()) { - BusinessPartner bPartner; - if (psd.getInvoicePaymentSchedule() == null) { - bPartner = psd.getOrderPaymentSchedule().getOrder().getBusinessPartner(); - } else { - bPartner = psd.getInvoicePaymentSchedule().getInvoice().getBusinessPartner(); - } - if (FIN_Utility.isBlockedBusinessPartner(bPartner.getId(), payment.isReceipt(), 4)) { - // If the Business Partner is blocked for Payments, the Payment will not be - // completed. - msg.setType("Error"); - msg.setTitle(Utility.messageBD(conProvider, "Error", language)); - msg.setMessage(OBMessageUtils.messageBD("ThebusinessPartner") + " " - + bPartner.getIdentifier() + " " - + OBMessageUtils.messageBD("BusinessPartnerBlocked")); - bundle.setResult(msg); - OBDal.getInstance().rollbackAndClose(); - return; + OBContext.setAdminMode(true); + try { + for (FIN_PaymentDetail pd : payment.getFINPaymentDetailList()) { + for (FIN_PaymentScheduleDetail psd : pd.getFINPaymentScheduleDetailList()) { + BusinessPartner bPartner = null; + if (psd.getInvoicePaymentSchedule() != null) { + bPartner = psd.getInvoicePaymentSchedule().getInvoice().getBusinessPartner(); + } else if (psd.getOrderPaymentSchedule() != null) { + bPartner = psd.getOrderPaymentSchedule().getOrder().getBusinessPartner(); + } + if (bPartner != null + && FIN_Utility.isBlockedBusinessPartner(bPartner.getId(), payment.isReceipt(), + 4)) { + // If the Business Partner is blocked for Payments, the Payment will not be + // completed. + msg.setType("Error"); + msg.setTitle(Utility.messageBD(conProvider, "Error", language)); + msg.setMessage(OBMessageUtils.messageBD("ThebusinessPartner") + " " + + bPartner.getIdentifier() + " " + + OBMessageUtils.messageBD("BusinessPartnerBlocked")); + bundle.setResult(msg); + OBDal.getInstance().rollbackAndClose(); + return; + } } } + } finally { + OBContext.restorePreviousMode(); } } } @@ -257,7 +264,7 @@ description.append(strRefundCredit).append("\n"); String truncateDescription = (description.length() > 255) ? description - .substring(0, 252).concat("...").toString() : description.toString(); + .substring(0, 251).concat("...").toString() : description.toString(); payment.setDescription(truncateDescription); } diff -r ba836919bd30 -r 17b59edeb944 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java Fri Jan 18 10:35:50 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java Fri Jan 25 14:23:32 2013 +0100 @@ -51,6 +51,7 @@ import org.openbravo.dal.security.OrganizationStructureProvider; import org.openbravo.dal.service.OBCriteria; import org.openbravo.dal.service.OBDal; +import org.openbravo.dal.service.OBQuery; ------------------------------------------------------------------------------ Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft MVPs and experts. ON SALE this month only -- learn more at: http://p.sf.net/sfu/learnnow-d2d _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
