details: https://code.openbravo.com/erp/devel/pi/rev/5beb92501773 changeset: 33899:5beb92501773 user: Javier Armendáriz <javier.armendariz <at> openbravo.com> date: Mon Apr 16 12:47:04 2018 +0200 summary: [ndmp] Removing development flag in modules when registering for production.
details: https://code.openbravo.com/erp/devel/pi/rev/3971ac17b0ea changeset: 33900:3971ac17b0ea user: Javier Armendáriz <javier.armendariz <at> openbravo.com> date: Tue Apr 17 09:36:06 2018 +0200 summary: [ndmp] merge with pi details: https://code.openbravo.com/erp/devel/pi/rev/a5e8e368b2af changeset: 33901:a5e8e368b2af user: Javier Armendáriz <javier.armendariz <at> openbravo.com> date: Tue Apr 17 17:12:19 2018 +0200 summary: [ndmp] Created a trigger that ensures modules cannot be set as in development. details: https://code.openbravo.com/erp/devel/pi/rev/a456837a5078 changeset: 33902:a456837a5078 user: Javier Armendáriz <javier.armendariz <at> openbravo.com> date: Wed Apr 18 10:54:39 2018 +0200 summary: [ndmp] Created an initializer that checks purpose and modules at initialization details: https://code.openbravo.com/erp/devel/pi/rev/8e87239e31d3 changeset: 33903:8e87239e31d3 user: Javier Armendáriz <javier.armendariz <at> openbravo.com> date: Wed Apr 18 16:46:15 2018 +0200 summary: [ndmp] Refactored repeated code details: https://code.openbravo.com/erp/devel/pi/rev/98443f6df33e changeset: 33904:98443f6df33e user: Javier Armendáriz <javier.armendariz <at> openbravo.com> date: Wed Apr 18 17:44:22 2018 +0200 summary: [ndmp] InstancePurpose process requires to receive the purpose as parameter. details: https://code.openbravo.com/erp/devel/pi/rev/9358f7f42902 changeset: 33905:9358f7f42902 user: Javier Armendáriz <javier.armendariz <at> openbravo.com> date: Thu Apr 19 11:24:48 2018 +0200 summary: [ndmp] Moved logic to ADCS and merged trigger with an existing one details: https://code.openbravo.com/erp/devel/pi/rev/c4f6472dbecc changeset: 33906:c4f6472dbecc user: Javier Armendáriz <javier.armendariz <at> openbravo.com> date: Fri Apr 20 09:03:56 2018 +0200 summary: [ndmp] Fixed trigger for Oracle details: https://code.openbravo.com/erp/devel/pi/rev/ce1bc3c2342e changeset: 33907:ce1bc3c2342e user: Javier Armendáriz <javier.armendariz <at> openbravo.com> date: Fri Apr 20 12:56:41 2018 +0200 summary: [ndmp] Simplified ADCS logic details: https://code.openbravo.com/erp/devel/pi/rev/00f1a975e4dc changeset: 33908:00f1a975e4dc user: Javier Armendáriz <javier.armendariz <at> openbravo.com> date: Mon Apr 23 10:56:11 2018 +0200 summary: [ndmp] Merge with pi details: https://code.openbravo.com/erp/devel/pi/rev/6221542a210f changeset: 33909:6221542a210f user: Javier Armendáriz <javier.armendariz <at> openbravo.com> date: Wed May 02 10:55:43 2018 +0200 summary: [ndmp] Code review fixes. - Changed error message - Java format fixes - Change public API method names - Checking if there are modules as "In Development" in the initializer - Moving initializer logic to KernelApplicationInitializer details: https://code.openbravo.com/erp/devel/pi/rev/5801b3c4d560 changeset: 33910:5801b3c4d560 user: Javier Armendáriz <javier.armendariz <at> openbravo.com> date: Wed May 02 17:46:47 2018 +0200 summary: [ndmp] Code review fixes. - Improved comment in trigger - Added a failsafe action in ActiveInstanceProcess when ADCS is not available (ant activate.instance) details: https://code.openbravo.com/erp/devel/pi/rev/4c64c3a720ab changeset: 33911:4c64c3a720ab user: Javier Armendáriz <javier.armendariz <at> openbravo.com> date: Thu May 03 10:35:59 2018 +0200 summary: [ndmp] Code review fixes. - Fixed java file formatting. details: https://code.openbravo.com/erp/devel/pi/rev/46704bfeb4b2 changeset: 33912:46704bfeb4b2 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu May 03 10:51:18 2018 +0200 summary: [ndmp] Minor code improvements details: https://code.openbravo.com/erp/devel/pi/rev/3d4d46f2c932 changeset: 33913:3d4d46f2c932 user: Javier Armendáriz <javier.armendariz <at> openbravo.com> date: Thu May 03 10:58:06 2018 +0200 summary: Fixed issue 38350: Unmark in development modules in production instances diffstat: .hgsigs | 1 + .hgtags | 1 + build.xml | 25 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml | 12 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml | 3 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml | 3 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNOINVPAIDSTATUS.xml | 3 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml | 3 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml | 5 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ModifyPaymentPlanHook.java | 44 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/ModifyPaymentPlanActionHandler.java | 49 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/ModifyPaymentPlanHookCaller.java | 45 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/Transactions.java | 22 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.java | 24 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java | 72 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/MatchTransactionDao.java | 76 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java | 52 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java | 6 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_BankStatementProcess.java | 33 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java | 21 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 4 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 33 - modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertActionHandler.java | 10 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ComputeWindowActionHandler.java | 10 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachImplementationManager.java | 22 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/CloneOrderActionHandler.java | 44 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java | 54 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationActionHandler.java | 16 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationHandler.java | 42 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/report/CompiledReportManager.java | 162 + modules/org.openbravo.client.application/src/org/openbravo/client/application/report/JmxReportCache.java | 59 + modules/org.openbravo.client.application/src/org/openbravo/client/application/report/JmxReportCacheMBean.java | 50 + modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportCompiler.java | 165 + modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportFiller.java | 134 + modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportingUtils.java | 288 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ApplicationDictionaryCachedStructures.java | 59 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-user-profile-widget.js | 27 +- modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/freemarker/test/GenerateComponentTest.java | 15 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponent.java | 29 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelApplicationInitializer.java | 36 +- modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java | 12 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 13 - modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java | 61 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ADTreeDatasourceService.java | 19 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceProperty.java | 10 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java | 21 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/LinkToParentTreeDatasourceService.java | 46 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 23 - modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 37 +- referencedata/sampledata/F_B_International_Group/AD_ORG.xml | 24 + referencedata/sampledata/QA_Testing/AD_ORG.xml | 8 + src-core/.settings/org.eclipse.jdt.core.prefs | 11 - src-core/build.xml | 4 +- src-core/src/org/openbravo/buildvalidation/BuildValidationHandler.java | 9 +- src-db/database/build-create.xml | 8 +- src-db/database/build.xml | 4 +- src-db/database/lib/dbsourcemanager.jar | Bin src-db/database/model/functions/AD_GET_ORG_LE_BU.xml | 100 +- src-db/database/model/functions/AD_GET_ORG_LE_BU_TREENODE.xml | 101 + src-db/database/model/functions/AD_ORG_GETCALENDAROWNER.xml | 60 +- src-db/database/model/functions/AD_ORG_GETCALENDAROWNERTN.xml | 77 + src-db/database/model/functions/AD_ORG_GETPERIODCONTROLALLOW.xml | 42 +- src-db/database/model/functions/AD_ORG_GETPERIODCONTROLALLOWTN.xml | 65 + src-db/database/model/functions/AD_ORG_READY.xml | 94 +- src-db/database/model/functions/A_ASSET_CREATE.xml | 35 +- src-db/database/model/functions/C_BP_SOCREDITUSED_REFRESH.xml | 6 +- src-db/database/model/functions/C_CASH_POST.xml | 78 +- src-db/database/model/functions/C_CONVERT_DOC_CURRENCY.xml | 10 +- src-db/database/model/functions/C_CREATE_PINVOICE_FROM_OUTS.xml | 7 +- src-db/database/model/functions/C_CURRENCY_CONVERT.xml | 3 +- src-db/database/model/functions/C_CURRENCY_CONVERT_PRECISION.xml | 3 +- src-db/database/model/functions/C_CURRENCY_CONVERT_RATE.xml | 3 +- src-db/database/model/functions/C_CURRENCY_RATE.xml | 3 +- src-db/database/model/functions/C_GETWITHHOLDING.xml | 15 +- src-db/database/model/functions/C_GET_CURRENCY_PRECISION.xml | 3 +- src-db/database/model/functions/C_GET_DEFAULT_PERIOD.xml | 11 +- src-db/database/model/functions/C_GET_NET_AMOUNT_FROM_GROSS.xml | 3 +- src-db/database/model/functions/C_GET_NET_PRICE_FROM_GROSS.xml | 3 +- src-db/database/model/functions/C_GET_TAX_AMT_FROM_NET.xml | 3 +- src-db/database/model/functions/C_INVOICE_CREATE.xml | 11 +- src-db/database/model/functions/C_INVOICE_CREATE0.xml | 3 +- src-db/database/model/functions/C_INVOICE_CREATERECEIPT.xml | 3 +- src-db/database/model/functions/C_INVOICE_POST.xml | 41 +- src-db/database/model/functions/C_ORDER_POST1.xml | 4 +- src-db/database/model/functions/C_PROJECT_WON.xml | 8 +- src-db/database/model/functions/C_TAXPAYMENT_POST.xml | 8 +- src-db/database/model/functions/MA_PRODUCTIONRUN_STANDARD.xml | 3 +- src-db/database/model/functions/MRP_PURCHASEPLAN.xml | 5 +- src-db/database/model/functions/MRP_RUN_EXPLODE.xml | 5 +- src-db/database/model/functions/MRP_RUN_INITIALIZE.xml | 8 +- src-db/database/model/functions/M_GET_STOCK_PARAM.xml | 3 +- src-db/database/model/functions/M_INOUT_CREATE0.xml | 3 +- src-db/database/model/functions/M_INOUT_POST.xml | 1 - src-db/database/model/functions/M_MOVEMENT_POST.xml | 1 + src-db/database/model/functions/M_RESERVATION_REALLOCATE.xml | 3 +- src-db/database/model/functions/M_RESERVE_STOCK_AUTO.xml | 3 +- src-db/database/model/functions/M_WAREHOUSE_DEFAULT_RULE_PARAM.xml | 3 +- src-db/database/model/tables/AD_HEARTBEAT_LOG.xml | 4 - src-db/database/model/tables/AD_MODULE.xml | 4 - src-db/database/model/tables/AD_MODULE_INSTALL.xml | 4 - src-db/database/model/tables/AD_ORG.xml | 35 + src-db/database/model/tables/AD_PROCESS_REQUEST.xml | 4 + src-db/database/model/tables/AD_SYSTEM_INFO.xml | 4 - src-db/database/model/triggers/AD_CALLOUT_TRG.xml | 21 +- src-db/database/model/triggers/AD_MODULE_TRG.xml | 81 +- src-db/database/model/triggers/AD_MODULE_TRG2.xml | 3 +- src-db/database/model/triggers/C_ORDERLINE_TRG2.xml | 15 +- src-db/database/model/triggers/C_PERIOD_TRG.xml | 9 +- src-db/database/model/triggers/M_RESERVATION_TRG.xml | 3 +- src-db/database/sourcedata/AD_COLUMN.xml | 365 +- src-db/database/sourcedata/AD_DATASET_COLUMN.xml | 11 - src-db/database/sourcedata/AD_ELEMENT.xml | 110 +- src-db/database/sourcedata/AD_FIELD.xml | 247 +- src-db/database/sourcedata/AD_FIELDGROUP.xml | 10 + src-db/database/sourcedata/AD_MESSAGE.xml | 40 +- src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 1580 ---------- src-db/database/sourcedata/AD_REFERENCE.xml | 14 + src-db/database/sourcedata/AD_VAL_RULE.xml | 4 +- src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 19 +- src-test/src/org/openbravo/test/AllAntTaskTests.java | 16 +- src-test/src/org/openbravo/test/AllQuickAntTaskTests.java | 6 +- src-test/src/org/openbravo/test/AllTests.java | 6 +- src-test/src/org/openbravo/test/AntTaskTests.java | 6 +- src-test/src/org/openbravo/test/base/OBBaseTest.java | 43 +- src-test/src/org/openbravo/test/dal/DalComplexQueryRequisitionTest.java | 67 +- src-test/src/org/openbravo/test/dal/DalComplexQueryTestOrderLine.java | 22 +- src-test/src/org/openbravo/test/dal/DalQueryTest.java | 11 +- src-test/src/org/openbravo/test/dal/IssuesTest.java | 10 +- src-test/src/org/openbravo/test/generalsetup/enterprise/organization/ADOrgPersistInfoConstants.java | 57 + src-test/src/org/openbravo/test/generalsetup/enterprise/organization/ADOrgPersistInfoCornerCaseOrgTest.java | 59 + src-test/src/org/openbravo/test/generalsetup/enterprise/organization/ADOrgPersistInfoSetReadyTest.java | 109 + src-test/src/org/openbravo/test/generalsetup/enterprise/organization/ADOrgPersistInfoTestSuite.java | 28 + src-test/src/org/openbravo/test/generalsetup/enterprise/organization/ADOrgPersistInfoUtility.java | 294 + src-test/src/org/openbravo/test/generalsetup/enterprise/organization/ADOrgPersistOrgInfoComplexOrgTreeTest.java | 142 + src-test/src/org/openbravo/test/reporting/AllJrxmlCompilation.java | 60 +- src-test/src/org/openbravo/test/reporting/CompiledReportsCacheTest.java | 92 + src-test/src/org/openbravo/test/security/AccessLevelTest.java | 33 +- src-test/src/org/openbravo/test/security/PasswordStrengthCheckerTest.java | 78 + src-util/buildvalidation/build.xml | 7 +- src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/JdkVersionCheck.class | Bin src-util/buildvalidation/src/org/openbravo/buildvalidation/JdkVersionCheck.java | 57 - src-util/modulescript/build/classes/org/openbravo/modulescript/UpdatePersistOrgInfo.class | Bin src-util/modulescript/build/classes/org/openbravo/modulescript/UpdatePersistOrgInfoData.class | Bin src-util/modulescript/src/org/openbravo/modulescript/UpdatePersistOrgInfo.java | 61 + src-util/modulescript/src/org/openbravo/modulescript/UpdatePersistOrgInfo_data.xsql | 123 + src/build.xml | 47 - src/org/openbravo/authentication/ChangePasswordException.java | 41 + src/org/openbravo/base/secureApp/LoginHandler.java | 56 +- src/org/openbravo/base/structure/BaseOBObject.java | 10 +- src/org/openbravo/costing/CostingUtils.java | 26 +- src/org/openbravo/dal/service/OBDal.java | 74 +- src/org/openbravo/dal/service/OBQuery.java | 78 +- src/org/openbravo/erpCommon/ad_actionButton/CreateWorkEffort.java | 10 +- src/org/openbravo/erpCommon/ad_callouts/SE_Locator_Activate.java | 27 +- src/org/openbravo/erpCommon/ad_forms/Heartbeat.java | 5 +- src/org/openbravo/erpCommon/ad_forms/Heartbeat_data.xsql | 8 +- src/org/openbravo/erpCommon/ad_forms/InstancePurpose.java | 12 +- src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java | 4 +- src/org/openbravo/erpCommon/ad_process/SystemInfo_data.xsql | 9 +- src/org/openbravo/erpCommon/ad_process/assets/AssetLinearDepreciationMethodProcess.java | 31 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java | 14 +- src/org/openbravo/erpCommon/ad_reports/ReportProjectProfitabilityJR.java | 48 +- src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceJR.java | 17 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalanceDetail_data.xsql | 6 +- src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDaily.java | 12 +- src/org/openbravo/erpCommon/businessUtility/Heartbeat_data.xsql | 33 - src/org/openbravo/erpCommon/businessUtility/Preferences.java | 52 +- src/org/openbravo/erpCommon/modules/ImportModule.java | 20 - src/org/openbravo/erpCommon/obps/ActiveInstanceProcess.java | 27 +- src/org/openbravo/erpCommon/security/Login.java | 71 +- src/org/openbravo/erpCommon/utility/DimensionDisplayUtility.java | 42 +- src/org/openbravo/erpCommon/utility/ReferencedLink.java | 9 +- src/org/openbravo/erpCommon/utility/SystemInfo.java | 8 +- src/org/openbravo/erpCommon/utility/SystemInfo_data.xsql | 12 +- src/org/openbravo/erpCommon/utility/Utility.java | 4 +- src/org/openbravo/erpReports/C_OrderLinesTaxIncludedJR.jrxml | 2 +- src/org/openbravo/erpReports/C_OrderLinesTaxIncludedJR_new.jrxml | 2 +- src/org/openbravo/erpReports/RptC_Remittance.java | 11 +- src/org/openbravo/financial/ResetAccounting.java | 196 +- src/org/openbravo/materialmgmt/InventoryCountProcess.java | 6 +- src/org/openbravo/service/password/PasswordStrengthChecker.java | 117 + 182 files changed, 4350 insertions(+), 3688 deletions(-) diffs (truncated from 13634 to 300 lines): diff -r 6040f148b004 -r 3d4d46f2c932 .hgsigs --- a/.hgsigs Fri Feb 23 19:09:51 2018 -0500 +++ b/.hgsigs Thu May 03 10:58:06 2018 +0200 @@ -228,3 +228,4 @@ f06ec509f2bf413f13d422e937ec12531fe1821a 0 iEYEABECAAYFAlqzgcwACgkQCX/oGf+2qkP/EACeJH+QthNIdldCdTvfnllHXTXDo24AnRVV1DveMhhNbgb50zu8ETDZ1WVT b90f619fc9f3f9ca6439969e99f742f9a9403f82 0 iEYEABECAAYFAlqMGfIACgkQCX/oGf+2qkPjiQCgyYNqJlbSOSoax5ydjqpJKun85RIAoM9s2iEyLfJ8CJyfUXFmz6FtvmqC c38ab6f55348fbb5963fd77b770f939a5c0eda23 0 iEYEABECAAYFAlq0lSgACgkQCX/oGf+2qkN3FwCgggZ7hoUQveeRYCuBBuHAi77v84gAn1RBjuscKhHjc7ouPvgiPgIVanBb +9bad88c00b5da708f3e9c1abacd25ea6e6cfd664 0 iEUEABECAAYFAlrXODoACgkQCX/oGf+2qkOblACg0WOwH27TgkH75iKw2Y9tNYxSL8oAl3j0FbjQF6F05ESzZC0l3Uv2Nfg= diff -r 6040f148b004 -r 3d4d46f2c932 .hgtags --- a/.hgtags Fri Feb 23 19:09:51 2018 -0500 +++ b/.hgtags Thu May 03 10:58:06 2018 +0200 @@ -239,3 +239,4 @@ 7b0d4c95c2b308cd1b12dcfbe2a36c7f77fb49a4 3.0PR17Q4.2 46184d2680e43a9b29d3058a75dea7d15d47b4b4 3.0PR18Q1 03f6ac7d17926657b093b25f613a4cd3fb47ef65 3.0PR18Q1.1 +650aaadd6b6c5fda4f7ad957701face4fa4c3317 3.0PR18Q1.2 diff -r 6040f148b004 -r 3d4d46f2c932 build.xml --- a/build.xml Fri Feb 23 19:09:51 2018 -0500 +++ b/build.xml Thu May 03 10:58:06 2018 +0200 @@ -96,8 +96,6 @@ <property name="buildValidation" value="true"/> <property name="modules" value=""/> - <available file=".hg" property="is.hg" /> - <condition property="xdoclint.missing" value="" else="-Xdoclint:-missing"> <equals arg1="${ant.java.version}" arg2="1.7"/> </condition> @@ -347,22 +345,14 @@ <taskdef resource="axis-tasks.properties" classpathref="project.class.path" /> - <target name="init" depends="code.rev"> + <target name="init"> <fail if="root.user" message="Don't run ant tasks with the root user" /> <fail if="no.java.home" message="The environment variable JAVA_HOME is not set." /> - </target> - - <target name="code.rev" depends="set.code.rev"> - <condition property="code.revision" value="${hg.id}" else="0"> - <isset property="hg.id" /> - </condition> - </target> - - <target name="set.code.rev" if="is.hg"> - <exec executable="hg" outputproperty="hg.id" failifexecutionfails="false"> - <arg value="id"/> - <arg value="-i"/> - </exec> + <fail message="Unsupported Java version ${ant.java.version}. Minimum required is 7 (1.7)."> + <condition> + <equals arg1="${ant.java.version}" arg2="1.6"/> + </condition> + </fail> </target> <target name="compile.complete" depends="init, core.lib, wad.lib, trl.lib"> @@ -821,7 +811,6 @@ <jvmarg line="${env.CATALINA_OPTS}" /> <jvmarg value="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" /> <jvmarg value="-Djava.util.logging.config.file=${env.CATALINA_BASE}/conf/logging.properties" /> - <jvmarg value="-Djava.endorsed.dirs=${env.CATALINA_HOME}/endorsed" /> <jvmarg value="-Dcatalina.base=${env.CATALINA_BASE}" /> <jvmarg value="-Dcatalina.home=${env.CATALINA_HOME}" /> <jvmarg value="-Djava.io.tmpdir=${env.CATALINA_BASE}/temp" /> @@ -951,8 +940,6 @@ replace="\1${core.rev}\3" byline="true"/> - <echo message="${hg.id}" file="${tmpdir}/config/instance.revision"/> - <delete includeEmptyDirs="true"> <fileset dir="${tmpdir}/modules" includes="**/*" defaultexcludes="no"/> </delete> diff -r 6040f148b004 -r 3d4d46f2c932 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 Feb 23 19:09:51 2018 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Thu May 03 10:58:06 2018 +0200 @@ -657,7 +657,8 @@ v_ConvertedAmount := COALESCE(V_OutstandingAmount, 0) * v_creditmultiplier; end if; UPDATE C_BPARTNER - SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) + v_ConvertedAmount + SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) + v_ConvertedAmount, + UPDATED = now() WHERE C_BPARTNER_ID = v_BPartner_ID; -- Automatic creation of payment and financial transaction @@ -999,7 +1000,8 @@ v_ConvertedAmount := (COALESCE(cur_paymentschedule.OUTSTANDINGAMT, 0) * v_creditmultiplier); end if; UPDATE C_BPARTNER - SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) - v_ConvertedAmount + SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) - v_ConvertedAmount, + UPDATED = now() WHERE C_BPARTNER_ID = v_BPartner_ID; END IF; -- Automatic creation of financial transaction @@ -1070,8 +1072,6 @@ ELSIF (p_docaction = 'RE') THEN DECLARE - v_count NUMBER; - v_documentno VARCHAR2(40); v_PaymentPlanExpectedTotal NUMBER:= 0; BEGIN SELECT count(*), max(p.documentno) @@ -1148,7 +1148,8 @@ v_ConvertedAmount := ((v_PaymentPlanExpectedTotal - v_PaidAmount) * v_creditmultiplier); END IF; UPDATE C_BPARTNER - SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) - v_convertedAmount + SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) - v_convertedAmount, + UPDATED = now() WHERE C_BPARTNER_ID = v_BPartner_ID; -- Delete C_InvoiceTax_CashVAT records for this invoice @@ -1168,7 +1169,6 @@ ELSIF (p_docaction = 'RC') THEN DECLARE - v_count NUMBER; v_prepaymentamt NUMBER; BEGIN v_delete_paymentplan := TRUE; diff -r 6040f148b004 -r 3d4d46f2c932 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml Fri Feb 23 19:09:51 2018 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml Thu May 03 10:58:06 2018 +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) 2013-2015 Openbravo SLU +* All portions are Copyright (C) 2013-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ @@ -97,7 +97,6 @@ DECLARE v_payment_schedule_order VARCHAR2(32); - v_count NUMBER; v_pendingamount NUMBER; cur_invoicepayments RECORD; BEGIN diff -r 6040f148b004 -r 3d4d46f2c932 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml Fri Feb 23 19:09:51 2018 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml Thu May 03 10:58:06 2018 +0200 @@ -19,7 +19,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) 2011-2016 Openbravo SLU +* All portions are Copyright (C) 2011-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ @@ -106,6 +106,7 @@ WHEN OTHERS THEN DBMS_OUTPUT.PUT_LINE('aprm_ispaymentconfirmed exception'); RAISE; + RETURN NULL; END APRM_ISPAYMENTCONFIRMED ]]></body> </function> diff -r 6040f148b004 -r 3d4d46f2c932 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNOINVPAIDSTATUS.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNOINVPAIDSTATUS.xml Fri Feb 23 19:09:51 2018 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNOINVPAIDSTATUS.xml Thu May 03 10:58:06 2018 +0200 @@ -22,7 +22,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) 2015 Openbravo SLU +* All portions are Copyright (C) 2015-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ @@ -43,6 +43,7 @@ WHEN OTHERS THEN DBMS_OUTPUT.PUT_LINE('aprm_seqnumberinvoicepaidstatus exception'); RAISE; + RETURN NULL; END APRM_SEQNOINVPAIDSTATUS ]]></body> </function> diff -r 6040f148b004 -r 3d4d46f2c932 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml Fri Feb 23 19:09:51 2018 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml Thu May 03 10:58:06 2018 +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) 2014-2017 Openbravo SLU +* All portions are Copyright (C) 2014-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ @@ -49,6 +49,7 @@ WHEN OTHERS THEN DBMS_OUTPUT.PUT_LINE('aprm_seqnumberpaymentstatus exception'); RAISE; + RETURN NULL; END APRM_SEQNUMBERPAYMENTSTATUS ]]></body> </function> diff -r 6040f148b004 -r 3d4d46f2c932 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 Fri Feb 23 19:09:51 2018 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml Thu May 03 10:58:06 2018 +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-2014 Openbravo SLU +* All portions are Copyright (C) 2010-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ @@ -175,7 +175,8 @@ WHERE C_TAXPAYMENT_ID = p_record_id; -- Updating SO_CREDITUSED when PAYMENT OCCUR UPDATE C_BPARTNER - SET SO_CREDITUSED = SO_CREDITUSED - COALESCE(p_amount, 0) + SET SO_CREDITUSED = SO_CREDITUSED - COALESCE(p_amount, 0), + UPDATED = now() WHERE C_BPARTNER_ID = v_BPartner_ID; -- Automatic creation of financial transaction diff -r 6040f148b004 -r 3d4d46f2c932 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ModifyPaymentPlanHook.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ModifyPaymentPlanHook.java Thu May 03 10:58:06 2018 +0200 @@ -0,0 +1,44 @@ +/* + ************************************************************************* + * 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) 2018 Openbravo SLU + * All Rights Reserved. + * Contributor(s): + ************************************************************************* + */ +package org.openbravo.advpaymentmngt; + +import java.util.List; + +import org.openbravo.base.exception.OBException; +import org.openbravo.model.financialmgmt.payment.FIN_PaymentSchedule; + +/*** + * Abstract class created to implement hooks inside Modify Payment Plan process. All hooks in that + * process must extend this class so they implement the methods + * + * @author Andy Armaignac Collazo + * + */ +public abstract class ModifyPaymentPlanHook { + + /*** + * Method to validate the modified payment schedule + * + * @param modifiedPaymentSchedule + * + * @throws OBException + */ + public abstract void validatePaymentSchedule(List<FIN_PaymentSchedule> modifiedPaymentSchedule) + throws OBException; +} diff -r 6040f148b004 -r 3d4d46f2c932 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/ModifyPaymentPlanActionHandler.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/ModifyPaymentPlanActionHandler.java Fri Feb 23 19:09:51 2018 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/ModifyPaymentPlanActionHandler.java Thu May 03 10:58:06 2018 +0200 @@ -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-2017 Openbravo SLU + * All portions are Copyright (C) 2012-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -36,14 +36,13 @@ import org.hibernate.exception.ConstraintViolationException; import org.openbravo.advpaymentmngt.dao.AdvPaymentMngtDao; import org.openbravo.advpaymentmngt.process.FIN_PaymentMonitorProcess; -import org.openbravo.base.secureApp.VariablesSecureApp; +import org.openbravo.base.weld.WeldUtils; import org.openbravo.client.application.ApplicationConstants; import org.openbravo.client.application.process.BaseProcessActionHandler; import org.openbravo.client.kernel.KernelUtils; -import org.openbravo.dal.core.OBContext; import org.openbravo.dal.service.OBCriteria; import org.openbravo.dal.service.OBDal; -import org.openbravo.erpCommon.utility.Utility; +import org.openbravo.erpCommon.utility.OBMessageUtils; ------------------------------------------------------------------------------ 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
