details: https://code.openbravo.com/erp/devel/main/rev/ebccd358e1cf changeset: 28864:ebccd358e1cf user: Atul Gaware <atul.gaware <at> openbravo.com> date: Mon May 02 16:58:34 2016 +0530 summary: Fixes issue 32983: Generate duplicate payment plan under some circumstances
Before processing order, a check is done whether processed flag is N or not. details: https://code.openbravo.com/erp/devel/main/rev/8ae675ffb845 changeset: 28865:8ae675ffb845 user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Tue May 03 11:36:04 2016 +0200 summary: Related to issue 32983: Code review improvements details: https://code.openbravo.com/erp/devel/main/rev/caf1d686ebe1 changeset: 28866:caf1d686ebe1 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri May 20 11:08:28 2016 +0200 summary: fixed bug 33014: error in Instance Activation when using an expired license When using a license within an erroneous state (such as expired), message severity was incorrectly obtained from the enum, causing an exception to be thrown. Fixed by using MsgSeverity.forType method instead of valueOf. forType method was designed with this purpose. In addition, some other changes have been done on MsgSeverity enum: * valueOf method is static so no need to invoke it on an instance (to may be another one, which is weird). * checking with actual type rather than with toString (which might change) * reversed comparision order to prevent NPE in case param in null details: https://code.openbravo.com/erp/devel/main/rev/43e2d443e6c9 changeset: 28867:43e2d443e6c9 user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Fri May 20 10:08:11 2016 +0200 summary: Fixes issue 33007: Stock before costing rule not shown in Valued Stock Report Convert current costing rule starting date with to_timestamp instead of with to_date function to avoid date truncation. Before, current costing rule starting date was truncated and closing and opening inventories created by costing rule validation were taken, so stock was zero. Now, current costing rule starting date will not be truncated and only opening inventory created by costing rule validation will be taken, then stock will be the same as before the costing rule. details: https://code.openbravo.com/erp/devel/main/rev/0352a751baf7 changeset: 28868:0352a751baf7 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon May 23 12:36:08 2016 +0200 summary: fixes issue 33024: Cannot export CSV from Widgets The name of the parameter used to sent the tab ID when exporting to CSV changed, this affected a check on DataSourceServlet that was always true when exporting widgets until now. Created an utility method to check whether a json value can be considered as empty which takes into account common cases of null and undefined literals. details: https://code.openbravo.com/erp/devel/main/rev/ec73935a2c83 changeset: 28869:ec73935a2c83 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue May 24 06:46:25 2016 +0000 summary: Update AD_MODULE version to 3.0PR16Q1.2 details: https://code.openbravo.com/erp/devel/main/rev/98bdf9167a3d changeset: 28870:98bdf9167a3d user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue May 24 06:46:25 2016 +0000 summary: Added tag 3.0PR16Q1.2 for changeset ec73935a2c83 details: https://code.openbravo.com/erp/devel/main/rev/39fa30f4f802 changeset: 28871:39fa30f4f802 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue May 24 06:46:25 2016 +0000 summary: Added signature for changeset 98bdf9167a3d details: https://code.openbravo.com/erp/devel/main/rev/8b659a12c6d1 changeset: 28872:8b659a12c6d1 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue May 24 12:13:22 2016 +0000 summary: Merge temporary head for 3.0PR16Q1.2 diffstat: .hgsigs | 9 + .hgtags | 9 + build.xml | 2 +- legal/Licensing.txt | 11 +- lib/runtime/barcode4j-fop-ext-0.20.5-complete.jar | 0 lib/runtime/barcode4j-fop-ext-complete.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/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/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 | 12 + 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/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java | 2 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java | 43 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java | 14 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/AddPaymentOrderInvoicesTransformer.java | 62 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java | 227 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java | 17 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 16 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java | 41 +- 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.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.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/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/sourcedata/AD_CALLOUT.xml | 10 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml | 669 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml | 60 +- 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-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 | 5 +- 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/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/window/GridConfigurationSequenceNumberCallout.java | 79 + modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewUtil.java | 169 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-combo.js | 19 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js | 2 + 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/ob-view-form.js | 36 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 36 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js | 29 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 188 +- 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/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.js | 15 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-view-manager.js | 2 +- 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.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-test/org/openbravo/client/kernel/freemarker/test/GenerateComponentTest.java | 29 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/ApplicationComponent.java | 11 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelServlet.java | 22 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java | 8 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl | 5 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_COLUMN.xml | 232 + modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_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.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 | 27 +- 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/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 | 7 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java | 25 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonToDataConverter.java | 16 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/UnpagedRequestCachedPreference.java | 94 - 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/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.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 | 1174 +- referencedata/sampledata/F_B_International_Group/AD_SEQUENCE.xml | 62 +- referencedata/sampledata/F_B_International_Group/AD_USER.xml | 72 +- referencedata/sampledata/F_B_International_Group/AD_WINDOW_ACCESS.xml | 560 + referencedata/sampledata/F_B_International_Group/C_BPARTNER.xml | 102 +- referencedata/sampledata/F_B_International_Group/C_CONVERSION_RATE.xml | 36 + referencedata/sampledata/F_B_International_Group/C_INVOICE.xml | 4046 +- referencedata/sampledata/F_B_International_Group/C_INVOICELINE.xml | 8376 + referencedata/sampledata/F_B_International_Group/C_INVOICELINETAX.xml | 4104 + referencedata/sampledata/F_B_International_Group/C_INVOICETAX.xml | 1020 + referencedata/sampledata/F_B_International_Group/C_ORDER.xml | 2232 + referencedata/sampledata/F_B_International_Group/C_ORDERLINE.xml | 17986 ++ referencedata/sampledata/F_B_International_Group/C_ORDERLINETAX.xml | 3468 + 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/FACT_ACCT.xml | 46061 +++++- referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENT.xml | 44 + referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENTLINE.xml | 1302 + referencedata/sampledata/F_B_International_Group/FIN_FINACC_TRANSACTION.xml | 1854 + referencedata/sampledata/F_B_International_Group/FIN_FINANCIAL_ACCOUNT.xml | 8 +- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT.xml | 2122 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_DETAIL.xml | 960 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROPOSAL.xml | 174 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROP_DETAIL.xml | 630 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULE.xml | 79652 +++++---- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULEDETAIL.xml | 1322 +- 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 | 1824 +- referencedata/sampledata/F_B_International_Group/M_INOUT.xml | 1530 + referencedata/sampledata/F_B_International_Group/M_INOUTLINE.xml | 4416 + 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_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 | 5760 + referencedata/sampledata/F_B_International_Group/M_TRANSACTION_COST.xml | 3264 + referencedata/sampledata/F_B_International_Group/OBUIAPP_PROCESS_ACCESS.xml | 420 + referencedata/sampledata/QA_Testing/AD_SEQUENCE.xml | 2 +- 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_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 + src-core/.classpath | 2 +- src-core/src/org/openbravo/base/ConfigParameters.java | 16 +- src-core/src/org/openbravo/base/HttpBaseServlet.java | 89 +- src-db/database/build.xml | 6 +- src-db/database/lib/dbsourcemanager.jar | 0 src-db/database/model/functions/A_AMORTIZATION_PROCESS.xml | 20 +- 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 | 25 +- src-db/database/model/functions/MRP_PURCHASEORDER.xml | 63 +- src-db/database/model/functions/M_INOUT_POST.xml | 14 +- src-db/database/model/functions/M_INVENTORY_LISTCREATE.xml | 4 +- 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/tables/AD_CLIENT.xml | 4 + src-db/database/model/tables/AD_COLUMN.xml | 10 + src-db/database/model/tables/AD_USER.xml | 4 + 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_PRODUCT.xml | 62 + src-db/database/model/tables/M_PRODUCT_CATEGORY_SERVICE.xml | 68 + 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_COLUMN_MOD_TRG.xml | 7 +- src-db/database/model/triggers/AD_USER_EXPIRATIONPASS_TRG.xml | 37 + src-db/database/model/triggers/C_INVOICELINE_TRG.xml | 36 +- src-db/database/model/triggers/C_INVOICETAX_TRG.xml | 31 +- src-db/database/model/triggers/C_ORDERLINE_TRG.xml | 45 +- src-db/database/model/triggers/C_ORDERTAX_TRG.xml | 31 +- src-db/database/model/triggers/M_PRODUCT_BEF_TRG.xml | 43 + src-db/database/model/triggers/M_PRODUCT_TRG.xml | 6 +- 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/M_RM_SHIPMENT_PICK_EDIT.xml | 2 +- src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 88 + src-db/database/sourcedata/AD_COLUMN.xml | 23783 ++- src-db/database/sourcedata/AD_DATASET_TABLE.xml | 84 + src-db/database/sourcedata/AD_ELEMENT.xml | 511 +- src-db/database/sourcedata/AD_FIELD.xml | 3917 +- src-db/database/sourcedata/AD_FIELDGROUP.xml | 20 + src-db/database/sourcedata/AD_MENU.xml | 13 + src-db/database/sourcedata/AD_MESSAGE.xml | 350 +- src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_REFERENCE.xml | 73 + src-db/database/sourcedata/AD_REF_LIST.xml | 60 + src-db/database/sourcedata/AD_TAB.xml | 380 +- src-db/database/sourcedata/AD_TABLE.xml | 208 + src-db/database/sourcedata/AD_TABLE_TREE.xml | 3 +- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 33 +- src-db/database/sourcedata/AD_TREENODE.xml | 13 +- src-db/database/sourcedata/AD_VAL_RULE.xml | 24 +- src-db/database/sourcedata/AD_WINDOW.xml | 60 + src-db/database/sourcedata/OBUIAPP_PARAMETER.xml | 266 + src-db/database/sourcedata/OBUIAPP_PROCESS.xml | 58 +- src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml | 27 + src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 16 + src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 21 + 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 | 24 +- 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 | 36 +- 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/preference/PreferenceTest.java | 33 +- src-test/src/org/openbravo/test/reporting/JasperReportsCompilation.java | 69 + 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 | 17 +- src-util/modulescript/build/classes/org/openbravo/modulescript/PgJdbcDatesIssue.class | 0 src-util/modulescript/src/org/openbravo/modulescript/PgJdbcDatesIssue.java | 5 + 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/model/ModelProvider.java | 23 +- src/org/openbravo/base/secureApp/LoginHandler.java | 131 +- src/org/openbravo/base/structure/BaseOBObject.java | 8 +- src/org/openbravo/common/actionhandler/OrderCreatePOLines.java | 11 +- src/org/openbravo/common/actionhandler/RFCServiceReturnableActionHandler.java | 82 + 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/actionhandler/SetNewBPCurrency.java | 5 +- src/org/openbravo/common/datasource/OrderLinePickEditTransformer.java | 145 + src/org/openbravo/costing/AverageAlgorithm.java | 14 +- src/org/openbravo/costing/AverageCostAdjustment.java | 13 +- src/org/openbravo/costing/CostAdjustmentUtils.java | 134 +- src/org/openbravo/costing/CostingMigrationProcess.java | 36 +- src/org/openbravo/costing/CostingRuleProcess.java | 338 +- src/org/openbravo/costing/CostingRuleProcessOnProcessHandler.java | 6 +- src/org/openbravo/costing/CostingUtils.java | 64 +- src/org/openbravo/costing/PriceDifferenceProcess.java | 9 +- src/org/openbravo/dal/service/OBDal.java | 11 +- src/org/openbravo/erpCommon/ad_actionButton/RMInsertOrphanLine.java | 5 + src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 83 +- src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 275 +- src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 272 +- src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 182 +- src/org/openbravo/erpCommon/ad_forms/DocInvoice.java | 10 +- 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/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_help/HelpWindow.java | 5 +- src/org/openbravo/erpCommon/ad_process/ConvertQuotationIntoOrder.java | 6 +- src/org/openbravo/erpCommon/ad_reports/ReportPricelist.fo | 4 +- src/org/openbravo/erpCommon/ad_reports/ReportRefundSalesDimensionalAnalyses.fo | 6 +- src/org/openbravo/erpCommon/businessUtility/EndYearCloseUtility.java | 62 +- src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java | 13 +- src/org/openbravo/erpCommon/businessUtility/Preferences.java | 26 +- src/org/openbravo/erpCommon/businessUtility/PriceAdjustment.java | 5 +- 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/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/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/security/Login.html | 64 +- src/org/openbravo/erpCommon/security/Login.java | 18 +- src/org/openbravo/erpCommon/security/Login.xml | 2 + src/org/openbravo/erpCommon/security/SessionActive.java | 21 +- src/org/openbravo/erpCommon/utility/reporting/printing/PrintOptions.html | 8 +- 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/ServiceOrderLineEventHandler.java | 212 + src/org/openbravo/event/ServicePriceRuleRangeEventHandler.java | 90 + src/org/openbravo/event/ServiceRelationEventHandler.java | 180 + src/org/openbravo/materialmgmt/ServicePriceUtils.java | 464 + src/org/openbravo/materialmgmt/actionhandler/ManageVariants.java | 5 +- src/org/openbravo/role/inheritance/RoleInheritanceManager.java | 71 +- src/org/openbravo/role/inheritance/access/PreferenceAccessInjector.java | 9 +- src/org/openbravo/service/importprocess/ImportEntryArchiveManager.java | 13 +- src/org/openbravo/service/importprocess/ImportEntryManager.java | 10 +- src/org/openbravo/service/importprocess/ImportEntryProcessor.java | 8 +- src/org/openbravo/service/rest/DalWebService.java | 3 +- src/org/openbravo/service/system/SystemService.java | 12 +- web/js/productServices.js | 188 + 391 files changed, 205591 insertions(+), 43028 deletions(-) diffs (truncated from 400861 to 300 lines): diff -r d386f41fa755 -r 8b659a12c6d1 .hgsigs --- a/.hgsigs Wed Apr 27 07:03:32 2016 +0000 +++ b/.hgsigs Tue May 24 12:13:22 2016 +0000 @@ -182,5 +182,14 @@ 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 +bdeb5a373f19eb7a144377621926d877ae2322f1 0 iEYEABECAAYFAlcgSPgACgkQCX/oGf+2qkMPLwCgzV//EHUa2bHmP8FA2IwnrFWB1X4AnjGHHjYKfSwiucQhltXR9POZXGaX +38ef1dc10aa3d6fb8210b85beab370f62a4545ca 0 iEYEABECAAYFAlbiTM0ACgkQCX/oGf+2qkNBDwCfXmKXkqNGsAsfiofYOBBdvjA/XgkAoIwLK3DkmHeM71JihwfVOWyB4hmj +265e8eccf704614fe88220026f2e2bafcebaaf00 0 iEYEABECAAYFAlcgZEQACgkQCX/oGf+2qkPuZgCcDPuB9d77M+51AglMvvmtpCDtnvoAnjqst7QgD6IP3Sv21+4vlqEjLVqU +98bdf9167a3d4ea9cb9b6f5e214a539220a3f3cb 0 iEYEABECAAYFAldD+MEACgkQCX/oGf+2qkPLHwCgngPaeyLsiGk2FhShX4/IzVARWN8AnRSCXIoWp6ruOcbEfIUFQiM9lY7f diff -r d386f41fa755 -r 8b659a12c6d1 .hgtags --- a/.hgtags Wed Apr 27 07:03:32 2016 +0000 +++ b/.hgtags Tue May 24 12:13:22 2016 +0000 @@ -193,5 +193,14 @@ 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 +8828e6e8e071247f329320c63da66e30c357da9f 3.0PR15Q4.6 +ee5383e071318afe8eece515b4b264cfb46c1a84 3.0PR16Q1 +d386f41fa755d23e0e23f881aece691009051ebd 3.0PR16Q1.1 +ec73935a2c83b6164a18cb70996226cb15672038 3.0PR16Q1.2 diff -r d386f41fa755 -r 8b659a12c6d1 build.xml --- a/build.xml Wed Apr 27 07:03:32 2016 +0000 +++ b/build.xml Tue May 24 12:13:22 2016 +0000 @@ -732,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 d386f41fa755 -r 8b659a12c6d1 legal/Licensing.txt --- a/legal/Licensing.txt Wed Apr 27 07:03:32 2016 +0000 +++ b/legal/Licensing.txt Tue May 24 12:13:22 2016 +0000 @@ -85,7 +85,7 @@ # avalon-framework-4.1.5.jar # axis-ant.jar # axis.jar -# barcode4j-fop-ext-0.20.5-complete.jar +# barcode4j-fop-ext-complete.jar # batik-anim.jar # batik-awt-util.jar # batik-bridge.jar @@ -111,7 +111,7 @@ # commons-lang-2.6.jar # commons-logging-1.1.1.jar # commons-pool-1.5.6.jar -# fop.jar +# fop-1.1.jar # jakarta-oro-2.0.8.jar # jettison-1.3.jar # log4j-1.2.16.jar @@ -119,6 +119,7 @@ # tika-core-0.9.jar # wstx-asl-3.0.2.jar # xercesImpl.jar +# xmlgraphics-commons-1.5.jar All files under Apache Software License 2.0, available at http://www.apache.org/licenses/LICENSE-2.0 @@ -140,9 +141,9 @@ # itext-pdfa-5.5.0.jar Both files under AGPL V3 license with LGPL Exception (included as iTextpdf_license.txt in this folder) -# jackson-core-2.1.4.jar -# jackson-databind-2.1.4.jar -# jackson-annotations-2.1.4.jar +# jackson-core-2.5.1.jar +# jackson-databind-2.5.1.jar +# jackson-annotations-2.5.1.jar All files under the Apache 2.0 license (included as Apache_license-2.0.txt in this folder) # jasperreports-6.0.0.jar diff -r d386f41fa755 -r 8b659a12c6d1 lib/runtime/barcode4j-fop-ext-0.20.5-complete.jar Binary file lib/runtime/barcode4j-fop-ext-0.20.5-complete.jar has changed diff -r d386f41fa755 -r 8b659a12c6d1 lib/runtime/barcode4j-fop-ext-complete.jar Binary file lib/runtime/barcode4j-fop-ext-complete.jar has changed diff -r d386f41fa755 -r 8b659a12c6d1 lib/runtime/fop-1.1.jar Binary file lib/runtime/fop-1.1.jar has changed diff -r d386f41fa755 -r 8b659a12c6d1 lib/runtime/fop.jar Binary file lib/runtime/fop.jar has changed diff -r d386f41fa755 -r 8b659a12c6d1 lib/runtime/jackson-annotations-2.1.4.jar Binary file lib/runtime/jackson-annotations-2.1.4.jar has changed diff -r d386f41fa755 -r 8b659a12c6d1 lib/runtime/jackson-annotations-2.5.1.jar Binary file lib/runtime/jackson-annotations-2.5.1.jar has changed diff -r d386f41fa755 -r 8b659a12c6d1 lib/runtime/jackson-core-2.1.4.jar Binary file lib/runtime/jackson-core-2.1.4.jar has changed diff -r d386f41fa755 -r 8b659a12c6d1 lib/runtime/jackson-core-2.5.1.jar Binary file lib/runtime/jackson-core-2.5.1.jar has changed diff -r d386f41fa755 -r 8b659a12c6d1 lib/runtime/jackson-databind-2.1.4.jar Binary file lib/runtime/jackson-databind-2.1.4.jar has changed diff -r d386f41fa755 -r 8b659a12c6d1 lib/runtime/jackson-databind-2.5.1.jar Binary file lib/runtime/jackson-databind-2.5.1.jar has changed diff -r d386f41fa755 -r 8b659a12c6d1 lib/runtime/xmlgraphics-commons-1.5.jar Binary file lib/runtime/xmlgraphics-commons-1.5.jar has changed diff -r d386f41fa755 -r 8b659a12c6d1 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Wed Apr 27 07:03:32 2016 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Tue May 24 12:13:22 2016 +0000 @@ -16,7 +16,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU -* All portions are Copyright (C) 2010-2015 Openbravo SLU +* All portions are Copyright (C) 2010-2016 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ @@ -1070,6 +1070,20 @@ IF (v_count <> 0) THEN RAISE_APPLICATION_ERROR(-20000, '@APRM_InvoiceWithPayments@' || ' ' || v_documentno); END IF; + + SELECT count(*) + INTO v_count + FROM DUAL + WHERE EXISTS (SELECT 1 + FROM C_InvoiceTax_CashVAT itcv + INNER JOIN C_InvoiceTax it on (it.C_InvoiceTax_ID = itcv.C_InvoiceTax_ID) + WHERE it.C_Invoice_ID = p_record_id + AND itcv.IsManualSettlement = 'Y' + ); + IF (v_count > 0) THEN + RAISE_APPLICATION_ERROR(-20000, '@APRM_InvoiceWithManualCashVATSettlement@'); + END IF; + SELECT count(*), max(p.documentno) INTO v_count, v_documentno FROM fin_payment_schedule ps, fin_payment_scheduledetail psd, fin_payment_prop_detail pd, fin_payment_proposal p @@ -1121,6 +1135,20 @@ UPDATE C_BPARTNER SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) - v_convertedAmount WHERE C_BPARTNER_ID = v_BPartner_ID; + + -- Delete C_InvoiceTax_CashVAT records for this invoice + -- this only happens for prepayments, which are bypassed by the previous check + DELETE FROM C_InvoiceTax_CashVAT itcv + WHERE EXISTS (SELECT 1 + FROM C_InvoiceTax it + WHERE it.C_InvoiceTax_ID = itcv.C_InvoiceTax_ID + AND it.C_Invoice_ID = p_record_id + ) + AND EXISTS (SELECT 1 + FROM FIN_Payment_Detail fpd + WHERE fpd.FIN_Payment_Detail_ID = itcv.FIN_Payment_Detail_ID + AND fpd.IsPrepayment = 'Y') + AND itcv.IsManualSettlement = 'N'; END; ELSIF (p_docaction = 'RC') THEN @@ -1230,6 +1258,36 @@ SET em_aprm_processinvoice = docaction WHERE c_invoice_id = p_record_id; + -- BEGIN Extension Point + SELECT count(*) INTO v_count FROM DUAL + WHERE EXISTS (SELECT 1 FROM ad_ep_procedures WHERE ad_extension_points_id = 'E845069AC5724A019D8A5343C396CAE8'); + IF (v_count=1) THEN + DECLARE + v_ep_instance VARCHAR2(32); + v_extension_point_id VARCHAR2(32) := 'E845069AC5724A019D8A5343C396CAE8'; + BEGIN + v_ep_instance := get_uuid(); + AD_EP_INSTANCE_PARA_INSERT(v_ep_instance, v_extension_point_id, 'Record_ID', p_record_id, NULL, NULL, NULL, NULL, NULL, NULL); + AD_EP_INSTANCE_PARA_INSERT(v_ep_instance, v_extension_point_id, 'DocAction', p_docaction, NULL, NULL, NULL, NULL, NULL, NULL); + AD_EP_INSTANCE_PARA_INSERT(v_ep_instance, v_extension_point_id, 'User', p_user, NULL, NULL, NULL, NULL, NULL, NULL); + AD_EP_INSTANCE_PARA_INSERT(v_ep_instance, v_extension_point_id, 'Message', NULL, NULL, NULL, NULL, NULL, NULL, p_message); + AD_EP_INSTANCE_PARA_INSERT(v_ep_instance, v_extension_point_id, 'Result', NULL, NULL, p_result, NULL, NULL, NULL, NULL); + AD_EXTENSION_POINT_HANDLER(v_ep_instance, v_extension_point_id); + SELECT p_number INTO p_result + FROM ad_ep_instance_para + WHERE ad_ep_instance_id = v_ep_instance + AND parametername LIKE 'Result'; + SELECT p_text INTO p_message + FROM ad_ep_instance_para + WHERE ad_ep_instance_id = v_ep_instance + AND parametername LIKE 'Message'; + + DELETE FROM ad_ep_instance_para + WHERE ad_ep_instance_id = v_ep_instance; + END; + END IF; + -- END Extension Point + EXCEPTION WHEN OTHERS THEN DBMS_OUTPUT.PUT_LINE('APRM_GENERATE_PAYMENT_SCHEDULE exception: '|| v_ResultStr); diff -r d386f41fa755 -r 8b659a12c6d1 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Wed Apr 27 07:03:32 2016 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Tue May 24 12:13:22 2016 +0000 @@ -34,6 +34,8 @@ <!--0000F22EA60241B4A2FF5D45C83F8F66--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> <!--0000F22EA60241B4A2FF5D45C83F8F66--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> <!--0000F22EA60241B4A2FF5D45C83F8F66--> <ENTITY_ALIAS><![CDATA[bp]]></ENTITY_ALIAS> +<!--0000F22EA60241B4A2FF5D45C83F8F66--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> +<!--0000F22EA60241B4A2FF5D45C83F8F66--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> <!--0000F22EA60241B4A2FF5D45C83F8F66--></AD_COLUMN> <!--02EF18D28F1B4C43ADF91B3E73C2BF12--><AD_COLUMN> @@ -67,6 +69,8 @@ <!--02EF18D28F1B4C43ADF91B3E73C2BF12--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> <!--02EF18D28F1B4C43ADF91B3E73C2BF12--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> <!--02EF18D28F1B4C43ADF91B3E73C2BF12--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--02EF18D28F1B4C43ADF91B3E73C2BF12--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> +<!--02EF18D28F1B4C43ADF91B3E73C2BF12--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> <!--02EF18D28F1B4C43ADF91B3E73C2BF12--></AD_COLUMN> <!--038E6E9140CB4924B22060672E2847A2--><AD_COLUMN> @@ -100,6 +104,8 @@ <!--038E6E9140CB4924B22060672E2847A2--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> <!--038E6E9140CB4924B22060672E2847A2--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> <!--038E6E9140CB4924B22060672E2847A2--> <ENTITY_ALIAS><![CDATA[bsl.id]]></ENTITY_ALIAS> +<!--038E6E9140CB4924B22060672E2847A2--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> +<!--038E6E9140CB4924B22060672E2847A2--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> <!--038E6E9140CB4924B22060672E2847A2--></AD_COLUMN> <!--046498C716474A6EAAEA0CA26E09C69D--><AD_COLUMN> @@ -135,6 +141,8 @@ <!--046498C716474A6EAAEA0CA26E09C69D--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> <!--046498C716474A6EAAEA0CA26E09C69D--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> <!--046498C716474A6EAAEA0CA26E09C69D--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--046498C716474A6EAAEA0CA26E09C69D--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> +<!--046498C716474A6EAAEA0CA26E09C69D--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> <!--046498C716474A6EAAEA0CA26E09C69D--></AD_COLUMN> <!--04DCCC7AAEDF4296941DD5ACB9164734--><AD_COLUMN> @@ -172,6 +180,8 @@ <!--04DCCC7AAEDF4296941DD5ACB9164734--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> <!--04DCCC7AAEDF4296941DD5ACB9164734--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> <!--04DCCC7AAEDF4296941DD5ACB9164734--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--04DCCC7AAEDF4296941DD5ACB9164734--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> +<!--04DCCC7AAEDF4296941DD5ACB9164734--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> <!--04DCCC7AAEDF4296941DD5ACB9164734--></AD_COLUMN> <!--07399F1520604AE6A4A48FF9F4221A10--><AD_COLUMN> @@ -205,6 +215,8 @@ <!--07399F1520604AE6A4A48FF9F4221A10--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> <!--07399F1520604AE6A4A48FF9F4221A10--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> <!--07399F1520604AE6A4A48FF9F4221A10--> <ENTITY_ALIAS><![CDATA[e.id]]></ENTITY_ALIAS> +<!--07399F1520604AE6A4A48FF9F4221A10--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> +<!--07399F1520604AE6A4A48FF9F4221A10--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> <!--07399F1520604AE6A4A48FF9F4221A10--></AD_COLUMN> <!--0790053440214B14AF3610EE2739140E--><AD_COLUMN> @@ -240,6 +252,8 @@ <!--0790053440214B14AF3610EE2739140E--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> <!--0790053440214B14AF3610EE2739140E--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> <!--0790053440214B14AF3610EE2739140E--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--0790053440214B14AF3610EE2739140E--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> +<!--0790053440214B14AF3610EE2739140E--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> <!--0790053440214B14AF3610EE2739140E--></AD_COLUMN> <!--07DD87B8F3BE41C18546260D616E1404--><AD_COLUMN> @@ -273,6 +287,8 @@ <!--07DD87B8F3BE41C18546260D616E1404--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> <!--07DD87B8F3BE41C18546260D616E1404--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> <!--07DD87B8F3BE41C18546260D616E1404--> <SQLLOGIC><![CDATA[(SELECT count(*) FROM fin_bankstatementline bl, fin_bankstatement b, fin_reconciliation r WHERE (bl.fin_finacc_transaction_id IS NULL OR (EXISTS ( SELECT 1 FROM fin_finacc_transaction t, fin_reconciliation rec WHERE t.fin_reconciliation_id = rec.fin_reconciliation_id AND bl.fin_finacc_transaction_id = t.fin_finacc_transaction_id AND t.fin_financial_account_id = b.fin_financial_account_id AND rec.created > r.created))) AND bl.datetrx <= r.dateto AND b.fin_bankstatement_id = bl.fin_bankstatement_id AND b.fin_financial_account_id = r.fin_financial_account_id and r.fin_reconciliation_id = fin_reconciliation_id)]]></SQLLOGIC> +<!--07DD87B8F3BE41C18546260D616E1404--> <ALLOWSORTING><![CDATA[N]]></ALLOWSORTING> +<!--07DD87B8F3BE41C18546260D616E1404--> <ALLOWFILTERING><![CDATA[N]]></ALLOWFILTERING> <!--07DD87B8F3BE41C18546260D616E1404--></AD_COLUMN> <!--09A1C598D8134CAC92CB30E476A213B0--><AD_COLUMN> @@ -308,6 +324,8 @@ <!--09A1C598D8134CAC92CB30E476A213B0--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> <!--09A1C598D8134CAC92CB30E476A213B0--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> <!--09A1C598D8134CAC92CB30E476A213B0--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--09A1C598D8134CAC92CB30E476A213B0--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> +<!--09A1C598D8134CAC92CB30E476A213B0--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> <!--09A1C598D8134CAC92CB30E476A213B0--></AD_COLUMN> <!--0CE41B7829C54AF3B7193B1FA52B3C62--><AD_COLUMN> @@ -343,6 +361,8 @@ <!--0CE41B7829C54AF3B7193B1FA52B3C62--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> <!--0CE41B7829C54AF3B7193B1FA52B3C62--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> <!--0CE41B7829C54AF3B7193B1FA52B3C62--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--0CE41B7829C54AF3B7193B1FA52B3C62--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> +<!--0CE41B7829C54AF3B7193B1FA52B3C62--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> <!--0CE41B7829C54AF3B7193B1FA52B3C62--></AD_COLUMN> <!--0F433074351F4A8CB69FDC3DF943C282--><AD_COLUMN> @@ -378,6 +398,8 @@ <!--0F433074351F4A8CB69FDC3DF943C282--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> <!--0F433074351F4A8CB69FDC3DF943C282--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> <!--0F433074351F4A8CB69FDC3DF943C282--> <ENTITY_ALIAS><![CDATA[@writeoff@]]></ENTITY_ALIAS> ------------------------------------------------------------------------------ Mobile security can be enabling, not merely restricting. Employees who bring their own devices (BYOD) to work are irked by the imposition of MDM restrictions. Mobile Device Manager Plus allows you to control only the apps on BYO-devices by containerizing them, leaving personal data untouched! https://ad.doubleclick.net/ddm/clk/304595813;131938128;j _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
