details: https://code.openbravo.com/erp/devel/main/rev/e3fcc266a709 changeset: 19410:e3fcc266a709 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Mon Jan 21 10:31:14 2013 +0100 summary: Fixed bug 22842 Show the date when the entries have different Acctdate in JER
details: https://code.openbravo.com/erp/devel/main/rev/b9b57bed1a71 changeset: 19411:b9b57bed1a71 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Mon Jan 21 10:48:37 2013 +0100 summary: Fixes issue 22850: Impossible creating Refund Payment refunding credit amount. details: https://code.openbravo.com/erp/devel/main/rev/6acc174f0281 changeset: 19412:6acc174f0281 user: David Miguelez <david.miguelez <at> openbravo.com> date: Fri Jan 18 09:47:36 2013 +0100 summary: Fixes Issue 0022826. Adds Conversion Rates for F&B Client in 2013. details: https://code.openbravo.com/erp/devel/main/rev/aaf6f469e183 changeset: 19413:aaf6f469e183 user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Jan 23 06:41:23 2013 +0000 summary: Update AD_MODULE version to 3.0MP19.2 details: https://code.openbravo.com/erp/devel/main/rev/b495316d385b changeset: 19414:b495316d385b user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Jan 23 06:41:24 2013 +0000 summary: Added tag 3.0MP19.2 for changeset aaf6f469e183 details: https://code.openbravo.com/erp/devel/main/rev/72945a787063 changeset: 19415:72945a787063 user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Jan 23 06:41:25 2013 +0000 summary: Added signature for changeset b495316d385b details: https://code.openbravo.com/erp/devel/main/rev/11b4cc847ce4 changeset: 19416:11b4cc847ce4 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Jan 24 05:59:49 2013 +0000 summary: Merge temporary head for 3.0MP19.2 diffstat: .hgsigs | 4 + .hgtags | 4 + build.xml | 37 +- config/Openbravo.properties.template | 6 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml | 11 + 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-db/database/sourcedata/OBUIAPP_PARAMETER.xml | 10 + 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 | 47 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js | 2 +- 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/model/modifiedTables/AD_MENU.xml | 7 + 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 | 86 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml | 12 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml | 115 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 66 + 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-db/database/sourcedata/AD_REF_LIST.xml | 22 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TAB.xml | 1 + modules/org.openbravo.client.application/src-db/database/sourcedata/OBCLKER_TEMPLATE.xml | 12 + modules/org.openbravo.client.application/src-db/database/sourcedata/OBCLKER_TEMPLATE_DEPENDENCY.xml | 9 + modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java | 6 + modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java | 39 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/OBBindings.java | 7 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ParameterUtils.java | 10 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ViewComponent.java | 27 +- 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/QuickLaunchDataSource.java | 9 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java | 2 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/application-menu.js.ftl | 5 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationHandler.java | 2 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java | 66 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/process/DefaultsProcessActionHandler.java | 102 + modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-param-window-parameter.ftl | 32 + modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-pick-and-execute-view-window.js.ftl | 32 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewParameterHandler.java | 127 + modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java | 31 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ParameterWindowComponent.java | 137 ++ modules/org.openbravo.client.application/src/org/openbravo/client/application/window/StandardWindowComponent.java | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js | 2 +- 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-window.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-application-menu.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-quick-launch.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js | 406 ++++++ modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 77 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-view.js | 154 +-- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js | 1 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-action-def.js | 91 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-action.js | 267 ++++ modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-view-manager.js | 1 - 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.kernel/src/org/openbravo/client/kernel/BaseComponent.java | 2 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/DateUIDefinition.java | 16 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java | 9 + 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_MODULE.xml | 4 +- 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 | 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.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.datasource/src/org/openbravo/service/datasource/ReadOnlyDataSourceService.java | 3 + 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.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java | 9 +- 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.selector/src-db/database/sourcedata/AD_REFERENCE.xml | 28 + modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml | 10 + modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 16 + modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 22 + modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java | 47 +- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponentProvider.java | 2 + modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/FKMultiSelectorUIDefinition.java | 33 + modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/FKSelectorUIDefinition.java | 31 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-multi-selector-item.js | 276 ++++ modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 160 ++- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.userinterface.selector/ob-selector-item-styles.js | 33 + 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.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/F_B_International_Group.xml | 660 +++++++++- referencedata/sampledata/QA_Testing.xml | 408 +++++- src-db/database/model/functions/C_TAXPAYMENT_POST.xml | 4 + src-db/database/model/functions/M_INOUT_POST.xml | 85 +- src-db/database/model/functions/M_INTERNAL_CONSUMPTION_POST1.xml | 10 + src-db/database/model/functions/M_PROMOTION_CALCULATE.xml | 34 +- src-db/database/model/functions/M_RESERVATION_POST.xml | 124 +- src-db/database/model/tables/AD_ROLE.xml | 5 + 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_COLUMN.xml | 52 +- src-db/database/sourcedata/AD_ELEMENT.xml | 14 + src-db/database/sourcedata/AD_FIELD.xml | 46 +- src-db/database/sourcedata/AD_MESSAGE.xml | 90 +- src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_PROCESS.xml | 2 +- src-db/database/sourcedata/AD_REFERENCE.xml | 39 + src-db/database/sourcedata/AD_REF_LIST.xml | 35 + src-db/database/sourcedata/AD_TAB.xml | 2 +- src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml | 10 + src-db/database/sourcedata/OBUIAPP_PARAMETER.xml | 8 + src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 34 + src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 339 +++++- 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/dal/core/DalSessionFactory.java | 13 +- src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Amt.java | 47 +- src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Product.java | 22 +- src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java | 84 +- src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product.java | 30 +- src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 8 +- src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 3 + 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/ReportOrderNotInvoice_data.xsql | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.java | 10 +- src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java | 7 +- src/org/openbravo/erpCommon/businessUtility/PriceAdjustment.java | 249 +++ src/org/openbravo/erpCommon/modules/ExtractModule.java | 62 +- src/org/openbravo/erpCommon/modules/ExtractModuleTask.java | 19 +- src/org/openbravo/erpCommon/modules/ExtractModule_data.xsql | 5 +- src/org/openbravo/erpCommon/modules/ImportModule.java | 16 +- src/org/openbravo/erpCommon/modules/ModuleUtiltiy.java | 25 +- src/org/openbravo/erpCommon/utility/OBMessageUtils.java | 3 + src/org/openbravo/scheduling/OBScheduler.java | 8 +- 162 files changed, 5248 insertions(+), 680 deletions(-) diffs (truncated from 10965 to 300 lines): diff -r 964842f76d10 -r 11b4cc847ce4 .hgsigs --- a/.hgsigs Thu Jan 17 13:00:04 2013 +0000 +++ b/.hgsigs Thu Jan 24 05:59:49 2013 +0000 @@ -96,3 +96,7 @@ 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 964842f76d10 -r 11b4cc847ce4 .hgtags --- a/.hgtags Thu Jan 17 13:00:04 2013 +0000 +++ b/.hgtags Thu Jan 24 05:59:49 2013 +0000 @@ -107,3 +107,7 @@ 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 964842f76d10 -r 11b4cc847ce4 build.xml --- a/build.xml Thu Jan 17 13:00:04 2013 +0000 +++ b/build.xml Thu Jan 24 05:59:49 2013 +0000 @@ -89,6 +89,8 @@ <property name="obx.export.RD" value="false" /> <property name="obx.export.DB" value="false" /> <property name="obx.export.CS" value="false" /> + <property name="obx.export.validate" value="true" /> + <property name="obx.export.allDeps" value="false" /> <property name="chekPerms" value="false" /> <property name="force" value="false" /> <property name="strict.template.application" value="false" /> @@ -153,6 +155,13 @@ <equals arg1="true" arg2="${obx.export.CS}" /> </or> </condition> + + <condition property="obx.exp.validate"> + <or> + <equals arg1="yes" arg2="${obx.export.validate}" /> + <equals arg1="true" arg2="${obx.export.validate}" /> + </or> + </condition> <condition property="timestamp"> <or> @@ -927,31 +936,39 @@ <antcall target="export.config.script" /> </target> - <target name="package.module"> - <taskdef name="extractModule" classname="org.openbravo.erpCommon.modules.ExtractModuleTask"> + <target name="obx.export.validateModules" if="obx.exp.validate"> + <taskdef name="validateModules" classname="org.openbravo.service.system.SystemValidationTask"> <classpath refid="project.class.path" /> </taskdef> - <taskdef name="validateModules" classname="org.openbravo.service.system.SystemValidationTask"> - <classpath refid="project.class.path" /> - </taskdef> - <taskdef name="WADValidation" classname="org.openbravo.wad.validation.WADValidatorTask"> <classpath refid="project.class.path" /> </taskdef> - + <echo message="Validating Module..." /> - + <WADValidation propertiesFile="${base.config}/Openbravo.properties" modules="${module}" stoponerror="true"/> <validateModules moduleJavaPackage="${module}" failOnError="true" userId="0" adminMode="true" propertiesFile="${base.config}/Openbravo.properties" type="module" /> - + </target> + + <target name="package.module"> + <taskdef name="extractModule" classname="org.openbravo.erpCommon.modules.ExtractModuleTask"> + <classpath refid="project.class.path" /> + </taskdef> + + <antcall target="obx.export.validateModules" /> <antcall target="obx.export.database" /> <antcall target="obx.export.config.script" /> - <extractModule moduleName="${module}" userId="0" adminMode="true" propertiesFile="${base.config}/Openbravo.properties" exportRD="${obx.export.RD}" /> + <extractModule moduleName="${module}" + userId="0" + adminMode="true" + propertiesFile="${base.config}/Openbravo.properties" + exportRD="${obx.export.RD}" + addAllDependencies="${obx.export.allDeps}"/> </target> <target name="diagnostic"> diff -r 964842f76d10 -r 11b4cc847ce4 config/Openbravo.properties.template --- a/config/Openbravo.properties.template Thu Jan 17 13:00:04 2013 +0000 +++ b/config/Openbravo.properties.template Thu Jan 24 05:59:49 2013 +0000 @@ -204,3 +204,9 @@ # By default those all not generated anymore for tabs for which they are not needed #wad.generateAllClassic250Windows=true +# background.policy property defines whether background processes should be +# executed in this context or not. To prevent process execution this property must +# be set to no-execute +background.policy=default + + diff -r 964842f76d10 -r 11b4cc847ce4 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Thu Jan 17 13:00:04 2013 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Thu Jan 24 05:59:49 2013 +0000 @@ -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 964842f76d10 -r 11b4cc847ce4 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Jan 17 13:00:04 2013 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Jan 24 05:59:49 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.19229]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.19408]]></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[MP19.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 964842f76d10 -r 11b4cc847ce4 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 Jan 17 13:00:04 2013 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Jan 24 05:59:49 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.19229]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.19408]]></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.19229]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.19408]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 964842f76d10 -r 11b4cc847ce4 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml Thu Jan 17 13:00:04 2013 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml Thu Jan 24 05:59:49 2013 +0000 @@ -18,6 +18,7 @@ <!--0586B9F7ED4147758536007BF402F1DF--> <ISFIXED><![CDATA[Y]]></ISFIXED> <!--0586B9F7ED4147758536007BF402F1DF--> <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE> <!--0586B9F7ED4147758536007BF402F1DF--> <OBUIAPP_PROCESS_ID><![CDATA[4EEB3497082C4F2182E16A4371CD5D96]]></OBUIAPP_PROCESS_ID> +<!--0586B9F7ED4147758536007BF402F1DF--> <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE> <!--0586B9F7ED4147758536007BF402F1DF--></OBUIAPP_PARAMETER> <!--0A9E075CCC6E4D59AAC37E3AEF1FE269--><OBUIAPP_PARAMETER> @@ -37,6 +38,7 @@ <!--0A9E075CCC6E4D59AAC37E3AEF1FE269--> <AD_ELEMENT_ID><![CDATA[9A0C92898CEE7AC8E040007F01003160]]></AD_ELEMENT_ID> <!--0A9E075CCC6E4D59AAC37E3AEF1FE269--> <ISFIXED><![CDATA[N]]></ISFIXED> <!--0A9E075CCC6E4D59AAC37E3AEF1FE269--> <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE> +<!--0A9E075CCC6E4D59AAC37E3AEF1FE269--> <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE> <!--0A9E075CCC6E4D59AAC37E3AEF1FE269--> <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[FF80808133186ADD01331B3A932C000D]]></EM_OBKMO_WIDGET_CLASS_ID> <!--0A9E075CCC6E4D59AAC37E3AEF1FE269--></OBUIAPP_PARAMETER> @@ -58,6 +60,7 @@ <!--111000BF6C4445E785AA08331A268E1B--> <ISFIXED><![CDATA[Y]]></ISFIXED> <!--111000BF6C4445E785AA08331A268E1B--> <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE> <!--111000BF6C4445E785AA08331A268E1B--> <OBUIAPP_PROCESS_ID><![CDATA[6F87442DF7BC43AB8A666BDED2F7D64E]]></OBUIAPP_PROCESS_ID> +<!--111000BF6C4445E785AA08331A268E1B--> <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE> <!--111000BF6C4445E785AA08331A268E1B--></OBUIAPP_PARAMETER> <!--2653B134344A4BBEBA417F6CFEDE8D91--><OBUIAPP_PARAMETER> @@ -77,6 +80,7 @@ <!--2653B134344A4BBEBA417F6CFEDE8D91--> <AD_ELEMENT_ID><![CDATA[9A0C92898CF17AC8E040007F01003160]]></AD_ELEMENT_ID> <!--2653B134344A4BBEBA417F6CFEDE8D91--> <ISFIXED><![CDATA[N]]></ISFIXED> <!--2653B134344A4BBEBA417F6CFEDE8D91--> <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE> +<!--2653B134344A4BBEBA417F6CFEDE8D91--> <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE> <!--2653B134344A4BBEBA417F6CFEDE8D91--> <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[FF80808133186ADD01331B3A932C000D]]></EM_OBKMO_WIDGET_CLASS_ID> <!--2653B134344A4BBEBA417F6CFEDE8D91--></OBUIAPP_PARAMETER> @@ -98,6 +102,7 @@ <!--8424D0FA373945708522DA3720F27BC4--> <ISFIXED><![CDATA[Y]]></ISFIXED> <!--8424D0FA373945708522DA3720F27BC4--> <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE> <!--8424D0FA373945708522DA3720F27BC4--> <OBUIAPP_PROCESS_ID><![CDATA[8D0D32CC819E449D9A08E0459B482963]]></OBUIAPP_PROCESS_ID> +<!--8424D0FA373945708522DA3720F27BC4--> <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE> <!--8424D0FA373945708522DA3720F27BC4--></OBUIAPP_PARAMETER> <!--854F44975FB84D20AE8E8DA02999747E--><OBUIAPP_PARAMETER> @@ -118,6 +123,7 @@ <!--854F44975FB84D20AE8E8DA02999747E--> <ISFIXED><![CDATA[Y]]></ISFIXED> <!--854F44975FB84D20AE8E8DA02999747E--> <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE> <!--854F44975FB84D20AE8E8DA02999747E--> <OBUIAPP_PROCESS_ID><![CDATA[4EEB3497082C4F2182E16A4371CD5D96]]></OBUIAPP_PROCESS_ID> +<!--854F44975FB84D20AE8E8DA02999747E--> <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE> <!--854F44975FB84D20AE8E8DA02999747E--></OBUIAPP_PARAMETER> <!--878E7842FC524139BBEE0CAE0C1F3E17--><OBUIAPP_PARAMETER> @@ -138,6 +144,7 @@ <!--878E7842FC524139BBEE0CAE0C1F3E17--> <ISFIXED><![CDATA[Y]]></ISFIXED> <!--878E7842FC524139BBEE0CAE0C1F3E17--> <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE> <!--878E7842FC524139BBEE0CAE0C1F3E17--> <OBUIAPP_PROCESS_ID><![CDATA[6F87442DF7BC43AB8A666BDED2F7D64E]]></OBUIAPP_PROCESS_ID> +<!--878E7842FC524139BBEE0CAE0C1F3E17--> <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE> <!--878E7842FC524139BBEE0CAE0C1F3E17--></OBUIAPP_PARAMETER> <!--BC5E638E184C4F3AB36B9DA574E0E8BB--><OBUIAPP_PARAMETER> @@ -158,6 +165,7 @@ <!--BC5E638E184C4F3AB36B9DA574E0E8BB--> <ISFIXED><![CDATA[Y]]></ISFIXED> <!--BC5E638E184C4F3AB36B9DA574E0E8BB--> <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE> <!--BC5E638E184C4F3AB36B9DA574E0E8BB--> <OBUIAPP_PROCESS_ID><![CDATA[8D0D32CC819E449D9A08E0459B482963]]></OBUIAPP_PROCESS_ID> +<!--BC5E638E184C4F3AB36B9DA574E0E8BB--> <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE> <!--BC5E638E184C4F3AB36B9DA574E0E8BB--></OBUIAPP_PARAMETER> <!--FF808081331B5EE901331B68C4540018--><OBUIAPP_PARAMETER> @@ -177,6 +185,7 @@ <!--FF808081331B5EE901331B68C4540018--> <AD_ELEMENT_ID><![CDATA[720C4FC08FBD43419FF7EACABECA6AE3]]></AD_ELEMENT_ID> <!--FF808081331B5EE901331B68C4540018--> <ISFIXED><![CDATA[N]]></ISFIXED> <!--FF808081331B5EE901331B68C4540018--> <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE> +<!--FF808081331B5EE901331B68C4540018--> <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE> <!--FF808081331B5EE901331B68C4540018--> <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[FF80808133186ADD01331B3A932C000D]]></EM_OBKMO_WIDGET_CLASS_ID> <!--FF808081331B5EE901331B68C4540018--></OBUIAPP_PARAMETER> @@ -197,6 +206,7 @@ <!--FF808081332719060133276EBC680065--> <ISFIXED><![CDATA[Y]]></ISFIXED> <!--FF808081332719060133276EBC680065--> <FIXEDVALUE><![CDATA[OB.getContext().getLanguage().getLanguage()]]></FIXEDVALUE> <!--FF808081332719060133276EBC680065--> <EVALUATEFIXEDVALUE><![CDATA[Y]]></EVALUATEFIXEDVALUE> +<!--FF808081332719060133276EBC680065--> <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE> <!--FF808081332719060133276EBC680065--> <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[FF80808133186ADD01331B3A932C000D]]></EM_OBKMO_WIDGET_CLASS_ID> <!--FF808081332719060133276EBC680065--></OBUIAPP_PARAMETER> diff -r 964842f76d10 -r 11b4cc847ce4 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 Thu Jan 17 13:00:04 2013 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java Thu Jan 24 05:59:49 2013 +0000 @@ -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 964842f76d10 -r 11b4cc847ce4 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 Thu Jan 17 13:00:04 2013 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPaymentFromJournalLine.java Thu Jan 24 05:59:49 2013 +0000 @@ -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(); ------------------------------------------------------------------------------ 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 Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
