details: https://code.openbravo.com/erp/devel/main/rev/f8452f44752e changeset: 28133:f8452f44752e user: Atul Gaware <atul.gaware <at> openbravo.com> date: Mon Nov 30 14:24:17 2015 +0530 summary: Fixes Issue 31628:Debit and Credit values not shown when running General Ledger Report in XLS format using Microsoft Office 2007
Used Numberformat parameter to format the numeric fields details: https://code.openbravo.com/erp/devel/main/rev/742cf5efa2d9 changeset: 28134:742cf5efa2d9 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Dec 01 18:36:24 2015 +0100 summary: fixes issue 31578: alert fetches with where parameter In order to avoid the fetching of the where parameter we generate the where clause inside the datasource. A new datasource has been created, ADAlertDatasourceService, to support the requests from the Alert Management window. In addition, it has been fixed a problem in the Alert Rule drop-down filter of the grids in the Alert Management window which was displaying alert rules from all the grids in the window instead of those displayed just on a particular grid. details: https://code.openbravo.com/erp/devel/main/rev/4883ab9e4334 changeset: 28135:4883ab9e4334 user: Martin Taal <martin.taal <at> openbravo.com> date: Tue Dec 01 23:19:57 2015 +0100 summary: Fixes issue 31445: Import entry process can have a stopped but not deregistered thread: tickets remain in the queue Adding log statements and catch block to prevent exiting loop details: https://code.openbravo.com/erp/devel/main/rev/711164dd549b changeset: 28136:711164dd549b user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Dec 02 10:38:04 2015 +0100 summary: related to issue 31578: code review improvements details: https://code.openbravo.com/erp/devel/main/rev/e2a3526d0bf7 changeset: 28137:e2a3526d0bf7 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Dec 14 16:48:42 2015 +0100 summary: fixes issue 31683: Some values are not shown in XLS format using MS Office The detect cell type feature was not working properly for BigInteger values in Office after the Jasper Library Upgrade. A personalized format was applied causing the data not be shown when opening the report. To solve this problem the detect cell type feature has been disabled. This way, by default, all the values in the XLS will be exported as strings. This default configuration can be overriden at report level. As an example, the General Ledger Report and Trial Balance report have been updated properly. With this configuration, those reports are now using number formatting for the cells showing the BigDecimal values. details: https://code.openbravo.com/erp/devel/main/rev/f698a5f953c8 changeset: 28138:f698a5f953c8 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Dec 15 10:41:18 2015 +0000 summary: Update AD_MODULE version to 3.0PR15Q4.1 details: https://code.openbravo.com/erp/devel/main/rev/cf00bd72641c changeset: 28139:cf00bd72641c user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Dec 15 10:41:18 2015 +0000 summary: Added tag 3.0PR15Q4.1 for changeset f698a5f953c8 details: https://code.openbravo.com/erp/devel/main/rev/4ca59f8165a0 changeset: 28140:4ca59f8165a0 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Dec 15 10:41:18 2015 +0000 summary: Added signature for changeset cf00bd72641c details: https://code.openbravo.com/erp/devel/main/rev/a40d27fe8e84 changeset: 28141:a40d27fe8e84 user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Dec 16 07:53:02 2015 +0000 summary: Merge temporary head for 3.0PR15Q4.1 diffstat: .hgsigs | 6 + .hgtags | 6 + build.xml | 20 +- legal/Licensing.txt | 2 +- lib/runtime/commons-io-2.0.1.jar | 0 lib/runtime/commons-io-2.4.jar | 0 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml | 36 + 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/AD_REF_LIST.xml | 14 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml | 5 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java | 3 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/PaymentMethodMulticurrencyActionHandler.java | 24 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/UnMatchSelectedTransactionsActionHandler.java | 151 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/GLItemSelectorFilterExpression.java | 8 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java | 160 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java | 5 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java | 2 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java | 12 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_FinaccTransactionEventListener.java | 7 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_PaymentEventListener.java | 114 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddPaymentDefaultValuesHandler.java | 68 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/ExecutePendingPayments.java | 33 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 3 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ReconciliationProcess.java | 18 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java | 66 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-findTransaction.js | 2 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-matchStatement.js | 53 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-utilities.js | 4 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/JdbcExternalConnectionPool.java | 49 +- 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/functions/OBUIAPP_LANGUAGE_CREATE.xml | 22 +- modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_PROCESS_ACCESS.xml | 7 + modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_PROCESS_TRL.xml | 79 + modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_VIEW_ROLE_ACCESS.xml | 7 + modules/org.openbravo.client.application/src-db/database/model/triggers/OBUIAPP_PROCESS_TRG.xml | 30 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml | 589 +++- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml | 16 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml | 628 +++- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 24 + 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_PREFERENCE.xml | 24 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TAB.xml | 60 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TABLE.xml | 25 + modules/org.openbravo.client.application/src-db/database/sourcedata/OBSERDS_DATASOURCE.xml | 13 + modules/org.openbravo.client.application/src/org/openbravo/client/application/ADAlertDatasourceService.java | 210 + modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertManagementActionHandler.java | 119 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java | 1 + modules/org.openbravo.client.application/src/org/openbravo/client/application/ParameterUtils.java | 9 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ViewComponent.java | 9 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/CloneOrderActionHandler.java | 5 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java | 3 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportingUtils.java | 61 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-param-window-parameter.ftl | 2 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-pick-and-execute-view-tab.js.ftl | 22 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-form.js.ftl | 37 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java | 62 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java | 18 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewParameterHandler.java | 18 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java | 17 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewUtil.java | 394 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js | 88 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js | 40 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/calendar/ob-calendar.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-characteristics.js | 56 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-combo.js | 20 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js | 14 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree-filter.js | 21 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-yesno.js | 10 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 1 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 14 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 48 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 12 +- 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/materialmgmt/ob-reservation.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views.js | 5 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-form.js | 16 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/test/ob-utilities-number-test.js | 34 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js | 11 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-history-manager.js | 54 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-number.js | 3 + 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 | 5 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-toolbar-styles.css | 7 + 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/reference/CharacteristicsUIDefinition.java | 10 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FKComboUIDefinition.java | 13 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FKTreeUIDefinition.java | 9 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java | 19 +- modules/org.openbravo.client.myob/src-db/database/model/tables/OBKMO_WIDGET_CLASS_ACCESS.xml | 7 + modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_COLUMN.xml | 39 + modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_FIELD.xml | 29 + modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MESSAGE.xml | 12 + 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.myob/src/org/openbravo/client/myob/MyOpenbravoActionHandler.java | 2 +- modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java | 21 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-getting-started-widget.js | 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.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java | 5 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java | 8 +- 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/DataSourceProperty.java | 28 +- 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 | 12 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/DataEntityQueryService.java | 8 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java | 4 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java | 20 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonUtils.java | 8 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/UnpagedRequestCachedPreference.java | 7 +- 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/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java | 4 +- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java | 43 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js | 9 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js | 1 + modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- 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 | 22 +- referencedata/sampledata/F_B_International_Group/M_INVENTORY.xml | 20 +- referencedata/sampledata/F_B_International_Group/M_WAREHOUSE_RULE.xml | 24 +- referencedata/sampledata/QA_Testing/C_GLITEM_ACCT.xml | 30 + referencedata/sampledata/QA_Testing/M_COSTING.xml | 1320 ++++++++ referencedata/sampledata/QA_Testing/M_INVENTORY.xml | 8 +- referencedata/sampledata/QA_Testing/M_TRANSACTION.xml | 834 +++-- referencedata/sampledata/QA_Testing/M_TRANSACTION_COST.xml | 952 +++++ referencedata/sampledata/QA_Testing/M_WAREHOUSE_RULE.xml | 12 +- src-core/.classpath | 2 +- src-core/src/org/openbravo/base/AntExecutor.java | 7 +- src-core/src/org/openbravo/base/ConfigParameters.java | 14 +- src-core/src/org/openbravo/base/ConnectionProviderContextListener.java | 39 +- src-core/src/org/openbravo/base/HttpBaseServlet.java | 46 +- src-core/src/org/openbravo/base/HttpBaseUtils.java | 5 +- src-core/src/org/openbravo/base/MultipartRequest.java | 28 +- src-core/src/org/openbravo/base/VariablesBase.java | 7 +- src-core/src/org/openbravo/base/filter/NumberFilter.java | 3 +- src-core/src/org/openbravo/buildvalidation/BuildValidationHandler.java | 6 +- src-core/src/org/openbravo/data/Sqlc.java | 14 +- src-core/src/org/openbravo/data/UtilSql.java | 5 +- src-core/src/org/openbravo/database/ConnectionProviderImpl.java | 28 +- src-core/src/org/openbravo/database/JNDIConnectionProvider.java | 5 +- src-core/src/org/openbravo/database/RDBMSIndependent.java | 3 +- src-core/src/org/openbravo/uiTranslation/FieldLabelsData.java | 30 +- src-core/src/org/openbravo/uiTranslation/TranslationHandler.java | 3 +- src-core/src/org/openbravo/uiTranslation/TranslationUtils.java | 3 - src-core/src/org/openbravo/utils/FormatUtilities.java | 5 +- src-core/src/org/openbravo/utils/Replace.java | 5 +- src-core/src/org/openbravo/xmlEngine/XmlTemplate.java | 27 +- src-core/src/org/openbravo/xmlEngine/XmlVectorValue.java | 67 +- src-db/database/model/functions/C_COMMISSION_PROCESS.xml | 13 +- src-db/database/model/functions/C_GENERATESOFROMPROJECTPHASE.xml | 2 +- src-db/database/model/functions/MA_WORKEFFORT_VALIDATE.xml | 32 + src-db/database/model/functions/MRP_RUN_EXPLODE.xml | 19 +- src-db/database/model/functions/M_EXPLODEBOMNOTSTOCK.xml | 2 +- src-db/database/model/functions/M_GET_STOCK_PARAM.xml | 5 +- src-db/database/model/functions/M_INOUT_POST.xml | 18 + src-db/database/model/functions/M_PRICELIST_CREATE.xml | 3 + src-db/database/model/functions/M_PRODUCTION_RUN.xml | 31 + src-db/database/model/functions/M_UNIQUEATTRIBUTE_RULE.xml | 5 +- src-db/database/model/functions/M_UNIQUEATTRIBUTE_RULE_PARAM.xml | 146 + src-db/database/model/functions/M_UNIQUELOCATOR_RULE.xml | 5 +- src-db/database/model/functions/M_UNIQUELOCATOR_RULE_PARAM.xml | 142 + src-db/database/model/functions/M_WAREHOUSE_DEFAULT_RULE.xml | 5 +- src-db/database/model/functions/M_WAREHOUSE_DEFAULT_RULE_PARAM.xml | 86 + src-db/database/model/tables/AD_ALERTRECIPIENT.xml | 7 + src-db/database/model/tables/AD_FIELD_ACCESS.xml | 7 + src-db/database/model/tables/AD_FORM_ACCESS.xml | 7 + src-db/database/model/tables/AD_PREFERENCE.xml | 7 + src-db/database/model/tables/AD_PROCESS_ACCESS.xml | 7 + src-db/database/model/tables/AD_ROLE.xml | 10 + src-db/database/model/tables/AD_ROLE_INHERITANCE.xml | 73 + src-db/database/model/tables/AD_ROLE_ORGACCESS.xml | 7 + src-db/database/model/tables/AD_TABLE_ACCESS.xml | 7 + src-db/database/model/tables/AD_TAB_ACCESS.xml | 7 + src-db/database/model/tables/AD_WINDOW_ACCESS.xml | 7 + src-db/database/model/tables/C_INVOICETAX_CASHVAT.xml | 5 + src-db/database/model/tables/M_CHARACTERISTIC.xml | 5 + src-db/database/model/tables/M_PRODUCT_CH.xml | 5 + src-db/database/model/tables/M_PRODUCT_CH_CONF.xml | 4 + src-db/database/model/triggers/AD_ALERTRECIPIENT_TRG.xml | 24 +- src-db/database/model/triggers/AD_PREFERENCE_MOD_TRG.xml | 25 +- src-db/database/model/triggers/AD_ROLE_CHECK_TRG.xml | 17 +- src-db/database/model/triggers/C_INVOICELINE_BEFORE_TRG.xml | 2 +- src-db/database/model/triggers/C_INVOICELINE_TRG.xml | 38 +- src-db/database/model/triggers/C_ORDERLINE_TRG.xml | 40 +- src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml | 13 +- src-db/database/model/triggers/M_CH_SUBSET_VALUE_TRG.xml | 5 +- src-db/database/model/triggers/M_CH_VALUE_TRG.xml | 5 +- src-db/database/model/triggers/M_INOUTLINE_TRG.xml | 45 +- src-db/database/model/triggers/M_PRODUCT_TRG.xml | 2 +- src-db/database/model/views/C_INVOICETAX_CASHVAT_V.xml | 2 +- src-db/database/model/views/MA_PROCESSPLAN_TOTALIZED.xml | 2 +- src-db/database/model/views/M_PRODCHVIEW_V.xml | 4 + src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 44 + src-db/database/sourcedata/AD_COLUMN.xml | 1636 +++++++++- src-db/database/sourcedata/AD_ELEMENT.xml | 119 + src-db/database/sourcedata/AD_FIELD.xml | 1041 ++++++- src-db/database/sourcedata/AD_MESSAGE.xml | 556 +++- src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_REFERENCE.xml | 24 + src-db/database/sourcedata/AD_REF_LIST.xml | 35 + src-db/database/sourcedata/AD_TAB.xml | 64 +- src-db/database/sourcedata/AD_TABLE.xml | 47 + src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 121 +- src-db/database/sourcedata/AD_VAL_RULE.xml | 12 + src-db/database/sourcedata/AD_WINDOW.xml | 15 + src-db/database/sourcedata/OBUIAPP_PARAMETER.xml | 16 +- src-db/database/sourcedata/OBUIAPP_PROCESS.xml | 23 +- src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml | 9 + src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 21 + src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 183 + src-test/src/org/openbravo/test/AllAntTaskTests.java | 16 +- src-test/src/org/openbravo/test/AllTests.java | 4 +- src-test/src/org/openbravo/test/AntTaskTests.java | 4 + src-test/src/org/openbravo/test/costing/TestCosting.java | 319 +- src-test/src/org/openbravo/test/db/model/functions/SqlCallableStatement.java | 106 + src-test/src/org/openbravo/test/db/model/triggers/M_inoutlinetrgTest.java | 647 +++ src-test/src/org/openbravo/test/role/inheritance/AccessPropagation.java | 168 + src-test/src/org/openbravo/test/role/inheritance/AccessPropagationNotInherited.java | 159 + src-test/src/org/openbravo/test/role/inheritance/DeletedAccessPropagation.java | 175 + src-test/src/org/openbravo/test/role/inheritance/HorizontalInheritance.java | 207 + src-test/src/org/openbravo/test/role/inheritance/RecalculatePermissions.java | 194 + src-test/src/org/openbravo/test/role/inheritance/RoleInheritanceRestrictions.java | 446 ++ src-test/src/org/openbravo/test/role/inheritance/RoleInheritanceTestSuite.java | 48 + src-test/src/org/openbravo/test/role/inheritance/RoleInheritanceTestUtils.java | 1414 ++++++++ src-test/src/org/openbravo/test/role/inheritance/VerticalInheritance.java | 147 + src-test/src/org/openbravo/test/views/ViewGenerationWithDifferentConfigLevelTest.java | 298 + src/index.jsp | 2 +- src/org/openbravo/base/exception/OBException.java | 34 +- src/org/openbravo/base/model/Entity.java | 25 +- src/org/openbravo/base/model/ModelProvider.java | 5 +- src/org/openbravo/base/model/Property.java | 5 + src/org/openbravo/base/secureApp/HttpSecureAppServlet.java | 87 +- src/org/openbravo/base/secureApp/LoginHandler.java | 8 +- src/org/openbravo/base/secureApp/LoginUtils.java | 163 + src/org/openbravo/base/session/SessionFactoryController.java | 12 +- src/org/openbravo/base/structure/InheritedAccessEnabled.java | 34 + src/org/openbravo/common/actionhandler/ManageReservationActionHandler.java | 21 +- src/org/openbravo/common/actionhandler/RMInOutPickEditLines.java | 20 +- src/org/openbravo/costing/AverageAlgorithm.java | 15 - src/org/openbravo/costing/CostAdjustmentProcess.java | 38 +- src/org/openbravo/costing/CostAdjustmentUtils.java | 98 +- src/org/openbravo/costing/CostingAlgorithmAdjustmentImp.java | 13 +- src/org/openbravo/costing/CostingMigrationProcess.java | 4 +- src/org/openbravo/costing/CostingRuleProcess.java | 3 + src/org/openbravo/costing/CostingServer.java | 141 +- src/org/openbravo/costing/CostingUtils.java | 74 +- src/org/openbravo/costing/InventoryAmountUpdateProcess.java | 7 +- src/org/openbravo/costing/LCCostMatchFromInvoiceHandler.java | 6 +- src/org/openbravo/costing/StandardAlgorithm.java | 36 +- src/org/openbravo/costing/StandardCostAdjustment.java | 336 +- src/org/openbravo/dal/core/DalUtil.java | 78 +- src/org/openbravo/dal/core/SessionHandler.java | 3 +- src/org/openbravo/dal/core/TriggerHandler.java | 10 +- src/org/openbravo/dal/xml/EntityXMLConverter.java | 33 +- src/org/openbravo/erpCommon/ReportsUtility.java | 12 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql | 4 +- src/org/openbravo/erpCommon/ad_actionButton/InsertAcces.java | 35 +- src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java | 6 +- src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java | 4 + src/org/openbravo/erpCommon/ad_callouts/SL_InOut_BPartner.java | 6 +- src/org/openbravo/erpCommon/ad_callouts/SL_InvAmtUpd_ProductRefDate.java | 22 +- src/org/openbravo/erpCommon/ad_callouts/SL_ProductCh_Characteristic.java | 1 + src/org/openbravo/erpCommon/ad_forms/About.html | 5 +- src/org/openbravo/erpCommon/ad_forms/About.java | 3 +- src/org/openbravo/erpCommon/ad_forms/About.xml | 3 +- src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 2 +- src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 2 +- src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 2 +- src/org/openbravo/erpCommon/ad_forms/DocInvoice.java | 36 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagement.html | 3 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagement.java | 15 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagement.xml | 3 +- src/org/openbravo/erpCommon/ad_forms/Role.java | 3 +- src/org/openbravo/erpCommon/ad_forms/ShowSessionPreferences.html | 4 +- src/org/openbravo/erpCommon/ad_process/AcctServerProcess.java | 10 +- src/org/openbravo/erpCommon/ad_process/AcctServerProcess_data.xsql | 27 +- src/org/openbravo/erpCommon/ad_process/ConvertQuotationIntoOrder.java | 12 +- src/org/openbravo/erpCommon/ad_reports/CustomerStatement.jrxml | 14 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerExcel.jrxml | 3 + src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html | 51 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java | 128 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.xml | 3 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql | 5 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java | 11 + src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJRFilter.html | 28 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR_data.xsql | 8 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesXLS.jrxml | 136 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR_data.xsql | 10 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesXLS.jrxml | 113 +- src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesFilterJR.html | 30 +- src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesJR.java | 13 + src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJR.java | 17 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJRFilter.html | 30 +- src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJR.java | 12 + src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJRFilter.html | 30 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html | 22 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java | 6 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalanceExcel.jrxml | 5 + src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.java | 20 +- src/org/openbravo/erpCommon/ad_reports/ReportValuationStock_data.xsql | 4 +- src/org/openbravo/erpCommon/ad_reports/productionSubReport.jrxml | 4 +- src/org/openbravo/erpCommon/businessUtility/Preferences.java | 93 +- src/org/openbravo/erpCommon/businessUtility/PrinterReports.java | 33 +- src/org/openbravo/erpCommon/info/ProductMultiple.java | 1 + src/org/openbravo/erpCommon/obps/ActivationKey.java | 149 +- src/org/openbravo/erpCommon/obps/ModuleLicenseRestrictions.java | 95 + src/org/openbravo/erpCommon/security/Login.html | 4 +- src/org/openbravo/erpCommon/security/Login_F1.html | 4 +- src/org/openbravo/erpCommon/utility/CashVATUtil.java | 59 +- src/org/openbravo/erpCommon/utility/DimensionDisplayUtility.java | 6 +- src/org/openbravo/erpCommon/utility/OBCurrencyUtils.java | 80 + src/org/openbravo/erpCommon/utility/OBDateUtils.java | 19 +- src/org/openbravo/erpCommon/utility/PopupLoading.html | 4 +- src/org/openbravo/erpCommon/utility/Utility.java | 15 +- src/org/openbravo/erpCommon/utility/reporting/ReportManager.java | 13 +- src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java | 72 +- src/org/openbravo/event/GLJournalLineEventHandler.java | 16 +- src/org/openbravo/event/ProductCharacteristicEventHandler.java | 140 +- src/org/openbravo/event/ProductCharacteristicValueEventHandler.java | 41 +- src/org/openbravo/financial/FinancialUtils.java | 4 - src/org/openbravo/materialmgmt/InventoryCountProcess.java | 21 +- src/org/openbravo/materialmgmt/ProductCharacteristicsDS.java | 269 +- src/org/openbravo/materialmgmt/actionhandler/AddProductsToChValue.java | 94 +- src/org/openbravo/role/inheritance/InheritedAccessEnabledEventHandler.java | 140 + src/org/openbravo/role/inheritance/RecalculatePermissionsHandler.java | 148 + src/org/openbravo/role/inheritance/RoleInheritanceEventHandler.java | 182 + src/org/openbravo/role/inheritance/RoleInheritanceManager.java | 829 +++++ src/org/openbravo/role/inheritance/RoleInheritanceWarningFICExtension.java | 140 + src/org/openbravo/role/inheritance/access/AccessTypeInjector.java | 376 ++ src/org/openbravo/role/inheritance/access/AlertRecipientAccessInjector.java | 104 + src/org/openbravo/role/inheritance/access/FieldAccessInjector.java | 104 + src/org/openbravo/role/inheritance/access/FormAccessInjector.java | 37 + src/org/openbravo/role/inheritance/access/OrgAccessInjector.java | 37 + src/org/openbravo/role/inheritance/access/PreferenceAccessInjector.java | 165 + src/org/openbravo/role/inheritance/access/ProcessDefinitionAccessInjector.java | 37 + src/org/openbravo/role/inheritance/access/ReportAndProcessAccessInjector.java | 37 + src/org/openbravo/role/inheritance/access/TabAccessInjector.java | 122 + src/org/openbravo/role/inheritance/access/TableAccessInjector.java | 37 + src/org/openbravo/role/inheritance/access/ViewImplementationAccessInjector.java | 37 + src/org/openbravo/role/inheritance/access/WidgetClassAccessInjector.java | 37 + src/org/openbravo/role/inheritance/access/WindowAccessInjector.java | 78 + src/org/openbravo/service/db/DataImportService.java | 14 +- src/org/openbravo/service/db/DbUtility.java | 4 + src/org/openbravo/service/importprocess/ImportEntryManager.java | 47 +- src/org/openbravo/service/importprocess/ImportEntryPostProcessor.java | 33 + src/org/openbravo/service/importprocess/ImportEntryProcessor.java | 260 +- src/org/openbravo/service/importprocess/ImportProcessUtils.java | 25 +- src/org/openbravo/service/rest/DalWebService.java | 9 +- src/org/openbravo/service/system/SystemService.java | 38 +- web/js/recalculatePermissionsProcess.js | 83 + web/js/utils.js | 10 +- 384 files changed, 21215 insertions(+), 2612 deletions(-) diffs (truncated from 35445 to 300 lines): diff -r 84cd25c33900 -r a40d27fe8e84 .hgsigs --- a/.hgsigs Fri Nov 20 04:33:54 2015 +0000 +++ b/.hgsigs Wed Dec 16 07:53:02 2015 +0000 @@ -176,5 +176,11 @@ 906c7a47100c5694d720f6a00a8d205538562334 0 iEYEABECAAYFAlW3GiEACgkQCX/oGf+2qkNk4gCfVlZA1GqR2LvJwBPBXoMn6RCRyFYAnA4aPF+fOZXRpAqKMRT55nvswuRI 6dfd2fade034c7225367366dc34dcf402b596555 0 iEYEABECAAYFAlXccLwACgkQCX/oGf+2qkPEMQCeM4MxdgXlCtbu0xqZNcX0IAEuGZgAnAjQlB4gOw0q84Q/gFyRL38jkahJ 9f4a209cc84b3b4e7f3176388f6d6071779ac3e2 0 iEYEABECAAYFAlX5YqQACgkQCX/oGf+2qkOLNwCgr9InQrxWVMHG2e7sabvZBm3KD6gAoPvoMDHktqqkv2Qqtbv3G1mqpTrM +f22b32ad49b1baca7b310bdf68d8d411e897f7bf 0 iEYEABECAAYFAlYtwHYACgkQCX/oGf+2qkOQ1QCgsBVLaaNfILpxAYrZfhBD+GDVVLEAnREcCa1Lvzf4mJ8eD8VWTx1g8kqk 73f7d3c67dc7d6063af1dac6e71db12b9081150a 0 iEYEABECAAYFAlXMHl0ACgkQCX/oGf+2qkNVuACfTfB6/RfeioYrYtsi81kAwADW0lgAoOJdXKScLwl6RHeXIFvMlrzlcT6w f8b98762376a89ec93a0a623c61fdab00975c3a9 0 iEYEABECAAYFAlXtQ4gACgkQCX/oGf+2qkMZUgCePOnen6iguLqaG+86NeCC8Hr0yzAAoKTnw/BIXyBm5Ski5JQT/0mF1zHK +9755d00af209f39887eba34a08922463fbcdac91 0 iEYEABECAAYFAlYt2zgACgkQCX/oGf+2qkN1KgCg6tzAQat0ZJJIWeFyr6yLRVCvh24AnjVyPbFPvbJ3/EOgUHtJWz5lWzeM +d20a396ffa245fd3cdbadc3196df3554018d2e20 0 iEYEABECAAYFAlY4SL4ACgkQCX/oGf+2qkOjJACfS1q37UfrWobml4IVCOKqGeV+CU0An3iRcDJJ+N3aJMuzjkZh8xYe0mRQ +089152094fe394f987fa18606cba401cc20283ec 0 iEYEABECAAYFAlZmVhkACgkQCX/oGf+2qkOFxgCaA0tF7KBDttIBpX4Iezn3GPqSqJQAoIO5TQRfs/Gpwo/lV48IaAIG94vJ +d2c765a228d83098cc5f253cdd364abdb4a4697e 0 iEYEABECAAYFAlZOorMACgkQCX/oGf+2qkMFfwCgocaX6vsWuoGtE55aoHgBD1/7OKoAoOv4J31+P+8BtkVHJyKLhxGVBoLo +cf00bd72641cd3d41f95c0610058f127dad7b91a 0 iEYEABECAAYFAlZv7k4ACgkQCX/oGf+2qkNDIgCeO9reaQhgk94B44p24tVR/E5NsccAoOoJYRH9w6b6sWOOQkRivfVjQwSv diff -r 84cd25c33900 -r a40d27fe8e84 .hgtags --- a/.hgtags Fri Nov 20 04:33:54 2015 +0000 +++ b/.hgtags Wed Dec 16 07:53:02 2015 +0000 @@ -187,5 +187,11 @@ 01405101d810eaafec106bab50ce31b41df52569 3.0PR15Q2.3 d26c43a861dec9147a6a60d8aca52359837e9591 3.0PR15Q2.4 f38025d616fa8a50a95d0dd3a3c38bcf6bbce053 3.0PR15Q2.5 +8b094ef73876cad67e35345c1add17266413af46 3.0PR15Q2.6 828faf1939944cd8d55d562494138f68305c5b50 3.0PR15Q3 e5863950c81de2bcf7dce57035094e96d544a9ae 3.0PR15Q3.1 +9320a67a9ef1cafb5076d06bdd6d716abc662c40 3.0PR15Q3.2 +bce57079bd436cec545edb6c12246170862f0416 3.0PR15Q3.3 +8dabadcfecebf5aced31ed98411517afcb10d792 3.0PR15Q3.4 +84cd25c33900a44c955c5a899e570281f02e0ccc 3.0PR15Q4 +f698a5f953c867f7f7fefe86d7cca3ff80324181 3.0PR15Q4.1 diff -r 84cd25c33900 -r a40d27fe8e84 build.xml --- a/build.xml Fri Nov 20 04:33:54 2015 +0000 +++ b/build.xml Wed Dec 16 07:53:02 2015 +0000 @@ -554,13 +554,29 @@ </target> <target name="generate.java.doc"> - <javadoc sourcepath="${base.src}:${base.src.test}:${build.AD}:${base.src.core}/src:${base.src.gen}:build/javasqlc/src/:build/javasqlc/srcAD" Windowtitle="${title}" access="protected" Header="${header}" Footer="${footer}" destdir="${build.docs}" linksource="no" maxmemory="1024M"> + <javadoc Windowtitle="${title}" access="protected" Header="${header}" Footer="${footer}" destdir="${build.docs}" maxmemory="1024M"> + <sourcepath> + <pathelement path="${base.src}" /> + <pathelement path="${base.src.test}/src" /> + <pathelement path="${build.AD}" /> + <pathelement path="${base.src.core}/src" /> + <pathelement path="${base.src.gen}" /> + <pathelement path="build/javasqlc/src" /> + <pathelement path="build/javasqlc/srcAD" /> + <dirset dir="${base.modules}"> + <include name="*/src" /> + <include name="*/src-test" /> + </dirset> + </sourcepath> <excludepackage name="org.openbravo.erpWindows.*"/> <classpath> <path refid="project.class.path"/> <pathelement path="lib/build/js.jar" /> + <fileset dir="${base.modules}"> + <include name="*/lib/test/*.jar" /> + </fileset> </classpath> - <link href="http://java.sun.com/javase/6/docs/api/"/> + <link href="http://docs.oracle.com/javase/6/docs/api/"/> </javadoc> </target> diff -r 84cd25c33900 -r a40d27fe8e84 legal/Licensing.txt --- a/legal/Licensing.txt Fri Nov 20 04:33:54 2015 +0000 +++ b/legal/Licensing.txt Wed Dec 16 07:53:02 2015 +0000 @@ -107,7 +107,7 @@ # commons-dbcp-1.4.jar # commons-digester-1.8.1.jar # commons-fileupload-1.2.2.jar -# commons-io-2.0.1.jar +# commons-io-2.4.jar # commons-lang-2.6.jar # commons-logging-1.1.1.jar # commons-pool-1.5.6.jar diff -r 84cd25c33900 -r a40d27fe8e84 lib/runtime/commons-io-2.0.1.jar Binary file lib/runtime/commons-io-2.0.1.jar has changed diff -r 84cd25c33900 -r a40d27fe8e84 lib/runtime/commons-io-2.4.jar Binary file lib/runtime/commons-io-2.4.jar has changed diff -r 84cd25c33900 -r a40d27fe8e84 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Fri Nov 20 04:33:54 2015 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Wed Dec 16 07:53:02 2015 +0000 @@ -649,6 +649,18 @@ <!--712C841E501642B881A998CCAC13E420--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> <!--712C841E501642B881A998CCAC13E420--></AD_MESSAGE> +<!--76D4A0740BAD4274B8718A0AF2A1C9B4--><AD_MESSAGE> +<!--76D4A0740BAD4274B8718A0AF2A1C9B4--> <AD_MESSAGE_ID><![CDATA[76D4A0740BAD4274B8718A0AF2A1C9B4]]></AD_MESSAGE_ID> +<!--76D4A0740BAD4274B8718A0AF2A1C9B4--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--76D4A0740BAD4274B8718A0AF2A1C9B4--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--76D4A0740BAD4274B8718A0AF2A1C9B4--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--76D4A0740BAD4274B8718A0AF2A1C9B4--> <VALUE><![CDATA[APRM_ErrorOnUnmatchingRecords]]></VALUE> +<!--76D4A0740BAD4274B8718A0AF2A1C9B4--> <MSGTEXT><![CDATA[%0 record(s) failed. Reference No.: ]]></MSGTEXT> +<!--76D4A0740BAD4274B8718A0AF2A1C9B4--> <MSGTYPE><![CDATA[W]]></MSGTYPE> +<!--76D4A0740BAD4274B8718A0AF2A1C9B4--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--76D4A0740BAD4274B8718A0AF2A1C9B4--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> +<!--76D4A0740BAD4274B8718A0AF2A1C9B4--></AD_MESSAGE> + <!--7918E1E75DF84F499AD21A51F53F9A9B--><AD_MESSAGE> <!--7918E1E75DF84F499AD21A51F53F9A9B--> <AD_MESSAGE_ID><![CDATA[7918E1E75DF84F499AD21A51F53F9A9B]]></AD_MESSAGE_ID> <!--7918E1E75DF84F499AD21A51F53F9A9B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -1381,6 +1393,18 @@ <!--DF6BD33E986149C0ADE4D0CC45D7394C--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> <!--DF6BD33E986149C0ADE4D0CC45D7394C--></AD_MESSAGE> +<!--E103F874F07D44269B98F457EFCAF367--><AD_MESSAGE> +<!--E103F874F07D44269B98F457EFCAF367--> <AD_MESSAGE_ID><![CDATA[E103F874F07D44269B98F457EFCAF367]]></AD_MESSAGE_ID> +<!--E103F874F07D44269B98F457EFCAF367--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--E103F874F07D44269B98F457EFCAF367--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--E103F874F07D44269B98F457EFCAF367--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--E103F874F07D44269B98F457EFCAF367--> <VALUE><![CDATA[APRM_UnmatchedRecords]]></VALUE> +<!--E103F874F07D44269B98F457EFCAF367--> <MSGTEXT><![CDATA[%0 record(s) were properly unmatched.]]></MSGTEXT> +<!--E103F874F07D44269B98F457EFCAF367--> <MSGTYPE><![CDATA[I]]></MSGTYPE> +<!--E103F874F07D44269B98F457EFCAF367--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--E103F874F07D44269B98F457EFCAF367--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> +<!--E103F874F07D44269B98F457EFCAF367--></AD_MESSAGE> + <!--E217A4F4BDE84DC6A95ACB3F54549FDD--><AD_MESSAGE> <!--E217A4F4BDE84DC6A95ACB3F54549FDD--> <AD_MESSAGE_ID><![CDATA[E217A4F4BDE84DC6A95ACB3F54549FDD]]></AD_MESSAGE_ID> <!--E217A4F4BDE84DC6A95ACB3F54549FDD--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -1405,6 +1429,18 @@ <!--E92C3899BD924A5C991A39B2CDA74D29--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> <!--E92C3899BD924A5C991A39B2CDA74D29--></AD_MESSAGE> +<!--EAA6B599637E4A909131395D843C3C61--><AD_MESSAGE> +<!--EAA6B599637E4A909131395D843C3C61--> <AD_MESSAGE_ID><![CDATA[EAA6B599637E4A909131395D843C3C61]]></AD_MESSAGE_ID> +<!--EAA6B599637E4A909131395D843C3C61--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--EAA6B599637E4A909131395D843C3C61--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--EAA6B599637E4A909131395D843C3C61--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--EAA6B599637E4A909131395D843C3C61--> <VALUE><![CDATA[APRM_NoFinancialAccountAvailable]]></VALUE> +<!--EAA6B599637E4A909131395D843C3C61--> <MSGTEXT><![CDATA[It does not exist any Financial Account available for this Payment Method]]></MSGTEXT> +<!--EAA6B599637E4A909131395D843C3C61--> <MSGTYPE><![CDATA[E]]></MSGTYPE> +<!--EAA6B599637E4A909131395D843C3C61--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--EAA6B599637E4A909131395D843C3C61--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> +<!--EAA6B599637E4A909131395D843C3C61--></AD_MESSAGE> + <!--EDEA16A966B94F63A7C1E339FC095B08--><AD_MESSAGE> <!--EDEA16A966B94F63A7C1E339FC095B08--> <AD_MESSAGE_ID><![CDATA[EDEA16A966B94F63A7C1E339FC095B08]]></AD_MESSAGE_ID> <!--EDEA16A966B94F63A7C1E339FC095B08--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 84cd25c33900 -r a40d27fe8e84 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri Nov 20 04:33:54 2015 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Dec 16 07:53:02 2015 +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.27659]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.28131]]></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[PR15Q4]]></VERSION_LABEL> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED> <!--A918E3331C404B889D69AA9BFAFB23AC--></AD_MODULE> diff -r 84cd25c33900 -r a40d27fe8e84 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 Nov 20 04:33:54 2015 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Dec 16 07:53:02 2015 +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.27659]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.28131]]></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.27659]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.28131]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 84cd25c33900 -r a40d27fe8e84 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REF_LIST.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REF_LIST.xml Fri Nov 20 04:33:54 2015 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REF_LIST.xml Wed Dec 16 07:53:02 2015 +0000 @@ -343,6 +343,18 @@ <!--7AC4F4FF644247B7BD320BBF67C4F066--> <SEQNO><![CDATA[10]]></SEQNO> <!--7AC4F4FF644247B7BD320BBF67C4F066--></AD_REF_LIST> +<!--94334E10107D4F3C868191FF2C9AEAD0--><AD_REF_LIST> +<!--94334E10107D4F3C868191FF2C9AEAD0--> <AD_REF_LIST_ID><![CDATA[94334E10107D4F3C868191FF2C9AEAD0]]></AD_REF_LIST_ID> +<!--94334E10107D4F3C868191FF2C9AEAD0--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--94334E10107D4F3C868191FF2C9AEAD0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--94334E10107D4F3C868191FF2C9AEAD0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--94334E10107D4F3C868191FF2C9AEAD0--> <VALUE><![CDATA[UN]]></VALUE> +<!--94334E10107D4F3C868191FF2C9AEAD0--> <NAME><![CDATA[Unmatch Selected]]></NAME> +<!--94334E10107D4F3C868191FF2C9AEAD0--> <AD_REFERENCE_ID><![CDATA[C20E5E22588E40E5B8CC6D80ED3015C5]]></AD_REFERENCE_ID> +<!--94334E10107D4F3C868191FF2C9AEAD0--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--94334E10107D4F3C868191FF2C9AEAD0--> <SEQNO><![CDATA[30]]></SEQNO> +<!--94334E10107D4F3C868191FF2C9AEAD0--></AD_REF_LIST> + <!--9AE9EBD541F34CC7AC8830B9601C52CB--><AD_REF_LIST> <!--9AE9EBD541F34CC7AC8830B9601C52CB--> <AD_REF_LIST_ID><![CDATA[9AE9EBD541F34CC7AC8830B9601C52CB]]></AD_REF_LIST_ID> <!--9AE9EBD541F34CC7AC8830B9601C52CB--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -466,7 +478,7 @@ <!--C69982184F634AC79728338D1F327B76--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--C69982184F634AC79728338D1F327B76--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--C69982184F634AC79728338D1F327B76--> <VALUE><![CDATA[RE]]></VALUE> -<!--C69982184F634AC79728338D1F327B76--> <NAME><![CDATA[Reconcile]]></NAME> +<!--C69982184F634AC79728338D1F327B76--> <NAME><![CDATA[Reconcile All]]></NAME> <!--C69982184F634AC79728338D1F327B76--> <AD_REFERENCE_ID><![CDATA[C20E5E22588E40E5B8CC6D80ED3015C5]]></AD_REFERENCE_ID> <!--C69982184F634AC79728338D1F327B76--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--C69982184F634AC79728338D1F327B76--> <SEQNO><![CDATA[20]]></SEQNO> diff -r 84cd25c33900 -r a40d27fe8e84 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml Fri Nov 20 04:33:54 2015 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml Wed Dec 16 07:53:02 2015 +0000 @@ -916,10 +916,11 @@ <!--ED54A4E24196476596955286D403461E--> <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY> <!--ED54A4E24196476596955286D403461E--> <ISREADONLYTREE><![CDATA[N]]></ISREADONLYTREE> <!--ED54A4E24196476596955286D403461E--> <ISSHOWTREENODEICONS><![CDATA[Y]]></ISSHOWTREENODEICONS> +<!--ED54A4E24196476596955286D403461E--> <EM_OBUIAPP_SELECTION><![CDATA[OB.APRM.MatchStatement.selectionChanged]]></EM_OBUIAPP_SELECTION> <!--ED54A4E24196476596955286D403461E--> <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD> <!--ED54A4E24196476596955286D403461E--> <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE> -<!--ED54A4E24196476596955286D403461E--> <EM_OBUIAPP_SHOW_SELECT><![CDATA[N]]></EM_OBUIAPP_SHOW_SELECT> -<!--ED54A4E24196476596955286D403461E--> <EM_OBUIAPP_SELECTION_TYPE><![CDATA[S]]></EM_OBUIAPP_SELECTION_TYPE> +<!--ED54A4E24196476596955286D403461E--> <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT> +<!--ED54A4E24196476596955286D403461E--> <EM_OBUIAPP_SELECTION_TYPE><![CDATA[M]]></EM_OBUIAPP_SELECTION_TYPE> <!--ED54A4E24196476596955286D403461E--></AD_TAB> <!--F6C2283A21314407BBBB23FF14B85ED4--><AD_TAB> diff -r 84cd25c33900 -r a40d27fe8e84 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java Fri Nov 20 04:33:54 2015 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java Wed Dec 16 07:53:02 2015 +0000 @@ -281,7 +281,8 @@ strDocBaseType, org.getId(), OBDateUtils.formatDate(paymentDate)) && orgLegalWithAccounting) { String messag = OBMessageUtils.messageBD("PeriodNotAvailable"); - throw new OBException(messag); + log.debug(messag); + throw new OBException(messag, false); } String strPaymentAmount = "0"; diff -r 84cd25c33900 -r a40d27fe8e84 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/PaymentMethodMulticurrencyActionHandler.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/PaymentMethodMulticurrencyActionHandler.java Fri Nov 20 04:33:54 2015 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/PaymentMethodMulticurrencyActionHandler.java Wed Dec 16 07:53:02 2015 +0000 @@ -26,6 +26,7 @@ import org.hibernate.criterion.Restrictions; import org.openbravo.base.exception.OBException; import org.openbravo.client.kernel.BaseActionHandler; +import org.openbravo.dal.core.OBContext; import org.openbravo.dal.service.OBCriteria; import org.openbravo.dal.service.OBDal; import org.openbravo.financial.FinancialUtils; @@ -119,14 +120,19 @@ private FinAccPaymentMethod getFinancialAccountPaymentMethod(String paymentMethodId, String financialAccountId) { - OBCriteria<FinAccPaymentMethod> obc = OBDal.getInstance().createCriteria( - FinAccPaymentMethod.class); - obc.setFilterOnReadableOrganization(false); - obc.setMaxResults(1); - obc.add(Restrictions.eq(FinAccPaymentMethod.PROPERTY_ACCOUNT, - OBDal.getInstance().get(FIN_FinancialAccount.class, financialAccountId))); - obc.add(Restrictions.eq(FinAccPaymentMethod.PROPERTY_PAYMENTMETHOD, - OBDal.getInstance().get(FIN_PaymentMethod.class, paymentMethodId))); - return (FinAccPaymentMethod) obc.uniqueResult(); + OBContext.setAdminMode(true); + try { + OBCriteria<FinAccPaymentMethod> obc = OBDal.getInstance().createCriteria( + FinAccPaymentMethod.class); + obc.setFilterOnReadableOrganization(false); + obc.setMaxResults(1); + obc.add(Restrictions.eq(FinAccPaymentMethod.PROPERTY_ACCOUNT, + OBDal.getInstance().get(FIN_FinancialAccount.class, financialAccountId))); + obc.add(Restrictions.eq(FinAccPaymentMethod.PROPERTY_PAYMENTMETHOD, + OBDal.getInstance().get(FIN_PaymentMethod.class, paymentMethodId))); + return (FinAccPaymentMethod) obc.uniqueResult(); + } finally { + OBContext.restorePreviousMode(); + } } } \ No newline at end of file diff -r 84cd25c33900 -r a40d27fe8e84 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/UnMatchSelectedTransactionsActionHandler.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/UnMatchSelectedTransactionsActionHandler.java Wed Dec 16 07:53:02 2015 +0000 @@ -0,0 +1,151 @@ +/* + ************************************************************************* + * The contents of this file are subject to the Openbravo Public License + * Version 1.1 (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. ------------------------------------------------------------------------------ _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
