details: https://code.openbravo.com/erp/devel/main/rev/3b8f11efa3cc changeset: 28810:3b8f11efa3cc user: Atul Gaware <atul.gaware <at> openbravo.com> date: Mon Feb 29 17:00:12 2016 +0530 summary: Fixes Issue 32373:NullPointerException when posting a Physical Inventory with a line without an associated transaction (not stocked product)
- Avoid insertion of zero quantity products in inventory line having stocked flag as No. - Code improvement to handle line with null transaction. details: https://code.openbravo.com/erp/devel/main/rev/ca63ad793d7c changeset: 28811:ca63ad793d7c user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Tue Mar 01 18:02:57 2016 +0100 summary: Related to issue 32373: Code review improvements Call line.getProductCosts only when line.transaction != null in DocInventory.java. details: https://code.openbravo.com/erp/devel/main/rev/869c7c4e3fc4 changeset: 28812:869c7c4e3fc4 user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Fri Mar 04 08:51:49 2016 +0100 summary: Fixes issue 32238: Payment In and Payment Out lines are not exported to CSV. The problem was that export to CSV does not work properly in some subtabs without link to parent column (e.g.Lines subtab of Payment In/Out). Before, It was used "tabId" to obtaing data for export to CSV and the value of the "tabId" was sent in a variable called "tab". The Criteria that is run when it is displayed the tab uses a property named "tabId" instead of "tab". The solution for this case (and other related cases) is to adapt the code that exports to CSV to use the same Criteria run when displaying the tab. Now export to CSV uses tabId property. Besides it has been refactored some piece of code related with export data in DataSourceServlet to use "tabId" instead of "tab". details: https://code.openbravo.com/erp/devel/main/rev/43ba3022b41f changeset: 28813:43ba3022b41f user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Mon Mar 07 15:51:16 2016 +0100 summary: Fixes issue 32400: cannot filter grid when it is grouped by a column. Having a column grouped, if a filter was applied in a grid, it was not possible to apply it.A js error was thrown: Uncaught TypeError: this.data.willFetchData is not a function. The problem was in:"this.data.willFetchData(....))" statement which incorrectly assumed this.data to be an object and willFetchData a function within it. This is not true when in this situation where this.data is a Tree class. It has been fixed by taking into account this case by checking that "this.data" defines the function. details: https://code.openbravo.com/erp/devel/main/rev/556acfbe7571 changeset: 28814:556acfbe7571 user: Mark <m.molina <at> nectus.com> date: Wed Mar 09 18:53:24 2016 -0500 summary: Fixes issue 32438: Wrong orders created by the Copy Record process Fixed the wrong Tax Amount and Total Gross Amount calculation in orders created by the Copy Record process if price list includes taxes. These amounts are calculated when related triggers are fired, due that when the order is cloned from the original order was necessary to reset calculated amounts and then triggers updates them again when lines are added to the cloned order. details: https://code.openbravo.com/erp/devel/main/rev/35973fc6d1e8 changeset: 28815:35973fc6d1e8 user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Thu Mar 10 17:56:11 2016 +0100 summary: Related to issue 32438: Code review improvements Use BigDecimal.ZERO instead of new BigDecimal(0). details: https://code.openbravo.com/erp/devel/main/rev/d6a7ec729aa8 changeset: 28816:d6a7ec729aa8 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Mar 15 19:22:47 2016 +0100 summary: fixes issue 32478: [object Object] appears after clearing value in selector Having singleDateMode as false after clearing the filter content of the date causes the return of an empty object in the getValuesAsCriteria method of the grid. The this.singleDateMode was being set to true in clearFilterValues function, but this statement was deleted to solve issue 31705, because it was preventing to show the range dialog after clearing the filters, when pressing the Enter key. To solve both problems the change regarding setting singleDateMode in clearFilterValues has been reverted, and in order to ensure that the range dialog is displayed when it should be, a new check has been included in the keyPress method. details: https://code.openbravo.com/erp/devel/main/rev/21c8ed48293c changeset: 28817:21c8ed48293c user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Mar 17 05:54:24 2016 +0000 summary: Update AD_MODULE version to 3.0PR15Q4.5 details: https://code.openbravo.com/erp/devel/main/rev/a53670f00eb6 changeset: 28818:a53670f00eb6 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Mar 17 05:54:25 2016 +0000 summary: Added tag 3.0PR15Q4.5 for changeset 21c8ed48293c details: https://code.openbravo.com/erp/devel/main/rev/9aef8043c575 changeset: 28819:9aef8043c575 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Mar 17 05:54:25 2016 +0000 summary: Added signature for changeset a53670f00eb6 details: https://code.openbravo.com/erp/devel/main/rev/af153cecc43c changeset: 28820:af153cecc43c user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri Mar 18 08:14:59 2016 +0000 summary: Merge temporary head for 3.0PR15Q4.5 diffstat: .hgsigs | 12 + .hgtags | 12 + build.xml | 22 +- legal/CPL-1.0.txt | 213 - legal/Licensing.txt | 21 +- lib/runtime/barcode4j-fop-ext-0.20.5-complete.jar | 0 lib/runtime/barcode4j-fop-ext-complete.jar | 0 lib/runtime/commons-io-2.0.1.jar | 0 lib/runtime/commons-io-2.4.jar | 0 lib/runtime/fop-1.1.jar | 0 lib/runtime/fop.jar | 0 lib/runtime/jackson-annotations-2.1.4.jar | 0 lib/runtime/jackson-annotations-2.5.1.jar | 0 lib/runtime/jackson-core-2.1.4.jar | 0 lib/runtime/jackson-core-2.5.1.jar | 0 lib/runtime/jackson-databind-2.1.4.jar | 0 lib/runtime/jackson-databind-2.5.1.jar | 0 lib/runtime/jdt-compiler-3.1.1.jar | 0 lib/runtime/jdt-compiler-4.4.2.jar | 0 lib/runtime/xmlgraphics-commons-1.5.jar | 0 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml | 60 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml | 3 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml | 642 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_EXTENSION_POINTS.xml | 10 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml | 28 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml | 48 + 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 | 5 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentReloadLabelsActionHandler.java | 73 +- 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 | 45 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java | 18 +- 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/hqlinjections/AddPaymentOrderInvoicesTransformer.java | 62 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/ExecutePendingPayments.java | 33 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java | 227 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 19 +- 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 | 107 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js | 11 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addTransaction.js | 6 +- 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_GC_SYSTEM.xml | 7 +- modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_TAB.xml | 7 +- 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_CALLOUT.xml | 10 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml | 1258 +- 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 | 688 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 24 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 12 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 10 + 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-test/org/openbravo/client/application/test/event/DatasourceEventObserver.java | 191 + modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/OrderLineTestObserver.java | 83 + modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java | 6 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/CachedPreference.java | 141 + modules/org.openbravo.client.application/src/org/openbravo/client/application/ChildTabRecordCounterActionHandler.java | 97 - 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 | 11 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/PreferenceEventHandler.java | 28 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/TreeTablesEventHandler.java | 9 +- 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 | 59 +- 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/GridConfigurationSequenceNumberCallout.java | 79 + 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 | 475 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js | 6 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js | 20 +- 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 | 39 +- 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-minidaterange.js | 9 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js | 18 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js | 21 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-text.js | 8 +- 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 | 30 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 18 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 54 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-messagebar.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 48 +- 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 | 35 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 190 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-view.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js | 17 + 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-keyboard-manager.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-action-def.js | 5 +- 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 | 22 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-view-manager.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css | 2 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.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_COLUMN.xml | 98 + 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/KernelServlet.java | 22 +- 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 | 27 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl | 5 +- 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 | 271 + 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_COLUMN.xml | 94 + 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-db/database/sourcedata/AD_TEXTINTERFACES.xml | 11 + modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html | 8 +- modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java | 33 +- modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.xml | 2 + modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java | 35 +- 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_COLUMN.xml | 60 + 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-db/database/sourcedata/OBSERDS_DATASOURCE.xml | 14 + modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ADTreeDatasourceService.java | 15 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/AccountTreeDatasourceService.java | 78 + modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceProperty.java | 28 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java | 27 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DefaultDataSourceService.java | 30 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/LinkToParentTreeDatasourceService.java | 3 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ReadOnlyDataSourceService.java | 98 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/TreeDatasourceService.java | 15 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_COLUMN.xml | 22 + 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_COLUMN.xml | 20 + 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 | 19 +- 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 | 36 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonToDataConverter.java | 16 +- 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 | 93 - modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_COLUMN.xml | 174 + 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.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 29 +- 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_COLUMN.xml | 26 + 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/AD_CLIENT.xml | 1 + referencedata/sampledata/F_B_International_Group/AD_PROCESS_REQUEST.xml | 2056 +- referencedata/sampledata/F_B_International_Group/AD_ROLE.xml | 24 + referencedata/sampledata/F_B_International_Group/AD_SEQUENCE.xml | 82 +- referencedata/sampledata/F_B_International_Group/AD_USER.xml | 72 +- referencedata/sampledata/F_B_International_Group/AD_WINDOW_ACCESS.xml | 700 + referencedata/sampledata/F_B_International_Group/A_AMORTIZATION.xml | 66 +- referencedata/sampledata/F_B_International_Group/A_ASSET.xml | 22 +- referencedata/sampledata/F_B_International_Group/A_ASSET_ACCT.xml | 30 + 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 | 7534 +- referencedata/sampledata/F_B_International_Group/C_INVOICELINE.xml | 16824 + referencedata/sampledata/F_B_International_Group/C_INVOICELINETAX.xml | 8208 + referencedata/sampledata/F_B_International_Group/C_INVOICETAX.xml | 2040 + referencedata/sampledata/F_B_International_Group/C_ORDER.xml | 4464 + referencedata/sampledata/F_B_International_Group/C_ORDERLINE.xml | 27094 ++ referencedata/sampledata/F_B_International_Group/C_ORDERLINETAX.xml | 6936 + referencedata/sampledata/F_B_International_Group/C_ORDERTAX.xml | 1152 + referencedata/sampledata/F_B_International_Group/C_ORDER_DISCOUNT.xml | 360 + referencedata/sampledata/F_B_International_Group/FACT_ACCT.xml | 95507 +++++++++- referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENT.xml | 88 + referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENTLINE.xml | 2688 + referencedata/sampledata/F_B_International_Group/FIN_FINACC_TRANSACTION.xml | 3828 + referencedata/sampledata/F_B_International_Group/FIN_FINANCIAL_ACCOUNT.xml | 8 +- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT.xml | 4396 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_DETAIL.xml | 1920 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROPOSAL.xml | 348 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROP_DETAIL.xml | 1260 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULE.xml | 4466 +- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULEDETAIL.xml | 2502 +- referencedata/sampledata/F_B_International_Group/FIN_RECONCILIATION.xml | 120 +- referencedata/sampledata/F_B_International_Group/GL_JOURNAL.xml | 216 + referencedata/sampledata/F_B_International_Group/GL_JOURNALBATCH.xml | 162 +- referencedata/sampledata/F_B_International_Group/GL_JOURNALLINE.xml | 2520 + referencedata/sampledata/F_B_International_Group/M_COSTING.xml | 3552 +- referencedata/sampledata/F_B_International_Group/M_INOUT.xml | 3060 + referencedata/sampledata/F_B_International_Group/M_INOUTLINE.xml | 8832 + referencedata/sampledata/F_B_International_Group/M_INVENTORY.xml | 20 +- referencedata/sampledata/F_B_International_Group/M_MATCHINV.xml | 2736 + referencedata/sampledata/F_B_International_Group/M_MATCHPO.xml | 5472 + referencedata/sampledata/F_B_International_Group/M_PRODUCT.xml | 240 + 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 | 11520 + referencedata/sampledata/F_B_International_Group/M_TRANSACTION_COST.xml | 6528 + referencedata/sampledata/F_B_International_Group/M_WAREHOUSE_RULE.xml | 24 +- referencedata/sampledata/F_B_International_Group/OBUIAPP_PROCESS_ACCESS.xml | 560 + referencedata/sampledata/QA_Testing/AD_SEQUENCE.xml | 2 +- referencedata/sampledata/QA_Testing/C_GLITEM_ACCT.xml | 30 + referencedata/sampledata/QA_Testing/C_ORDER.xml | 434 +- referencedata/sampledata/QA_Testing/C_ORDERLINE.xml | 1421 +- referencedata/sampledata/QA_Testing/C_ORDERLINETAX.xml | 743 +- referencedata/sampledata/QA_Testing/C_ORDERTAX.xml | 310 +- referencedata/sampledata/QA_Testing/M_COSTING.xml | 1320 + referencedata/sampledata/QA_Testing/M_INVENTORY.xml | 8 +- referencedata/sampledata/QA_Testing/M_PRICELIST.xml | 74 +- referencedata/sampledata/QA_Testing/M_PRICELIST_VERSION.xml | 73 +- referencedata/sampledata/QA_Testing/M_PRODUCT.xml | 517 +- referencedata/sampledata/QA_Testing/M_PRODUCTPRICE.xml | 380 +- referencedata/sampledata/QA_Testing/M_PRODUCT_CATEGORY_SERVICE.xml | 42 + referencedata/sampledata/QA_Testing/M_PRODUCT_SERVICE.xml | 81 + referencedata/sampledata/QA_Testing/M_SERVICEPRICERULE.xml | 48 + referencedata/sampledata/QA_Testing/M_SERVICEPRICERULE_RANGE.xml | 87 + referencedata/sampledata/QA_Testing/M_SERVICEPRICERULE_VERSION.xml | 45 + 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 | 4 +- src-core/src/org/openbravo/base/AntExecutor.java | 7 +- src-core/src/org/openbravo/base/ConfigParameters.java | 30 +- src-core/src/org/openbravo/base/ConnectionProviderContextListener.java | 39 +- src-core/src/org/openbravo/base/HttpBaseServlet.java | 135 +- 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/build.xml | 21 +- src-db/database/lib/dbsourcemanager.jar | 0 src-db/database/model/functions/A_AMORTIZATION_PROCESS.xml | 20 +- src-db/database/model/functions/C_COMMISSION_PROCESS.xml | 13 +- src-db/database/model/functions/C_GENERATESOFROMPROJECTPHASE.xml | 2 +- src-db/database/model/functions/C_GET_SERVICE_AMOUNT.xml | 98 + src-db/database/model/functions/C_INVOICE_CREATE.xml | 19 +- src-db/database/model/functions/C_ORDER_POST1.xml | 21 +- src-db/database/model/functions/MA_WORKEFFORT_VALIDATE.xml | 32 + src-db/database/model/functions/MRP_PURCHASEORDER.xml | 63 +- 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 | 32 +- src-db/database/model/functions/M_INVENTORY_LISTCREATE.xml | 5 +- 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_PROMOTION_CALCULATE.xml | 11 +- src-db/database/model/functions/M_RESERVE_STOCK_AUTO.xml | 3 +- src-db/database/model/functions/M_RESERVE_STOCK_MANUAL.xml | 4 +- 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_CLIENT.xml | 4 + src-db/database/model/tables/AD_COLUMN.xml | 10 + 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_USER.xml | 4 + 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/C_ORDER.xml | 3 + src-db/database/model/tables/C_ORDERLINE.xml | 13 + src-db/database/model/tables/C_ORDERLINE_SERVICERELATION.xml | 76 + src-db/database/model/tables/M_CHARACTERISTIC.xml | 5 + src-db/database/model/tables/M_PRODUCT.xml | 62 + src-db/database/model/tables/M_PRODUCT_CATEGORY_SERVICE.xml | 68 + 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/tables/M_PRODUCT_CH_VALUE.xml | 3 + src-db/database/model/tables/M_PRODUCT_SERVICE.xml | 68 + src-db/database/model/tables/M_SERVICEPRICERULE.xml | 69 + src-db/database/model/tables/M_SERVICEPRICERULE_RANGE.xml | 82 + src-db/database/model/tables/M_SERVICEPRICERULE_VERSION.xml | 65 + src-db/database/model/triggers/AD_ALERTRECIPIENT_TRG.xml | 24 +- src-db/database/model/triggers/AD_COLUMN_MOD_TRG.xml | 7 +- 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/AD_USER_EXPIRATIONPASS_TRG.xml | 37 + 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 | 48 +- src-db/database/model/triggers/C_ORDER_TRG2.xml | 4 +- 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_BEF_TRG.xml | 43 + src-db/database/model/triggers/M_PRODUCT_TRG.xml | 8 +- src-db/database/model/triggers/M_SERVICEPRICERULE_RANGE_TRG.xml | 35 + src-db/database/model/triggers/M_SERVICEPRICERULE_TRG.xml | 40 + src-db/database/model/triggers/M_TRANSACTION_TRG.xml | 63 +- 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/model/views/M_RM_SHIPMENT_PICK_EDIT.xml | 2 +- src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 132 + src-db/database/sourcedata/AD_COLUMN.xml | 25414 ++- src-db/database/sourcedata/AD_DATASET_TABLE.xml | 84 + src-db/database/sourcedata/AD_ELEMENT.xml | 625 + src-db/database/sourcedata/AD_FIELD.xml | 4951 +- src-db/database/sourcedata/AD_FIELDGROUP.xml | 20 + src-db/database/sourcedata/AD_MENU.xml | 13 + src-db/database/sourcedata/AD_MESSAGE.xml | 904 +- src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_REFERENCE.xml | 97 + src-db/database/sourcedata/AD_REF_LIST.xml | 95 + src-db/database/sourcedata/AD_TAB.xml | 444 +- src-db/database/sourcedata/AD_TABLE.xml | 255 + src-db/database/sourcedata/AD_TABLE_TREE.xml | 3 +- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 154 +- src-db/database/sourcedata/AD_TREENODE.xml | 13 +- src-db/database/sourcedata/AD_VAL_RULE.xml | 36 +- src-db/database/sourcedata/AD_WINDOW.xml | 75 + src-db/database/sourcedata/OBUIAPP_PARAMETER.xml | 282 +- src-db/database/sourcedata/OBUIAPP_PROCESS.xml | 78 +- src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml | 36 + src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 37 + src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 204 + src-db/database/sourcedata/referencedData/AD_LANGUAGE.xml | 15 + src-db/database/sourcedata/referencedData/AD_USER.xml | 2 + src-db/database/sourcedata/referencedData/C_REGION.xml | 4 +- src-test/src/org/openbravo/test/AllAntTaskTests.java | 36 +- src-test/src/org/openbravo/test/AllTests.java | 4 +- src-test/src/org/openbravo/test/AntTaskTests.java | 4 + src-test/src/org/openbravo/test/base/OBBaseTest.java | 40 +- src-test/src/org/openbravo/test/base/TestLogAppender.java | 86 + src-test/src/org/openbravo/test/costing/TestCosting.java | 355 +- src-test/src/org/openbravo/test/dal/DalQueryTest.java | 12 +- src-test/src/org/openbravo/test/dal/DalTest.java | 12 +- src-test/src/org/openbravo/test/dal/DynamicEntityTest.java | 15 +- 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/preference/PreferenceTest.java | 33 +- src-test/src/org/openbravo/test/reporting/JasperReportsCompilation.java | 69 + 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/services/ServicesTest.java | 301 + src-test/src/org/openbravo/test/services/ServicesTest2.java | 236 + src-test/src/org/openbravo/test/services/ServicesTest3.java | 228 + src-test/src/org/openbravo/test/services/data/ServiceTestData.java | 200 + src-test/src/org/openbravo/test/services/data/ServiceTestData1.java | 43 + src-test/src/org/openbravo/test/services/data/ServiceTestData10.java | 42 + src-test/src/org/openbravo/test/services/data/ServiceTestData11.java | 53 + src-test/src/org/openbravo/test/services/data/ServiceTestData2.java | 45 + src-test/src/org/openbravo/test/services/data/ServiceTestData3.java | 43 + src-test/src/org/openbravo/test/services/data/ServiceTestData4.java | 45 + src-test/src/org/openbravo/test/services/data/ServiceTestData5.java | 43 + src-test/src/org/openbravo/test/services/data/ServiceTestData6.java | 43 + src-test/src/org/openbravo/test/services/data/ServiceTestData7.java | 43 + src-test/src/org/openbravo/test/services/data/ServiceTestData8.java | 47 + src-test/src/org/openbravo/test/services/data/ServiceTestData9.java | 53 + src-test/src/org/openbravo/test/views/GCSequenceNumberTests.java | 194 + src-test/src/org/openbravo/test/views/SortingFilteringGridConfiguration.java | 275 + src-test/src/org/openbravo/test/views/ViewGenerationWithDifferentConfigLevelTest.java | 307 + src-util/modulescript/build/classes/org/openbravo/modulescript/PgJdbcDatesIssue.class | 0 src-util/modulescript/src/org/openbravo/modulescript/PgJdbcDatesIssue.java | 9 +- src/index.jsp | 2 +- src/org/openbravo/authentication/AuthenticationException.java | 12 +- src/org/openbravo/authentication/AuthenticationExpirationPasswordException.java | 43 + src/org/openbravo/authentication/basic/DefaultAuthenticationManager.java | 98 +- src/org/openbravo/base/exception/OBException.java | 34 +- src/org/openbravo/base/model/Entity.java | 25 +- src/org/openbravo/base/model/ModelProvider.java | 28 +- src/org/openbravo/base/model/Property.java | 5 + src/org/openbravo/base/secureApp/HttpSecureAppServlet.java | 87 +- src/org/openbravo/base/secureApp/LoginHandler.java | 137 +- src/org/openbravo/base/secureApp/LoginUtils.java | 163 + src/org/openbravo/base/session/SessionFactoryController.java | 12 +- src/org/openbravo/base/structure/BaseOBObject.java | 8 +- src/org/openbravo/base/structure/InheritedAccessEnabled.java | 34 + src/org/openbravo/common/actionhandler/ManageReservationActionHandler.java | 15 +- src/org/openbravo/common/actionhandler/OrderCreatePOLines.java | 11 +- src/org/openbravo/common/actionhandler/RFCServiceReturnableActionHandler.java | 82 + src/org/openbravo/common/actionhandler/RMInOutPickEditLines.java | 20 +- src/org/openbravo/common/actionhandler/RelateProductCatToServiceProduct.java | 110 + src/org/openbravo/common/actionhandler/RelateProductsToServiceProduct.java | 109 + src/org/openbravo/common/actionhandler/SRMOPickEditLines.java | 9 +- src/org/openbravo/common/actionhandler/ServiceOrderLineRelate.java | 381 + src/org/openbravo/common/actionhandler/ServiceRelatedLinePriceActionHandler.java | 97 + src/org/openbravo/common/datasource/OrderLinePickEditTransformer.java | 145 + src/org/openbravo/costing/AverageAlgorithm.java | 29 +- src/org/openbravo/costing/AverageCostAdjustment.java | 13 +- src/org/openbravo/costing/CostAdjustmentProcess.java | 38 +- src/org/openbravo/costing/CostAdjustmentUtils.java | 222 +- src/org/openbravo/costing/CostingAlgorithmAdjustmentImp.java | 13 +- src/org/openbravo/costing/CostingMigrationProcess.java | 40 +- src/org/openbravo/costing/CostingRuleProcess.java | 271 +- src/org/openbravo/costing/CostingRuleProcessOnProcessHandler.java | 6 +- src/org/openbravo/costing/CostingServer.java | 141 +- src/org/openbravo/costing/CostingUtils.java | 138 +- src/org/openbravo/costing/InventoryAmountUpdateProcess.java | 7 +- src/org/openbravo/costing/LCCostMatchFromInvoiceHandler.java | 6 +- src/org/openbravo/costing/PriceDifferenceProcess.java | 9 +- 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/service/OBDal.java | 11 +- 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_actionButton/RMInsertOrphanLine.java | 5 + 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/SE_Payment_BPartner.java | 53 +- 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/AcctServer.java | 83 +- src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 277 +- src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 274 +- src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 184 +- src/org/openbravo/erpCommon/ad_forms/DocInventory.java | 17 +- src/org/openbravo/erpCommon/ad_forms/DocInvoice.java | 46 +- src/org/openbravo/erpCommon/ad_forms/DocInvoice_data.xsql | 19 +- src/org/openbravo/erpCommon/ad_forms/DocLine_FINFinAccTransaction.java | 47 +- src/org/openbravo/erpCommon/ad_forms/DocLine_FINPayment.java | 64 +- src/org/openbravo/erpCommon/ad_forms/DocMatchInv.java | 58 +- 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/MaterialReceiptPending.html | 2 +- src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending.java | 2 +- src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending_data.xsql | 7 +- src/org/openbravo/erpCommon/ad_forms/Role.java | 3 +- src/org/openbravo/erpCommon/ad_forms/ShowSessionPreferences.html | 4 +- src/org/openbravo/erpCommon/ad_help/HelpWindow.java | 5 +- 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 | 18 +- src/org/openbravo/erpCommon/ad_reports/CustomerStatement.jrxml | 14 +- src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports_data.xsql | 21 +- 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/ReportPricelist.fo | 4 +- src/org/openbravo/erpCommon/ad_reports/ReportProjectProfitability_data.xsql | 22 +- src/org/openbravo/erpCommon/ad_reports/ReportRefundSalesDimensionalAnalyses.fo | 6 +- 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/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/EndYearCloseUtility.java | 62 +- src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java | 13 +- src/org/openbravo/erpCommon/businessUtility/Preferences.java | 119 +- src/org/openbravo/erpCommon/businessUtility/PriceAdjustment.java | 5 +- src/org/openbravo/erpCommon/businessUtility/PrinterReports.java | 33 +- src/org/openbravo/erpCommon/businessUtility/TabAttachments.java | 19 +- src/org/openbravo/erpCommon/info/Account.html | 6 +- src/org/openbravo/erpCommon/info/Account.java | 5 +- src/org/openbravo/erpCommon/info/AccountElementValue.html | 6 +- src/org/openbravo/erpCommon/info/AccountElementValue.java | 13 +- src/org/openbravo/erpCommon/info/AttributeSetInstance.html | 9 +- src/org/openbravo/erpCommon/info/BusinessPartner.html | 6 +- src/org/openbravo/erpCommon/info/BusinessPartner.java | 3 +- src/org/openbravo/erpCommon/info/DebtPayment.html | 6 +- src/org/openbravo/erpCommon/info/ImageInfo.html | 5 +- src/org/openbravo/erpCommon/info/ImageInfoBLOB.html | 5 +- src/org/openbravo/erpCommon/info/ImageInfoBLOB.java | 7 +- src/org/openbravo/erpCommon/info/Invoice.html | 6 +- src/org/openbravo/erpCommon/info/Invoice.java | 5 +- src/org/openbravo/erpCommon/info/InvoiceLine.html | 6 +- src/org/openbravo/erpCommon/info/InvoiceLine.java | 10 +- src/org/openbravo/erpCommon/info/Location.java | 5 +- src/org/openbravo/erpCommon/info/Location_F1.html | 11 +- src/org/openbravo/erpCommon/info/Location_FS.html | 1 + src/org/openbravo/erpCommon/info/Locator.html | 6 +- src/org/openbravo/erpCommon/info/Locator.java | 5 +- src/org/openbravo/erpCommon/info/Product.html | 6 +- src/org/openbravo/erpCommon/info/Product.java | 5 +- src/org/openbravo/erpCommon/info/ProductComplete.html | 6 +- src/org/openbravo/erpCommon/info/ProductComplete.java | 3 +- src/org/openbravo/erpCommon/info/ProductMultiple.java | 1 + src/org/openbravo/erpCommon/info/Project.html | 6 +- src/org/openbravo/erpCommon/info/Project.java | 5 +- src/org/openbravo/erpCommon/info/SalesOrder.html | 6 +- src/org/openbravo/erpCommon/info/SalesOrder.java | 5 +- src/org/openbravo/erpCommon/info/SalesOrderLine.html | 6 +- src/org/openbravo/erpCommon/info/SalesOrderLine.java | 5 +- src/org/openbravo/erpCommon/info/SearchUniqueKeyResponse.html | 5 +- src/org/openbravo/erpCommon/info/ServiceProductPricePrecisionFilterExpression.java | 49 + src/org/openbravo/erpCommon/info/ShipmentReceipt.html | 4 +- src/org/openbravo/erpCommon/info/ShipmentReceipt.java | 5 +- src/org/openbravo/erpCommon/info/ShipmentReceiptLine.html | 6 +- src/org/openbravo/erpCommon/info/ShipmentReceiptLine.java | 5 +- src/org/openbravo/erpCommon/obps/ActivationKey.java | 149 +- src/org/openbravo/erpCommon/obps/ModuleLicenseRestrictions.java | 95 + src/org/openbravo/erpCommon/security/Login.html | 68 +- src/org/openbravo/erpCommon/security/Login.java | 18 +- src/org/openbravo/erpCommon/security/Login.xml | 2 + src/org/openbravo/erpCommon/security/Login_F1.html | 4 +- src/org/openbravo/erpCommon/security/SessionActive.java | 21 +- 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/erpReports/RptMA_CCP_Group.fo | 4 +- src/org/openbravo/erpReports/RptMA_CCP_Measures.fo | 4 +- src/org/openbravo/erpReports/RptM_Inout.fo | 4 +- src/org/openbravo/event/GLJournalLineEventHandler.java | 16 +- src/org/openbravo/event/ProductCharacteristicEventHandler.java | 140 +- src/org/openbravo/event/ProductCharacteristicValueEventHandler.java | 42 +- src/org/openbravo/event/ServiceOrderLineEventHandler.java | 212 + src/org/openbravo/event/ServicePriceRuleRangeEventHandler.java | 90 + src/org/openbravo/event/ServiceRelationEventHandler.java | 180 + 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/ServicePriceUtils.java | 464 + src/org/openbravo/materialmgmt/actionhandler/AddProductsToChValue.java | 94 +- src/org/openbravo/materialmgmt/actionhandler/ManageVariants.java | 5 +- 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/ImportEntryArchiveManager.java | 13 +- src/org/openbravo/service/importprocess/ImportEntryManager.java | 32 +- src/org/openbravo/service/importprocess/ImportEntryPostProcessor.java | 33 + src/org/openbravo/service/importprocess/ImportEntryProcessor.java | 21 +- src/org/openbravo/service/importprocess/ImportProcessUtils.java | 25 +- src/org/openbravo/service/rest/DalWebService.java | 9 +- src/org/openbravo/service/system/SystemService.java | 48 +- web/js/productServices.js | 188 + web/js/recalculatePermissionsProcess.js | 83 + web/js/utils.js | 10 +- 660 files changed, 301932 insertions(+), 8695 deletions(-) diffs (truncated from 510479 to 300 lines): diff -r 70df4e4c5cab -r af153cecc43c .hgsigs --- a/.hgsigs Mon Feb 29 04:46:02 2016 +0000 +++ b/.hgsigs Fri Mar 18 08:14:59 2016 +0000 @@ -176,5 +176,17 @@ 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 +6c3455925759761e11a3e14afee7d4bfa6d44b7b 0 iEYEABECAAYFAlagn5YACgkQCX/oGf+2qkO+bwCg5QR2pBchydWi0CYFTF0W0E3YP5AAoI2VCfXgMzocJ8AAeqsXRtetQ1pR +d2c765a228d83098cc5f253cdd364abdb4a4697e 0 iEYEABECAAYFAlZOorMACgkQCX/oGf+2qkMFfwCgocaX6vsWuoGtE55aoHgBD1/7OKoAoOv4J31+P+8BtkVHJyKLhxGVBoLo +cf00bd72641cd3d41f95c0610058f127dad7b91a 0 iEYEABECAAYFAlZv7k4ACgkQCX/oGf+2qkNDIgCeO9reaQhgk94B44p24tVR/E5NsccAoOoJYRH9w6b6sWOOQkRivfVjQwSv +13daf93202e0933841632c91b1d4a887d9521e3c 0 iEYEABECAAYFAlahu2QACgkQCX/oGf+2qkPP3QCdFhiUHKeBfwEFsprfMiofZWZ1/wkAoN0Tjy/Hk2svUSV2vBYUf3uHGz+U +24d2967df096de06913c9991553c1d84b07df9b6 0 iEYEABECAAYFAla9YYIACgkQCX/oGf+2qkNH7wCfV32iOyR/TQKzW/mH1iHTir6f6h4AoIlh4QBWIShpJqbJvx2IhfARpvUZ +f016ea545c924ad099e9e402689035f1dd73baa2 0 iEYEABECAAYFAlbTzQoACgkQCX/oGf+2qkP28wCdFpNqpw+ODgF0p3cMJAbTZy1IPfoAoNEuRHkZIM5bNJMjwU0/GhjCtwah +a53670f00eb6c9225829a660075fcfffa1109a1e 0 iEYEABECAAYFAlbqRpEACgkQCX/oGf+2qkN5qQCgsO1APX5AJ4cpb0oJX5vUQnvPMusAoPoDaQxGDihvsB4BSGW60RIxBdGC +38ef1dc10aa3d6fb8210b85beab370f62a4545ca 0 iEYEABECAAYFAlbiTM0ACgkQCX/oGf+2qkNBDwCfXmKXkqNGsAsfiofYOBBdvjA/XgkAoIwLK3DkmHeM71JihwfVOWyB4hmj diff -r 70df4e4c5cab -r af153cecc43c .hgtags --- a/.hgtags Mon Feb 29 04:46:02 2016 +0000 +++ b/.hgtags Fri Mar 18 08:14:59 2016 +0000 @@ -187,5 +187,17 @@ 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 +0c91d0ae09c32dc46fc9e91f516ef36c6cdecda7 3.0PR15Q3.5 +84cd25c33900a44c955c5a899e570281f02e0ccc 3.0PR15Q4 +f698a5f953c867f7f7fefe86d7cca3ff80324181 3.0PR15Q4.1 +b6c50283d4a8ae24f54c0f0955601478ead7134d 3.0PR15Q4.2 +9985680adffaf70ffcc1f560860feb10f0ee6b33 3.0PR15Q4.3 +70df4e4c5cab6d37f10eceee6b66be039c381556 3.0PR15Q4.4 +21c8ed48293c94cbe5875a8edef08aca0efd2bf4 3.0PR15Q4.5 +ee5383e071318afe8eece515b4b264cfb46c1a84 3.0PR16Q1 diff -r 70df4e4c5cab -r af153cecc43c build.xml --- a/build.xml Mon Feb 29 04:46:02 2016 +0000 +++ b/build.xml Fri Mar 18 08:14:59 2016 +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> @@ -716,7 +732,7 @@ <echo message="applying modules" /> <antcall inheritall="true" inheritrefs="true" target="apply.module" /> - <antcall target="import.sample.data" /> + <antcall inheritall="true" target="import.sample.data" /> <updatesystemstatus v="RB51"/> <ant dir="${base.db}" target="setApplied" inheritAll="true" inheritRefs="true" /> diff -r 70df4e4c5cab -r af153cecc43c legal/CPL-1.0.txt --- a/legal/CPL-1.0.txt Mon Feb 29 04:46:02 2016 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,213 +0,0 @@ -Common Public License Version 1.0 - -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC -LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM -CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - -1. DEFINITIONS - -"Contribution" means: - -a) in the case of the initial Contributor, the initial code and -documentation distributed under this Agreement, and - -b) in the case of each subsequent Contributor: - -i) changes to the Program, and - -ii) additions to the Program; - -where such changes and/or additions to the Program originate from and are -distributed by that particular Contributor. A Contribution 'originates' from a -Contributor if it was added to the Program by such Contributor itself or anyone -acting on such Contributor's behalf. Contributions do not include additions to -the Program which: (i) are separate modules of software distributed in -conjunction with the Program under their own license agreement, and (ii) are not -derivative works of the Program. - -"Contributor" means any person or entity that distributes the Program. - -"Licensed Patents " mean patent claims licensable by a Contributor which are -necessarily infringed by the use or sale of its Contribution alone or when -combined with the Program. - -"Program" means the Contributions distributed in accordance with this Agreement. - -"Recipient" means anyone who receives the Program under this Agreement, -including all Contributors. - -2. GRANT OF RIGHTS - -a) Subject to the terms of this Agreement, each Contributor hereby grants -Recipient a non-exclusive, worldwide, royalty-free copyright license to -reproduce, prepare derivative works of, publicly display, publicly perform, -distribute and sublicense the Contribution of such Contributor, if any, and such -derivative works, in source code and object code form. - -b) Subject to the terms of this Agreement, each Contributor hereby grants -Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed -Patents to make, use, sell, offer to sell, import and otherwise transfer the -Contribution of such Contributor, if any, in source code and object code form. -This patent license shall apply to the combination of the Contribution and the -Program if, at the time the Contribution is added by the Contributor, such -addition of the Contribution causes such combination to be covered by the -Licensed Patents. The patent license shall not apply to any other combinations -which include the Contribution. No hardware per se is licensed hereunder. - -c) Recipient understands that although each Contributor grants the licenses -to its Contributions set forth herein, no assurances are provided by any -Contributor that the Program does not infringe the patent or other intellectual -property rights of any other entity. Each Contributor disclaims any liability to -Recipient for claims brought by any other entity based on infringement of -intellectual property rights or otherwise. As a condition to exercising the -rights and licenses granted hereunder, each Recipient hereby assumes sole -responsibility to secure any other intellectual property rights needed, if any. -For example, if a third party patent license is required to allow Recipient to -distribute the Program, it is Recipient's responsibility to acquire that license -before distributing the Program. - -d) Each Contributor represents that to its knowledge it has sufficient -copyright rights in its Contribution, if any, to grant the copyright license set -forth in this Agreement. - -3. REQUIREMENTS - -A Contributor may choose to distribute the Program in object code form under its -own license agreement, provided that: - -a) it complies with the terms and conditions of this Agreement; and - -b) its license agreement: - -i) effectively disclaims on behalf of all Contributors all warranties and -conditions, express and implied, including warranties or conditions of title and -non-infringement, and implied warranties or conditions of merchantability and -fitness for a particular purpose; - -ii) effectively excludes on behalf of all Contributors all liability for -damages, including direct, indirect, special, incidental and consequential -damages, such as lost profits; - -iii) states that any provisions which differ from this Agreement are offered -by that Contributor alone and not by any other party; and - -iv) states that source code for the Program is available from such -Contributor, and informs licensees how to obtain it in a reasonable manner on or -through a medium customarily used for software exchange. - -When the Program is made available in source code form: - -a) it must be made available under this Agreement; and - -b) a copy of this Agreement must be included with each copy of the Program. - -Contributors may not remove or alter any copyright notices contained within the -Program. - -Each Contributor must identify itself as the originator of its Contribution, if -any, in a manner that reasonably allows subsequent Recipients to identify the -originator of the Contribution. - -4. COMMERCIAL DISTRIBUTION - -Commercial distributors of software may accept certain responsibilities with -respect to end users, business partners and the like. While this license is -intended to facilitate the commercial use of the Program, the Contributor who -includes the Program in a commercial product offering should do so in a manner -which does not create potential liability for other Contributors. Therefore, if -a Contributor includes the Program in a commercial product offering, such -Contributor ("Commercial Contributor") hereby agrees to defend and indemnify -every other Contributor ("Indemnified Contributor") against any losses, damages -and costs (collectively "Losses") arising from claims, lawsuits and other legal -actions brought by a third party against the Indemnified Contributor to the -extent caused by the acts or omissions of such Commercial Contributor in -connection with its distribution of the Program in a commercial product -offering. The obligations in this section do not apply to any claims or Losses -relating to any actual or alleged intellectual property infringement. In order -to qualify, an Indemnified Contributor must: a) promptly notify the Commercial -Contributor in writing of such claim, and b) allow the Commercial Contributor to -control, and cooperate with the Commercial Contributor in, the defense and any -related settlement negotiations. The Indemnified Contributor may participate in -any such claim at its own expense. - -For example, a Contributor might include the Program in a commercial product -offering, Product X. That Contributor is then a Commercial Contributor. If that -Commercial Contributor then makes performance claims, or offers warranties -related to Product X, those performance claims and warranties are such -Commercial Contributor's responsibility alone. Under this section, the -Commercial Contributor would have to defend claims against the other -Contributors related to those performance claims and warranties, and if a court -requires any other Contributor to pay any damages as a result, the Commercial -Contributor must pay those damages. - -5. NO WARRANTY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR -IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, -NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each -Recipient is solely responsible for determining the appropriateness of using and -distributing the Program and assumes all risks associated with its exercise of -rights under this Agreement, including but not limited to the risks and costs of -program errors, compliance with applicable laws, damage to or loss of data, -programs or equipment, and unavailability or interruption of operations. - -6. DISCLAIMER OF LIABILITY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY -CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST -PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS -GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -7. GENERAL - -If any provision of this Agreement is invalid or unenforceable under applicable -law, it shall not affect the validity or enforceability of the remainder of the -terms of this Agreement, and without further action by the parties hereto, such -provision shall be reformed to the minimum extent necessary to make such -provision valid and enforceable. - -If Recipient institutes patent litigation against a Contributor with respect to -a patent applicable to software (including a cross-claim or counterclaim in a -lawsuit), then any patent licenses granted by that Contributor to such Recipient -under this Agreement shall terminate as of the date such litigation is filed. In -addition, if Recipient institutes patent litigation against any entity -(including a cross-claim or counterclaim in a lawsuit) alleging that the Program -itself (excluding combinations of the Program with other software or hardware) -infringes such Recipient's patent(s), then such Recipient's rights granted under -Section 2(b) shall terminate as of the date such litigation is filed. - -All Recipient's rights under this Agreement shall terminate if it fails to -comply with any of the material terms or conditions of this Agreement and does -not cure such failure in a reasonable period of time after becoming aware of -such noncompliance. If all Recipient's rights under this Agreement terminate, -Recipient agrees to cease use and distribution of the Program as soon as -reasonably practicable. However, Recipient's obligations under this Agreement -and any licenses granted by Recipient relating to the Program shall continue and -survive. - -Everyone is permitted to copy and distribute copies of this Agreement, but in -order to avoid inconsistency the Agreement is copyrighted and may only be -modified in the following manner. The Agreement Steward reserves the right to -publish new versions (including revisions) of this Agreement from time to time. -No one other than the Agreement Steward has the right to modify this Agreement. -IBM is the initial Agreement Steward. IBM may assign the responsibility to serve -as the Agreement Steward to a suitable separate entity. Each new version of the -Agreement will be given a distinguishing version number. The Program (including -Contributions) may always be distributed subject to the version of the Agreement -under which it was received. In addition, after a new version of the Agreement -is published, Contributor may elect to distribute the Program (including its -Contributions) under the new version. Except as expressly stated in Sections -2(a) and 2(b) above, Recipient receives no rights or licenses to the -intellectual property of any Contributor under this Agreement, whether -expressly, by implication, estoppel or otherwise. All rights in the Program not -expressly granted under this Agreement are reserved. - -This Agreement is governed by the laws of the State of New York and the -intellectual property laws of the United States of America. No party to this ------------------------------------------------------------------------------ Transform Data into Opportunity. Accelerate data analysis in your applications with Intel Data Analytics Acceleration Library. Click to learn more. http://pubads.g.doubleclick.net/gampad/clk?id=278785231&iu=/4140 _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
