details: https://code.openbravo.com/erp/devel/main/rev/09301dc0612e changeset: 31081:09301dc0612e user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Fri Jan 27 12:04:54 2017 +0100 summary: Fixed issue 35065: A deactivated organization can not be activated again.
When an organization was disabled you could not activate it again as the row was not ediable. This problem was introduced in a fix related with the code of addWritableAttribute() method of DefaultJsonDataService class. Before this fix, It was managing the reported case properly (Activate again a deactivated organization) because this method was handling the particular case of Organizations. Now is taking into account this particular case (deactivate organizations) in order to manages this particular case properly. Now it is possible to activate again a deactivate organization. details: https://code.openbravo.com/erp/devel/main/rev/21055fdc01ac changeset: 31082:21055fdc01ac user: Armaignac <collazoandy4 <at> gmail.com> date: Tue Jan 31 11:19:49 2017 -0500 summary: Fixes issue 35093: Set value in a warehouse document line with empty attribute In a warehouse document line now can set value in a warehouse document line in case it does not contain an instance attribute details: https://code.openbravo.com/erp/devel/main/rev/1b9ee78082ee changeset: 31083:1b9ee78082ee user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Feb 07 09:57:04 2017 +0100 summary: fixes issue 35178: Initialize callout's connection pool on init details: https://code.openbravo.com/erp/devel/main/rev/b398a6686e3b changeset: 31084:b398a6686e3b user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Feb 08 14:07:20 2017 +0100 summary: fixes bug 35198: Can't attach using manual role having modules in indevelopment It was not possible to attach a document with a role that hasn't got access to ADTab entity having modules in indevelopment. This was happening because when there are modules in indevelopemnt status, the getTab method of the ADCS class does not store the tab information in cache and uses DAL to retrieve the tab every time it is being called. Under this circumstances, the getTab method in AttachImplementationManager must be invoked in admin mode to ensure that the role can generate the attachment even when not having access to the ADTab entity. details: https://code.openbravo.com/erp/devel/main/rev/9db0b41302ae changeset: 31085:9db0b41302ae user: Armaignac <collazoandy4 <at> gmail.com> date: Wed Feb 15 19:40:59 2017 -0500 summary: Fix for issue 35274: General Ledger filter removed when paginating in GL Report The General Ledger filter was removed when paginating in General Ledger Report in HTML view Now the General Ledger filter it's save in the session by the FIND action and get in the DEFAULT action for showing in the report page details: https://code.openbravo.com/erp/devel/main/rev/288a542f5912 changeset: 31086:288a542f5912 user: Armaignac <collazoandy4 <at> gmail.com> date: Thu Feb 16 11:18:42 2017 -0500 summary: Fixes issue 35277: General Ledger filter changes with pagination in JE Report Selected General Ledger filter value changes when pagination is executed in the Journal Entries report The General Ledger filter is not kept in the session to make use in the pagination. For the solution, was saved the General Ledger Filter in the session every time the search is executed (FIND action). By default, if there is any GL in the session, the GL field will use the defaulted for the selected org. When paginating always is used the account schema id stored in the session. details: https://code.openbravo.com/erp/devel/main/rev/2808d4063ad6 changeset: 31087:2808d4063ad6 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Feb 21 14:12:18 2017 +0100 summary: fixes issue 35319: documents were not being attached after send them by e-mail The CoreAttachImplementation class is deleting the original report file after completing the upload process. When attaching a document using the e-mail pop-up this is done before attaching the document into the e-mail. This explains why the document was not being received on the e-mail. To avoid this problem, now a copy of the original document is sent to the AttachImplementationManager, this way the original file will never be deleted by an upload process handler. Together with this, now when attaching a document after printing (not by e-mail) we have to delete the original file because in other case it will be kept on disk. details: https://code.openbravo.com/erp/devel/main/rev/acc61deacf8f changeset: 31088:acc61deacf8f user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Mon Feb 27 10:49:29 2017 +0100 summary: Fixed issue 35350:Callout problem when working with comma as decimal separator The problem was raised when a default format were switched, it means, when decimal and group separator were switched. In this situation, when SimpleCalloutInformationProvider class was used to obtain the current element value and this current element was a BigDecimal, the format was not managed properly. This occurred because getCurrentElementValue method always retrieved a String element instead of Object element, in tyhis case BigDecimal. In this situation, managesUpdatedValuesForCallout method of FIC class compare if element is a String or not. If a BigDecimal is retrieved as String element, in this part of the code the format is not managed properly when decimal separator is comma. The code manage the comma separator as group separator and removed it. When the decimal separator is dot (.) the format is managed as expected although this method retrieves a String object (e.g. "1.23"). When decimal separator is comma (,) this BigDecimal (e.g. 1,24) is retrieved by getCurrentElementValue method as String value and the format is missed. This problem has been fixed by take into account type of current element inside getCurrentElementValue method. Now this method retrieves an object value. In this case, a BigDecimal is retrieved. Now the format is managed properly. details: https://code.openbravo.com/erp/devel/main/rev/9291ff6208fd changeset: 31089:9291ff6208fd user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Tue Feb 28 08:02:43 2017 +0100 summary: Fixed issue 35374. Reenable automatic discounts in purchase flows. details: https://code.openbravo.com/erp/devel/main/rev/476fb2449910 changeset: 31090:476fb2449910 user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Tue Feb 28 08:02:50 2017 +0100 summary: Fixed issue 35374. Reenable automatic discounts in purchase flows. details: https://code.openbravo.com/erp/devel/main/rev/0cb92027c585 changeset: 31091:0cb92027c585 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Mar 02 09:22:31 2017 +0100 summary: fixes issue 35399: Check readable clients for child properties using DAL WS Fix for issue #29683 was introducing a security check to avoid showing child properties which belong to a client different from the current client. But this fix was preventing to display some readable objects like master data defined at system level (client 0). Therefore this security check has been improved and now it is verified if the child property is defined for a client which is readable for the current role. details: https://code.openbravo.com/erp/devel/main/rev/6c57087b7d9a changeset: 31092:6c57087b7d9a user: Miguel <martencobasmiguel <at> gmail.com> date: Thu Mar 02 14:16:00 2017 -0500 summary: Fixes issue 35420:Cannot remove an orphan line in Return to/from vendor/customer Was not able to remove an orphan line from a return to vendor or a return from customer document because an incorrect casting to boolean. When is validating tha Last record is selected inside the Orphan grid lines, the lastRecord.get("obSelected") object gets as String instead of a Boolean object, in other case it gets as Boolean. Now, conditions are rightly validated depending of the class of the object. details: https://code.openbravo.com/erp/devel/main/rev/eaeb76d8cd4e changeset: 31093:eaeb76d8cd4e user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Mar 07 12:43:27 2017 +0000 summary: Update AD_MODULE version to 3.0PR16Q4.3 details: https://code.openbravo.com/erp/devel/main/rev/a131c85d1d3d changeset: 31094:a131c85d1d3d user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Mar 07 12:43:27 2017 +0000 summary: Added tag 3.0PR16Q4.3 for changeset eaeb76d8cd4e details: https://code.openbravo.com/erp/devel/main/rev/1a19186c214f changeset: 31095:1a19186c214f user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Mar 07 12:43:27 2017 +0000 summary: Added signature for changeset a131c85d1d3d details: https://code.openbravo.com/erp/devel/main/rev/cffd2d7e1bee changeset: 31096:cffd2d7e1bee user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Mar 09 09:44:31 2017 +0000 summary: Merge temporary head for 3.0PR16Q4.3 diffstat: .classpath.template | 2 +- .hgsigs | 8 + .hgtags | 8 + .project | 5 + .settings/org.eclipse.jdt.core.prefs | 7 +- .settings/org.eclipse.wst.common.project.facet.core.xml | 6 +- WebContent/META-INF/MANIFEST.MF | 3 +- build.xml | 2 +- config/eclipse/Openbravo-eclipse-prefs.epf | 6 +- legal/Licensing.txt | 4 +- lib/build/servlet-api.jar | 0 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData.class | 0 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UniquePaymentForTransaction.class | 0 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments.class | 0 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck.class | 0 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml | 12 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 28 +- 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-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData.java | 8 + modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/UniquePaymentForTransaction.java | 10 +- modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments.java | 10 +- modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck.java | 16 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/FundsTransferPostProcessHook.java | 40 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentOnProcessActionHandler.java | 21 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/DoubtFulDebtPickEditLines.java | 5 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/FundsTransferActionHandler.java | 20 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/FundsTransferHookCaller.java | 48 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java | 40 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java | 6 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddPaymentReadOnlyLogicsHandler.java | 7 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/TransactionAddPaymentDefaultValues.java | 10 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java | 2 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPaymentFromJournalLine.java | 54 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 2 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java | 20 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.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 | 3 +- modules/org.openbravo.base.weld/lib/runtime/cal10n-api-0.7.4.jar | 0 modules/org.openbravo.base.weld/lib/runtime/cal10n-api-0.7.7.jar | 0 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.base.weld/src/META-INF/beans.xml | 6 +- modules/org.openbravo.base.weld/src/org/openbravo/base/weld/WeldUtils.java | 23 +- modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_SYSTEM.xml | 5 + modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_TAB.xml | 4 + modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_REPORT.xml | 11 +- modules/org.openbravo.client.application/src-db/database/model/triggers/OBUIAPP_REPORT_MOD_TRG.xml | 2 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml | 156 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml | 42 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml | 116 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 50 +- 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 | 12 + modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/DisplayLogicAtServerLevelTest.java | 163 + modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java | 7 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationConstants.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/CachedPreference.java | 57 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java | 25 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/GlobalMenu.java | 8 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/HeartBeatPopupActionHandler.java | 6 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ViewComponent.java | 73 + modules/org.openbravo.client.application/src/org/openbravo/client/application/WindowSettingsActionHandler.java | 10 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachImplementationManager.java | 8 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/CoreAttachImplementation.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/CloneOrderActionHandler.java | 6 + modules/org.openbravo.client.application/src/org/openbravo/client/application/event/NoteEventHandler.java | 13 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/PreferenceEventHandler.java | 81 - modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickLaunchDataSource.java | 4 +- 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/process/BaseProcessActionHandler.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/report/BaseReportActionHandler.java | 268 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportingUtils.java | 44 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl | 7 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-pick-and-execute-grid.js.ftl | 3 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-pick-and-execute-view-window.js.ftl | 5 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl | 3 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java | 59 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java | 61 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java | 2 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ParameterWindowComponent.java | 13 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/servlet/CalloutServletConfig.java | 22 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js | 12 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js | 25 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js | 1 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 15 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 10 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 72 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-event-handler-registry.js | 3 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 32 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-application-menu.js | 32 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-toolbar.js | 1 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-base-parameter-window-view.js | 3 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js | 20 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 18 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-view.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/procurement/ob-procurement.js | 86 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js | 112 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-history-manager.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-onchange-functions.js | 13 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-action-def.js | 41 +- 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/CSSMinimizer.java | 4 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/RequestContext.java | 4 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java | 15 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinitionController.java | 8 +- 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/web/org.openbravo.client.myob/js/ob-myopenbravo.js | 51 +- modules/org.openbravo.client.myob/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.myob/ob-myopenbravo-styles.css | 24 +- 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/model/views/OBWCL_STOCK_BY_WAREHOUSE_V.xml | 4 + modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_COLUMN.xml | 719 + modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_ELEMENT.xml | 72 + modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DBPREFIX.xml | 12 + modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_PACKAGE.xml | 13 + modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_TABLE.xml | 25 + modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBCQL_QUERY_COLUMN.xml | 108 + modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBCQL_WIDGET_QUERY.xml | 15 + modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml | 17 + modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml | 93 + 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.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 11 + modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.html | 6 +- modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.java | 30 +- modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.jrxml | 167 +- modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.xml | 4 +- modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped_data.xsql | 20 +- 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/BaseDataSourceService.java | 6 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/CheckTreeOperationManager.java | 8 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java | 28 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DefaultDataSourceService.java | 4 +- 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.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java | 3 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonUtils.java | 29 +- 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/SelectorDataSourceFilter.java | 4 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 9 +- 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 | 2 +- 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.utility.cleanup.log/src/org/openbravo/utility/cleanup/log/LogCleanUpProcess.java | 11 +- 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 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_MERGE.xml | 10 + referencedata/sampledata/F_B_International_Group/AD_PROCESS_ACCESS.xml | 140 + referencedata/sampledata/F_B_International_Group/AD_PROCESS_REQUEST.xml | 2002 +- referencedata/sampledata/F_B_International_Group/AD_ROLE.xml | 48 - referencedata/sampledata/F_B_International_Group/AD_SEQUENCE.xml | 84 +- referencedata/sampledata/F_B_International_Group/AD_USER.xml | 48 +- referencedata/sampledata/F_B_International_Group/A_AMORTIZATION.xml | 18 +- referencedata/sampledata/F_B_International_Group/A_ASSET.xml | 16 +- referencedata/sampledata/F_B_International_Group/C_BPARTNER.xml | 86 +- referencedata/sampledata/F_B_International_Group/C_CONVERSION_RATE.xml | 72 + referencedata/sampledata/F_B_International_Group/C_INVOICE.xml | 3860 +- referencedata/sampledata/F_B_International_Group/C_INVOICELINE.xml | 8339 + referencedata/sampledata/F_B_International_Group/C_INVOICELINETAX.xml | 4086 + referencedata/sampledata/F_B_International_Group/C_INVOICETAX.xml | 1020 + referencedata/sampledata/F_B_International_Group/C_ORDER.xml | 2994 +- referencedata/sampledata/F_B_International_Group/C_ORDERLINE.xml | 9469 + referencedata/sampledata/F_B_International_Group/C_ORDERLINETAX.xml | 3451 + referencedata/sampledata/F_B_International_Group/C_ORDERTAX.xml | 576 + referencedata/sampledata/F_B_International_Group/C_ORDER_DISCOUNT.xml | 180 + referencedata/sampledata/F_B_International_Group/C_PERIOD.xml | 864 + referencedata/sampledata/F_B_International_Group/C_PERIODCONTROL.xml | 32256 ++++ referencedata/sampledata/F_B_International_Group/C_PERIODCONTROL_LOG.xml | 912 + referencedata/sampledata/F_B_International_Group/C_YEAR.xml | 68 + referencedata/sampledata/F_B_International_Group/FACT_ACCT.xml | 44435 +++++- referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENT.xml | 44 + referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENTLINE.xml | 1512 + referencedata/sampledata/F_B_International_Group/FIN_FINACC_TRANSACTION.xml | 2154 + referencedata/sampledata/F_B_International_Group/FIN_FINANCIAL_ACCOUNT.xml | 8 +- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT.xml | 2516 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_DETAIL.xml | 1056 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROPOSAL.xml | 174 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROP_DETAIL.xml | 510 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULE.xml | 77280 +++++---- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULEDETAIL.xml | 1330 +- referencedata/sampledata/F_B_International_Group/FIN_RECONCILIATION.xml | 58 + referencedata/sampledata/F_B_International_Group/GL_JOURNAL.xml | 108 + referencedata/sampledata/F_B_International_Group/GL_JOURNALBATCH.xml | 82 +- referencedata/sampledata/F_B_International_Group/GL_JOURNALLINE.xml | 1260 + referencedata/sampledata/F_B_International_Group/M_COSTING.xml | 1896 +- referencedata/sampledata/F_B_International_Group/M_INOUT.xml | 2356 + referencedata/sampledata/F_B_International_Group/M_INOUTLINE.xml | 4394 + referencedata/sampledata/F_B_International_Group/M_MATCHINV.xml | 1368 + referencedata/sampledata/F_B_International_Group/M_MATCHPO.xml | 2736 + referencedata/sampledata/F_B_International_Group/M_STORAGE_DETAIL.xml | 108 +- referencedata/sampledata/F_B_International_Group/M_STORAGE_PENDING.xml | 54 +- referencedata/sampledata/F_B_International_Group/M_TRANSACTION.xml | 5730 + referencedata/sampledata/F_B_International_Group/M_TRANSACTION_COST.xml | 3247 + referencedata/sampledata/F_B_International_Group/OBKMO_WIDGET_CLASS_ACCESS.xml | 130 + referencedata/sampledata/F_B_International_Group/OBUIAPP_PROCESS_ACCESS.xml | 140 + src-core/.project | 5 + src-core/.settings/org.eclipse.jdt.core.prefs | 265 - src-core/.settings/org.eclipse.wst.common.component | 6 - src-core/.settings/org.eclipse.wst.common.project.facet.core.xml | 7 - src-core/build.xml | 4 +- src-core/src/org/openbravo/base/ConfigParameters.java | 5 +- src-core/src/org/openbravo/base/ExecutionLimitBaseProcess.java | 150 + src-core/src/org/openbravo/base/ExecutionLimits.java | 91 + src-core/src/org/openbravo/base/VariablesBase.java | 1 - src-core/src/org/openbravo/buildvalidation/BuildValidation.java | 84 +- src-core/src/org/openbravo/buildvalidation/BuildValidationHandler.java | 92 +- src-core/src/org/openbravo/database/SessionInfo.java | 2 + src-core/src/org/openbravo/modulescript/ModuleScript.java | 110 +- src-core/src/org/openbravo/modulescript/ModuleScriptExecutionLimits.java | 71 +- src-core/src/org/openbravo/modulescript/ModuleScriptHandler.java | 15 +- src-core/src/org/openbravo/uiTranslation/InterfaceInfo.java | 4 +- src-core/src/org/openbravo/uiTranslation/WindowLabel.java | 8 +- src-db/database/build.xml | 4 +- src-db/database/lib/dbsourcemanager.jar | 0 src-db/database/model/excludeFilter.xml | 2 + src-db/database/model/functions/AD_LANGUAGE_CREATE.xml | 22 + src-db/database/model/functions/C_INVOICE_CREATE.xml | 60 +- src-db/database/model/functions/C_INVOICE_POST.xml | 16 +- src-db/database/model/functions/C_ORDER_POST1.xml | 33 +- src-db/database/model/functions/C_PERIOD_PROCESS.xml | 8 + src-db/database/model/functions/M_COPY_PRODUCT_TEMPLATE.xml | 32 +- src-db/database/model/functions/M_EXPLODEBOMNOTSTOCK.xml | 35 +- src-db/database/model/functions/M_GET_CONVERTED_AUMQTY.xml | 78 + src-db/database/model/functions/M_GET_CONVERTED_QTY.xml | 78 + src-db/database/model/functions/M_GET_DEFAULT_AUM_FOR_DOCUMENT.xml | 79 + src-db/database/model/functions/M_INITIALIZE_STOCK_VALUATION.xml | 4 +- src-db/database/model/functions/M_INOUTEXPLODEBOMNOTSTOCK.xml | 34 +- src-db/database/model/functions/M_INOUT_CREATE.xml | 116 +- src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml | 6 +- src-db/database/model/functions/M_INOUT_POST.xml | 58 +- src-db/database/model/functions/M_MOVEMENT_POST.xml | 4 +- src-db/database/model/functions/M_REQUISITION_CREATEPO.xml | 44 +- src-db/database/model/functions/M_UPDATE_STOCK_VALUATION.xml | 2 +- src-db/database/model/postscript-DB2.sql | 324 - src-db/database/model/postscript-Oracle.sql | 3 +- src-db/database/model/postscript-PostgreSql.sql | 3 +- src-db/database/model/prescript-DB2.sql | 85 - src-db/database/model/tables/AD_FIELD.xml | 4 + src-db/database/model/tables/AD_ROLE.xml | 8 - src-db/database/model/tables/C_BPARTNER.xml | 8 + src-db/database/model/tables/C_CONVERSION_RATE.xml | 1 + src-db/database/model/tables/C_INVOICELINE.xml | 11 + src-db/database/model/tables/C_ORDERLINE.xml | 11 + src-db/database/model/tables/M_INOUT.xml | 5 + src-db/database/model/tables/M_INOUTLINE.xml | 11 + src-db/database/model/tables/M_PRODUCT_AUM.xml | 92 + src-db/database/model/tables/M_REQUISITIONLINE.xml | 15 + src-db/database/model/tables/M_VALUED_STOCK_AGG.xml | 123 + src-db/database/model/triggers/AD_ROLE_ORGACCESS_TRG.xml | 99 - src-db/database/model/triggers/C_INVLINE_CHK_RESTRICTIONS_TRG.xml | 11 +- src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml | 9 +- src-db/database/model/triggers/M_INOUTLINE_TRG.xml | 7 +- src-db/database/model/triggers/M_IOLINE_CHK_RESTRICTIONS_TRG.xml | 11 +- src-db/database/model/triggers/M_PRODUCT_AUM_TRG.xml | 52 + src-db/database/model/triggers/M_REQUISITIONLINE_TRG.xml | 8 +- src-db/database/model/views/AD_AUDIT_TRAIL_V.xml | 2 +- src-db/database/model/views/C_INVOICE_CANDIDATE_V.xml | 2 +- src-db/database/model/views/M_CREATEPOLINES_PE_V.xml | 2 +- src-db/database/model/views/M_PRODUCT_STOCK_V.xml | 2 +- src-db/database/model/views/M_RM_RECEIPT_PICK_EDIT.xml | 2 +- src-db/database/model/views/M_RM_SHIPMENT_PICK_EDIT.xml | 2 +- src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 35 +- src-db/database/sourcedata/AD_CALLOUT.xml | 29 + src-db/database/sourcedata/AD_COLUMN.xml | 2640 +- src-db/database/sourcedata/AD_ELEMENT.xml | 320 +- src-db/database/sourcedata/AD_FIELD.xml | 1975 +- src-db/database/sourcedata/AD_MENU.xml | 13 + src-db/database/sourcedata/AD_MESSAGE.xml | 220 +- src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 116 +- src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 50 + src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_PREFERENCE.xml | 13 + src-db/database/sourcedata/AD_PROCESS.xml | 23 + src-db/database/sourcedata/AD_REFERENCE.xml | 84 + src-db/database/sourcedata/AD_REF_LIST.xml | 84 +- src-db/database/sourcedata/AD_REF_TABLE.xml | 11 + src-db/database/sourcedata/AD_TAB.xml | 39 +- src-db/database/sourcedata/AD_TABLE.xml | 52 +- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 614 +- src-db/database/sourcedata/AD_TREENODE.xml | 25 +- src-db/database/sourcedata/AD_VAL_RULE.xml | 33 + src-db/database/sourcedata/AD_WINDOW.xml | 10 +- src-db/database/sourcedata/OBUIAPP_PARAMETER.xml | 26 + src-db/database/sourcedata/OBUIAPP_PROCESS.xml | 42 +- src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 82 +- src-test/.classpath.template | 2 +- src-test/src/org/openbravo/test/AllAntTaskTests.java | 14 +- src-test/src/org/openbravo/test/AllQuickAntTaskTests.java | 6 +- src-test/src/org/openbravo/test/AllTests.java | 6 +- src-test/src/org/openbravo/test/authorisations.txt | 2216 - src-test/src/org/openbravo/test/centralbroker/CentralBrokerTest.java | 121 + src-test/src/org/openbravo/test/dal/DalTest.java | 80 + src-test/src/org/openbravo/test/dal/IssuesTest.java | 2 - src-test/src/org/openbravo/test/datasource/DataSourceSecurity.java | 30 +- src-test/src/org/openbravo/test/datasource/TestAllowUnpagedDatasourcePreference.java | 3 +- src-test/src/org/openbravo/test/model/ClassLoaderTest.java | 114 +- src-test/src/org/openbravo/test/modularity/ExecutionLimitsTest.java | 239 + src-test/src/org/openbravo/test/modularity/ModuleScriptsVersions.java | 145 - src-test/src/org/openbravo/test/role/inheritance/AccessPropagation.java | 1 - src-test/src/org/openbravo/test/role/inheritance/AccessPropagationNotInherited.java | 1 - src-test/src/org/openbravo/test/role/inheritance/DeletedAccessPropagation.java | 1 - src-test/src/org/openbravo/test/role/inheritance/HorizontalInheritance.java | 1 - src-test/src/org/openbravo/test/role/inheritance/RoleInheritanceTestUtils.java | 2 - src-test/src/org/openbravo/test/role/inheritance/VerticalInheritance.java | 1 - src-test/src/org/openbravo/test/scheduling/ProcessSchedulingTest.java | 50 +- src-test/src/org/openbravo/test/security/ExplicitCrossOrganizationReference.java | 2 - src-test/src/org/openbravo/test/views/ViewGenerationWithDifferentConfigLevelTest.java | 31 +- src-trl/.project | 5 + src-trl/.settings/org.eclipse.jdt.core.prefs | 12 - src-trl/.settings/org.eclipse.jdt.ui.prefs | 55 - src-util/buildvalidation/build.xml | 12 +- src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/AccountingTabs.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/CheckUpdateConnectionPoolMerge.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DatabaseDecimalNumberCheck.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DatabaseVersionCheck.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DatabaseVersionCheckData.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicateDocExchangeRate.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedJavaPackage.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedOrgWarehouse.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedPriceListVersion.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/GLJournalAccountingCheck.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/JdkVersionCheck.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/PaymentGLItemCheck.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/PreferenceConflict.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/RemoveCostingRuleProcessExecutions.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/User1Ready.class | 0 src-util/buildvalidation/src/org/openbravo/buildvalidation/AccountingTabs.java | 104 +- src-util/buildvalidation/src/org/openbravo/buildvalidation/CheckUpdateConnectionPoolMerge.java | 34 +- src-util/buildvalidation/src/org/openbravo/buildvalidation/DatabaseDecimalNumberCheck.java | 18 +- src-util/buildvalidation/src/org/openbravo/buildvalidation/DatabaseVersionCheck.java | 13 +- src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicateDocExchangeRate.java | 132 +- src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedJavaPackage.java | 9 +- src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedOrgWarehouse.java | 37 +- src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedPriceListVersion.java | 27 +- src-util/buildvalidation/src/org/openbravo/buildvalidation/GLJournalAccountingCheck.java | 60 +- src-util/buildvalidation/src/org/openbravo/buildvalidation/JdkVersionCheck.java | 63 + src-util/buildvalidation/src/org/openbravo/buildvalidation/PaymentGLItemCheck.java | 8 +- src-util/buildvalidation/src/org/openbravo/buildvalidation/PreferenceConflict.java | 9 +- src-util/buildvalidation/src/org/openbravo/buildvalidation/RemoveCostingRuleProcessExecutions.java | 11 +- src-util/buildvalidation/src/org/openbravo/buildvalidation/User1Ready.java | 35 +- src-util/diagnostic/config/diagnostics.properties | 10 +- src-util/modulescript/build/classes/org/openbravo/modulescript/UpdateQtyDelivered.class | 0 src-util/modulescript/build/classes/org/openbravo/modulescript/UpdateQtyDeliveredData.class | 0 src-util/modulescript/src/org/openbravo/modulescript/UpdateQtyDelivered.java | 60 + src-util/modulescript/src/org/openbravo/modulescript/UpdateQtyDelivered_data.xsql | 71 + src-wad/.project | 5 + src-wad/src/org/openbravo/wad/Wad.java | 17 +- src-wad/src/org/openbravo/wad/Wad_data.xsql | 17 +- src-wad/src/org/openbravo/wad/web.xml | 3 +- src-wad/src/org/openbravo/wad/webConf.xml | 6 +- src/build.xml | 14 +- src/org/openbravo/authentication/AuthenticationManager.java | 85 +- src/org/openbravo/authentication/basic/DefaultAuthenticationManager.java | 20 +- src/org/openbravo/base/ServerVersionChecker.java | 87 + src/org/openbravo/base/secureApp/AllowedCrossDomainsHandler.java | 170 + src/org/openbravo/base/secureApp/HttpSecureAppServlet.java | 53 +- src/org/openbravo/base/secureApp/LoginHandler.java | 3 +- src/org/openbravo/base/secureApp/LoginUtils.java | 226 +- src/org/openbravo/common/actionhandler/CancelAndReplaceGetCancelledOrderLine.java | 19 +- src/org/openbravo/common/actionhandler/GetConvertedQtyActionHandler.java | 65 + src/org/openbravo/common/actionhandler/KillProcess.java | 10 +- src/org/openbravo/common/actionhandler/ManagePrereservationActionHandler.java | 3 +- src/org/openbravo/common/actionhandler/ManageReservationActionHandler.java | 3 +- src/org/openbravo/common/actionhandler/OrderCreatePOLines.java | 11 +- src/org/openbravo/common/actionhandler/RMInOutPickEditLines.java | 25 +- src/org/openbravo/common/actionhandler/RMShipmentPickEditLines.java | 24 +- src/org/openbravo/common/actionhandler/ReservedGoodMovementActionHandler.java | 5 +- src/org/openbravo/common/actionhandler/SRMOPickEditLines.java | 33 +- src/org/openbravo/common/actionhandler/SetNewBPCurrency.java | 3 + src/org/openbravo/common/datasource/ReturnFromCustomerHQLInserter.java | 4 +- src/org/openbravo/common/datasource/ReturnToFromCustomerVendorHQLTransformer.java | 54 +- src/org/openbravo/configuration/ConfigurationApp.java | 4 +- src/org/openbravo/costing/AverageAlgorithm.java | 8 +- src/org/openbravo/costing/CostingAlgorithmAdjustmentImp.java | 4 +- src/org/openbravo/costing/CostingBackground.java | 2 +- src/org/openbravo/costing/CostingMigrationProcess.java | 6 +- src/org/openbravo/costing/CostingServer.java | 4 +- src/org/openbravo/dal/core/TriggerHandler.java | 7 +- src/org/openbravo/dal/security/EntityAccessChecker.java | 2 +- src/org/openbravo/dal/security/OrganizationStructureProvider.java | 41 + src/org/openbravo/dal/service/OBCriteria.java | 16 + src/org/openbravo/dal/service/OBDal.java | 10 +- src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.java | 27 +- src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice_data.xsql | 26 +- src/org/openbravo/erpCommon/ad_actionButton/CopyFromOrder.html | 73 +- src/org/openbravo/erpCommon/ad_actionButton/CopyFromOrder.java | 37 +- src/org/openbravo/erpCommon/ad_actionButton/CopyFromOrder.xml | 19 +- src/org/openbravo/erpCommon/ad_actionButton/CopyFromOrder_data.xsql | 17 +- src/org/openbravo/erpCommon/ad_actionButton/CopyFromPOOrder.java | 21 +- src/org/openbravo/erpCommon/ad_actionButton/CopyFromPOOrder_data.xsql | 13 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java | 196 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice.html | 6 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice.xml | 53 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql | 117 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment.html | 10 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment.xml | 8 + src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_ShipmentPO.html | 440 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_ShipmentPO.xml | 26 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql | 99 +- src/org/openbravo/erpCommon/ad_callouts/AUM_ConversionRate.java | 85 + src/org/openbravo/erpCommon/ad_callouts/CalloutInformationProvider.java | 1 - src/org/openbravo/erpCommon/ad_callouts/GtinFormat.java | 42 + src/org/openbravo/erpCommon/ad_callouts/OperativeQuantity_To_BaseQuantity.java | 91 + src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Product.java | 83 +- src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Product.java | 78 +- src/org/openbravo/erpCommon/ad_callouts/SL_Journal_MultiAcctSchema.java | 16 +- src/org/openbravo/erpCommon/ad_callouts/SL_Journal_Period.java | 24 +- src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product.java | 135 +- src/org/openbravo/erpCommon/ad_callouts/SL_RequisitionLine_Product.java | 73 +- src/org/openbravo/erpCommon/ad_callouts/SimpleCallout.java | 2 - src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 29 +- src/org/openbravo/erpCommon/ad_forms/DocLineCashVATReady_PaymentTransactionReconciliation.java | 2 +- src/org/openbravo/erpCommon/ad_forms/Fact.java | 42 +- src/org/openbravo/erpCommon/ad_forms/FactLine.java | 35 +- src/org/openbravo/erpCommon/ad_forms/FactLine_data.xsql | 6 +- src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual_data.xsql | 4 +- src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending.html | 96 +- src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending.java | 119 +- src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending.xml | 30 +- src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPendingLines_data.xsql | 9 +- src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending_data.xsql | 51 +- src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java | 5 +- src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.html | 102 +- src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java | 291 +- src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.xml | 48 +- src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder_data.xsql | 70 +- src/org/openbravo/erpCommon/ad_process/ExpenseAPInvoice.java | 8 +- src/org/openbravo/erpCommon/ad_process/ExpenseAPInvoice_data.xsql | 4 +- src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java | 19 +- src/org/openbravo/erpCommon/ad_process/ScheduleProcess.java | 7 +- src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.html | 83 +- src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.java | 102 +- src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports_data.xsql | 10 + src/org/openbravo/erpCommon/ad_reports/InoutEdition_data.xsql | 15 +- src/org/openbravo/erpCommon/ad_reports/InvoiceCustomerEdition_data.xsql | 9 +- src/org/openbravo/erpCommon/ad_reports/OrderEdition_data.xsql | 8 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.jrxml | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java | 3 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java | 4 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerJR.java | 3 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerJR.jrxml | 301 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceDiscountJR.java | 21 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceDiscountJR.jrxml | 342 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceDiscount_data.xsql | 8 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoicesEditJR.jrxml | 288 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoicesJR.java | 31 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoices_data.xsql | 8 +- src/org/openbravo/erpCommon/ad_reports/ReportPurchaseOrder.jrxml | 355 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderInvoicedJasper.jrxml | 282 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderInvoiced_data.xsql | 8 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderJR.jrxml | 371 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderProvidedJR.jrxml | 232 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderProvided_data.xsql | 6 +- src/org/openbravo/erpCommon/ad_reports/ReportShipmentEdition.jrxml | 198 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.html | 150 +- src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.java | 626 +- src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.xml | 34 +- src/org/openbravo/erpCommon/ad_reports/ReportValuationStock2.html | 494 + src/org/openbravo/erpCommon/ad_reports/ReportValuationStock2.xml | 69 + src/org/openbravo/erpCommon/ad_reports/ReportValuationStockExcel.jrxml | 313 + src/org/openbravo/erpCommon/ad_reports/ReportValuationStockPDF.jrxml | 400 + src/org/openbravo/erpCommon/ad_reports/ReportValuationStock_data.xsql | 511 +- src/org/openbravo/erpCommon/ad_reports/SumaryProductCategory.jrxml | 93 + src/org/openbravo/erpCommon/ad_reports/SummaryProductCategory.java | 50 + src/org/openbravo/erpCommon/businessUtility/AuditTrailPopup.java | 50 +- src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java | 15 +- src/org/openbravo/erpCommon/businessUtility/CloneOrderHook.java | 40 + src/org/openbravo/erpCommon/businessUtility/CloneOrderHookCaller.java | 60 + src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java | 2 - src/org/openbravo/erpCommon/businessUtility/Preferences.java | 10 +- src/org/openbravo/erpCommon/businessUtility/PrinterReports.java | 6 +- src/org/openbravo/erpCommon/obps/ActivationKey.java | 74 +- src/org/openbravo/erpCommon/utility/AccDefUtility.java | 6 +- src/org/openbravo/erpCommon/utility/ComboTableData.java | 27 +- src/org/openbravo/erpCommon/utility/SystemInfo.java | 11 +- src/org/openbravo/erpCommon/utility/UsedByLink.java | 41 +- src/org/openbravo/erpCommon/utility/Utility.java | 33 +- src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java | 2 +- src/org/openbravo/erpReports/C_OrderLinesJR_new.jrxml | 2 +- src/org/openbravo/erpReports/C_OrderLinesTaxIncludedJR_new.jrxml | 2 + src/org/openbravo/event/ConversionRateEventHandler.java | 6 +- src/org/openbravo/event/MInOutLineEventHandler.java | 1 - src/org/openbravo/event/OrderEventHandler.java | 42 +- src/org/openbravo/event/ProductAumEventHandler.java | 129 + src/org/openbravo/materialmgmt/GenerateAggregatedDataBackground.java | 143 + src/org/openbravo/materialmgmt/GenerateValuedStockAggregated_data.xsql | 132 + src/org/openbravo/materialmgmt/InventoryCountProcess.java | 2 +- src/org/openbravo/materialmgmt/ManageVariantsDS.java | 42 +- src/org/openbravo/materialmgmt/ResetValuedStockAggregated.java | 364 + src/org/openbravo/materialmgmt/UOMUtil.java | 375 + src/org/openbravo/materialmgmt/actionhandler/ManageVariants.java | 3 +- src/org/openbravo/scheduling/OBScheduler.java | 35 +- src/org/openbravo/scheduling/ProcessMonitor.java | 8 +- src/org/openbravo/scheduling/ProcessRunner.java | 3 +- src/org/openbravo/service/importprocess/ImportEntryManager.java | 13 +- src/org/openbravo/service/importprocess/ImportEntryProcessor.java | 21 + src/org/openbravo/service/web/BaseWebServiceServlet.java | 29 +- src/org/openbravo/service/web/UserContextCache.java | 33 +- src/org/openbravo/service/web/WebServiceServlet.java | 22 +- web/js/cancelAndReplace.js | 62 +- 530 files changed, 207665 insertions(+), 45774 deletions(-) diffs (truncated from 320820 to 300 lines): diff -r 31c79a32ce3a -r cffd2d7e1bee .classpath.template --- a/.classpath.template Tue Jan 24 05:37:18 2017 +0000 +++ b/.classpath.template Thu Mar 09 09:44:31 2017 +0000 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry exported="true" kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0"/> + <classpathentry exported="true" kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0"/> <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> <classpathentry combineaccessrules="false" exported="true" kind="src" path="/OpenbravoTrl"/> <classpathentry combineaccessrules="false" exported="true" kind="src" path="/OpenbravoWAD"/> diff -r 31c79a32ce3a -r cffd2d7e1bee .hgsigs --- a/.hgsigs Tue Jan 24 05:37:18 2017 +0000 +++ b/.hgsigs Thu Mar 09 09:44:31 2017 +0000 @@ -197,7 +197,15 @@ 91b0a6cc5947ea0958b3d677a3e76174fa0a045e 0 iEYEABECAAYFAldajXIACgkQCX/oGf+2qkMRiQCgread+PDPwOVh7Qu/IlmeCLDSPVQAn3cepToICm61fiNkrV+PmFen4bwd ac4b84085793438223d82a0024dd84d2268d0768 0 iEYEABECAAYFAld974YACgkQCX/oGf+2qkPrUgCg05BzCWexFGf76njdN2lBgPJn5uMAoIzGxA0dHD54Km07x2m9J1pgFcoW a98ba1097ffda83047f2824177bfd940fd9268b2 0 iEYEABECAAYFAlfAIacACgkQCX/oGf+2qkMeAwCgsAyLUenvqX0uAZTRjaUrUXZfcL0AoJg0tc+GlPLwfSGk9nCtgF8M3v5f +b12145ac735ade9806288818f80bc7048f644b1e 0 iEYEABECAAYFAlgq31UACgkQCX/oGf+2qkNW8ACeMKZHj7v345vjRhUr6sJnORyzuc8An17g7zd8xd/eE3cUa7Gl86DAtGRQ c9da212632eaa8b5ad282ea755200a6761da6fa9 0 iEYEABECAAYFAlftOagACgkQCX/oGf+2qkMyVgCfXQS09IJiOH63CblJE5zX6Qn3TDQAoPZnadaVKBEfROW6Ma1feqUrUgY/ 159bac1903e52d4f6785d5e53405ae988c273975 0 iEYEABECAAYFAlejLbgACgkQCX/oGf+2qkOIMQCcDP51SEWDiDNBGTaEShgrqwhm7xYAoO/e+AXZ3cBSAhUb8CmIpJ0Rls82 b91eab932a2640f7395e9c1b7d237c08303d0788 0 iEYEABECAAYFAlfGHnMACgkQCX/oGf+2qkNXHQCgysf6qFN75kW873qTx3i0S9a2qjAAoI0R/AZCW4a6RPrNiFfjaWsOE3+v b79e30a5b3532f45101cedce0f3bb6b0a86b5780 0 iEYEABECAAYFAlfz21YACgkQCX/oGf+2qkMqZgCgodjBPp4aS6GrpBTpumtr8DsFNAYAmwS3mdHHNYX8g8y4yIwjMDzmQG+o +892fdbc643c7c5c52298aae76502ab2283a32433 0 iEYEABECAAYFAlg0JDIACgkQCX/oGf+2qkM+5gCeMkJ6j6tr/FN8cPHlBLGdnf/6F08AoNBmFRFQ/osVwBtifI+b3ZzXEx+X +e03ab293da7be8c989b20cb7b1ecf4bbf3c7c990 0 iEYEABECAAYFAlh959EACgkQCX/oGf+2qkOFNwCgi/qs8UguivvKA1tlKRKQoIsQqDIAoOGm7DqYBaR6v3aZtvaLmdvffaUh +81d470b918d385d47e958fe4c2d679cde07c9989 0 iEYEABECAAYFAliHS1kACgkQCX/oGf+2qkN/qgCeOAsukTY2FG0bVzdhXHw/K58kqlEAnAjixxvtQPM4PVmDYqzQDkGdqqtT +555379f85b18b37ee1c36b4137c75eca80da7267 0 iEYEABECAAYFAlhSQ0UACgkQCX/oGf+2qkN2yQCg5zq8YEVnWK3wy859qvLYbrEhBY4AoKsfpep+GEj+oGGlmOiOqESGPxxH +fa51600e25b24b2eb3739898d293168ea94748a7 0 iEYEABECAAYFAlh/u8wACgkQCX/oGf+2qkPTnwCfZ29b107GdizLBcC+tzdP3HlnmUUAoN2kMLXvfTYSRLAQG/ziGm5P6kYA +9753e90ea3e81f850f904feb531120b4e185394a 0 iEYEABECAAYFAliG6A8ACgkQCX/oGf+2qkPeeQCg6D9p++eslvzqEVlYK8RS0uzgZNsAoMELVWkte/AM/ilPxZ4vP37myscv +a131c85d1d3d55b852f97622ce068baf80b7fe67 0 iEYEABECAAYFAli+qu8ACgkQCX/oGf+2qkNTOACfTznbhwkwUplXd8QjHIuJ7uBJdK4An3KWtbUrBZleCwS1xH3aa2n9p9bM diff -r 31c79a32ce3a -r cffd2d7e1bee .hgtags --- a/.hgtags Tue Jan 24 05:37:18 2017 +0000 +++ b/.hgtags Thu Mar 09 09:44:31 2017 +0000 @@ -208,7 +208,15 @@ cfff3c184b53528cd71acfe21b15800db17b3436 3.0PR16Q2 7667e8781815f8fa0bf2d3104aeb585cb2ce8681 3.0PR16Q2.1 d40ef4d2ac507a87b46d3118841d03a6a54fec1e 3.0PR16Q2.2 +5c1e158fa994240cc6bd410405b4ed86a33c7261 3.0PR16Q2.4 6db3d7641170254dbd658eb774e36b092c68dd04 3.0PR16Q2.3 ec10d529b9bbe8caa83f2ea72b29b94bd3473cae 3.0PR16Q3 d0dee6596f281e29afcd159544992498896e93ff 3.0PR16Q3.1 f252db9dde915c15574e3d5fa505bd1154e39c74 3.0PR16Q3.2 +0c8c781e34c94d084b495d00a541d8d57a3903ea 3.0PR16Q3.3 +ed52b01e833ecc6407392f97ffd7d6531bd9bf2f 3.0PR16Q3.4 +ad0be95cec9715cc07fd82615c0de55f7c4a95b4 3.0PR16Q3.5 +cd98953b932b72cc3c694904fc8f8549463ba84a 3.0PR16Q4 +b93f495b2cde680cf6558d93d72051429f4b9031 3.0PR16Q4.1 +31c79a32ce3a6b555dadb35c70d63113be6312e7 3.0PR16Q4.2 +eaeb76d8cd4ec1caf5bf43bc9b4111424d799a03 3.0PR16Q4.3 diff -r 31c79a32ce3a -r cffd2d7e1bee .project --- a/.project Tue Jan 24 05:37:18 2017 +0000 +++ b/.project Thu Mar 09 09:44:31 2017 +0000 @@ -15,6 +15,11 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.sonarlint.eclipse.core.sonarlintBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.wst.common.project.facet.core.nature</nature> diff -r 31c79a32ce3a -r cffd2d7e1bee .settings/org.eclipse.jdt.core.prefs --- a/.settings/org.eclipse.jdt.core.prefs Tue Jan 24 05:37:18 2017 +0000 +++ b/.settings/org.eclipse.jdt.core.prefs Thu Mar 09 09:44:31 2017 +0000 @@ -1,11 +1,12 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.7 diff -r 31c79a32ce3a -r cffd2d7e1bee .settings/org.eclipse.wst.common.project.facet.core.xml --- a/.settings/org.eclipse.wst.common.project.facet.core.xml Tue Jan 24 05:37:18 2017 +0000 +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml Thu Mar 09 09:44:31 2017 +0000 @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <faceted-project> - <runtime name="Apache Tomcat v6.0"/> + <runtime name="Apache Tomcat v7.0"/> <fixed facet="jst.web"/> <fixed facet="jst.java"/> - <installed facet="jst.java" version="5.0"/> - <installed facet="jst.web" version="2.4"/> + <installed facet="jst.java" version="7.0"/> + <installed facet="jst.web" version="3.0"/> </faceted-project> diff -r 31c79a32ce3a -r cffd2d7e1bee WebContent/META-INF/MANIFEST.MF --- a/WebContent/META-INF/MANIFEST.MF Tue Jan 24 05:37:18 2017 +0000 +++ b/WebContent/META-INF/MANIFEST.MF Thu Mar 09 09:44:31 2017 +0000 @@ -1,2 +1,1 @@ -Manifest-Version: 1.0 -Class-Path: \ No newline at end of file +Manifest-Version: 1.0 \ No newline at end of file diff -r 31c79a32ce3a -r cffd2d7e1bee build.xml --- a/build.xml Tue Jan 24 05:37:18 2017 +0000 +++ b/build.xml Thu Mar 09 09:44:31 2017 +0000 @@ -577,7 +577,7 @@ <include name="*/lib/test/*.jar" /> </fileset> </classpath> - <link href="http://docs.oracle.com/javase/6/docs/api/"/> + <link href="http://docs.oracle.com/javase/7/docs/api/"/> </javadoc> </target> diff -r 31c79a32ce3a -r cffd2d7e1bee config/eclipse/Openbravo-eclipse-prefs.epf --- a/config/eclipse/Openbravo-eclipse-prefs.epf Tue Jan 24 05:37:18 2017 +0000 +++ b/config/eclipse/Openbravo-eclipse-prefs.epf Thu Mar 09 09:44:31 2017 +0000 @@ -16,7 +16,7 @@ /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.compliance=1.6 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.compliance=1.7 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 @org.eclipse.mylyn.monitor.ui=3.6.0.v20110608-1400 @org.eclipse.jst.j2ee.webservice.ui=1.1.500.v201105122000 @@ -130,7 +130,7 @@ /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.enumIdentifier=error @org.eclipse.team.cvs.ui=3.3.400.I20110510-0800 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.source=1.6 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.source=1.7 /instance/org.eclipse.wst.validation/USER_PREFERENCE=saveAutomaticallyfalseprojectsCanOverridetruedisableAllValidationfalseversion1.1.101.v200706071630 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 @@ -418,7 +418,7 @@ /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 /instance/org.eclipse.mylyn.tasks.ui/org.eclipse.mylyn.tasks.ui.backup.last=1233309627073 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert diff -r 31c79a32ce3a -r cffd2d7e1bee legal/Licensing.txt --- a/legal/Licensing.txt Tue Jan 24 05:37:18 2017 +0000 +++ b/legal/Licensing.txt Thu Mar 09 09:44:31 2017 +0000 @@ -116,6 +116,7 @@ # jettison-1.3.jar # log4j-1.2.16.jar # quartz-1.6.2.jar +# servlet-api.jar # tika-core-0.9.jar # wstx-asl-3.0.2.jar # xercesImpl.jar @@ -200,7 +201,6 @@ # jaxrpc.jar # mail-1.4.4.jar -# servlet-api.jar All files under the corresponding Sun Binary Code License. This is not free software, but provided under license from Sun Microsystems. @@ -216,7 +216,7 @@ # jboss-el-api_2.2_spec-1.0.0.Final.jar Under the LGPL license (included as LGPL-2.1.txt in this folder) -# cal10n-api-0.7.4.jar +# cal10n-api-0.7.7.jar # slf4j-ext-1.6.1.jar Under the MIT license (available at http://www.slf4j.org/license.html) diff -r 31c79a32ce3a -r cffd2d7e1bee lib/build/servlet-api.jar Binary file lib/build/servlet-api.jar has changed diff -r 31c79a32ce3a -r cffd2d7e1bee modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData.class Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData.class has changed diff -r 31c79a32ce3a -r cffd2d7e1bee modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UniquePaymentForTransaction.class Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UniquePaymentForTransaction.class has changed diff -r 31c79a32ce3a -r cffd2d7e1bee modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments.class Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments.class has changed diff -r 31c79a32ce3a -r cffd2d7e1bee modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck.class Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck.class has changed diff -r 31c79a32ce3a -r cffd2d7e1bee modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Tue Jan 24 05:37:18 2017 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Thu Mar 09 09:44:31 2017 +0000 @@ -300,6 +300,18 @@ <!--2EE9E3A8A29044C5B6A1BCB77EB37B87--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> <!--2EE9E3A8A29044C5B6A1BCB77EB37B87--></AD_MESSAGE> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--><AD_MESSAGE> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--> <AD_MESSAGE_ID><![CDATA[2FCA4882990D431BB1E0AB7CA7505E6B]]></AD_MESSAGE_ID> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--> <VALUE><![CDATA[APRM_InvoiceAwaitingExcutionPaymentRelated]]></VALUE> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--> <MSGTEXT><![CDATA[Invoice can not be voided as there is an awaiting execution payment related. Please either execute that payment or cancel it]]></MSGTEXT> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--> <MSGTYPE><![CDATA[E]]></MSGTYPE> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--></AD_MESSAGE> + <!--2FD618C9D5064C75BFF13B57B767C912--><AD_MESSAGE> <!--2FD618C9D5064C75BFF13B57B767C912--> <AD_MESSAGE_ID><![CDATA[2FD618C9D5064C75BFF13B57B767C912]]></AD_MESSAGE_ID> <!--2FD618C9D5064C75BFF13B57B767C912--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 31c79a32ce3a -r cffd2d7e1bee modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODEL_OBJECT.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Tue Jan 24 05:37:18 2017 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Thu Mar 09 09:44:31 2017 +0000 @@ -57,7 +57,7 @@ <!--560040FB16CB46A0ABDED8047D25D4CD--> <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_BankStatementProcess]]></CLASSNAME> <!--560040FB16CB46A0ABDED8047D25D4CD--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--560040FB16CB46A0ABDED8047D25D4CD--> <AD_PROCESS_ID><![CDATA[2DDE7D3618034C38A4462B7F3456C28D]]></AD_PROCESS_ID> -<!--560040FB16CB46A0ABDED8047D25D4CD--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +<!--560040FB16CB46A0ABDED8047D25D4CD--> <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE> <!--560040FB16CB46A0ABDED8047D25D4CD--></AD_MODEL_OBJECT> <!--62CA7E15A1D94659808D715D1A6D65F9--><AD_MODEL_OBJECT> @@ -81,7 +81,7 @@ <!--640FC5F514AA4798B36A15D1E70335EC--> <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_ReconciliationProcess]]></CLASSNAME> <!--640FC5F514AA4798B36A15D1E70335EC--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--640FC5F514AA4798B36A15D1E70335EC--> <AD_PROCESS_ID><![CDATA[6BF16EFC772843AC9A17552AE0B26AB7]]></AD_PROCESS_ID> -<!--640FC5F514AA4798B36A15D1E70335EC--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +<!--640FC5F514AA4798B36A15D1E70335EC--> <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE> <!--640FC5F514AA4798B36A15D1E70335EC--></AD_MODEL_OBJECT> <!--668D8470721B430687DFE2F97A75751F--><AD_MODEL_OBJECT> @@ -93,7 +93,7 @@ <!--668D8470721B430687DFE2F97A75751F--> <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_DoubtfulDebtProcess]]></CLASSNAME> <!--668D8470721B430687DFE2F97A75751F--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--668D8470721B430687DFE2F97A75751F--> <AD_PROCESS_ID><![CDATA[0BDC2164ED3E48539FCEF4D306F29EFD]]></AD_PROCESS_ID> -<!--668D8470721B430687DFE2F97A75751F--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +<!--668D8470721B430687DFE2F97A75751F--> <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE> <!--668D8470721B430687DFE2F97A75751F--></AD_MODEL_OBJECT> <!--733555DE925D4789BF94835D50EEEE14--><AD_MODEL_OBJECT> @@ -105,7 +105,7 @@ <!--733555DE925D4789BF94835D50EEEE14--> <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_AddPaymentFromJournal]]></CLASSNAME> <!--733555DE925D4789BF94835D50EEEE14--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--733555DE925D4789BF94835D50EEEE14--> <AD_PROCESS_ID><![CDATA[5BE14AA10165490A9ADEFB7532F7FA94]]></AD_PROCESS_ID> -<!--733555DE925D4789BF94835D50EEEE14--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +<!--733555DE925D4789BF94835D50EEEE14--> <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE> <!--733555DE925D4789BF94835D50EEEE14--></AD_MODEL_OBJECT> <!--89313103AC3C4CC0BF080175CE85AEE9--><AD_MODEL_OBJECT> @@ -153,7 +153,7 @@ <!--95620B3F5CA04222A12CD446B0581DF3--> <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_BankStatementProcess]]></CLASSNAME> <!--95620B3F5CA04222A12CD446B0581DF3--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--95620B3F5CA04222A12CD446B0581DF3--> <AD_PROCESS_ID><![CDATA[58A9261BACEF45DDA526F29D8557272D]]></AD_PROCESS_ID> -<!--95620B3F5CA04222A12CD446B0581DF3--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +<!--95620B3F5CA04222A12CD446B0581DF3--> <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE> <!--95620B3F5CA04222A12CD446B0581DF3--></AD_MODEL_OBJECT> <!--A7A562CD91CB42D9977E12B098CBC9EC--><AD_MODEL_OBJECT> @@ -177,7 +177,7 @@ <!--AA1C0D6D318943808A75A24F5781AEBF--> <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_TransactionModify]]></CLASSNAME> <!--AA1C0D6D318943808A75A24F5781AEBF--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--AA1C0D6D318943808A75A24F5781AEBF--> <AD_PROCESS_ID><![CDATA[15C8708DFC464C2D91286E59624FDD18]]></AD_PROCESS_ID> -<!--AA1C0D6D318943808A75A24F5781AEBF--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +<!--AA1C0D6D318943808A75A24F5781AEBF--> <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE> <!--AA1C0D6D318943808A75A24F5781AEBF--></AD_MODEL_OBJECT> <!--ACF0CCE03B9648CDB143478B8DD9A8F3--><AD_MODEL_OBJECT> @@ -189,7 +189,7 @@ <!--ACF0CCE03B9648CDB143478B8DD9A8F3--> <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_DoubtfulDebtRunProcess]]></CLASSNAME> <!--ACF0CCE03B9648CDB143478B8DD9A8F3--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--ACF0CCE03B9648CDB143478B8DD9A8F3--> <AD_PROCESS_ID><![CDATA[017312F51139438A9665775E3B5392A1]]></AD_PROCESS_ID> -<!--ACF0CCE03B9648CDB143478B8DD9A8F3--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +<!--ACF0CCE03B9648CDB143478B8DD9A8F3--> <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE> <!--ACF0CCE03B9648CDB143478B8DD9A8F3--></AD_MODEL_OBJECT> <!--B18447439CAB419395BDA44287722832--><AD_MODEL_OBJECT> @@ -201,7 +201,7 @@ <!--B18447439CAB419395BDA44287722832--> <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_PaymentProcess]]></CLASSNAME> <!--B18447439CAB419395BDA44287722832--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--B18447439CAB419395BDA44287722832--> <AD_PROCESS_ID><![CDATA[6255BE488882480599C81284B70CD9B3]]></AD_PROCESS_ID> -<!--B18447439CAB419395BDA44287722832--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +<!--B18447439CAB419395BDA44287722832--> <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE> <!--B18447439CAB419395BDA44287722832--></AD_MODEL_OBJECT> <!--C200D584303B4C9BA59CD232F16610D7--><AD_MODEL_OBJECT> @@ -225,7 +225,7 @@ <!--D4B8EDB86914439A9E10B5D4D8372C6C--> <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_TransactionProcess]]></CLASSNAME> <!--D4B8EDB86914439A9E10B5D4D8372C6C--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--D4B8EDB86914439A9E10B5D4D8372C6C--> <AD_PROCESS_ID><![CDATA[F68F2890E96D4D85A1DEF0274D105BCE]]></AD_PROCESS_ID> -<!--D4B8EDB86914439A9E10B5D4D8372C6C--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +<!--D4B8EDB86914439A9E10B5D4D8372C6C--> <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE> <!--D4B8EDB86914439A9E10B5D4D8372C6C--></AD_MODEL_OBJECT> <!--DC6F77826AD54AEF865E47C8FC356143--><AD_MODEL_OBJECT> @@ -249,7 +249,7 @@ <!--DF09705B3D7F4756A1E741FB3E73B825--> <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_PaymentProcess]]></CLASSNAME> <!--DF09705B3D7F4756A1E741FB3E73B825--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--DF09705B3D7F4756A1E741FB3E73B825--> <AD_PROCESS_ID><![CDATA[29D17F515727436DBCE32BC6CA28382B]]></AD_PROCESS_ID> -<!--DF09705B3D7F4756A1E741FB3E73B825--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +<!--DF09705B3D7F4756A1E741FB3E73B825--> <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE> <!--DF09705B3D7F4756A1E741FB3E73B825--></AD_MODEL_OBJECT> ------------------------------------------------------------------------------ Announcing the Oxford Dictionaries API! The API offers world-renowned dictionary content that is easy and intuitive to access. Sign up for an account today to start using our lexical data to power your apps and projects. Get started today and enter our developer competition. http://sdm.link/oxford _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits