Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Wed, 15 Mar 2017 12:57:57 +0100
changeset 31687 475f76f2f9f6
parent 31686 b886c29976bb (current diff)
parent 31131 e44c7c4863c1 (diff)
child 31688 a62a7a94d7ee
Merge back from main
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachImplementationManager.java
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
src-db/database/lib/dbsourcemanager.jar
src-db/database/model/views/C_INVOICE_CANDIDATE_V.xml
src-db/database/sourcedata/AD_MESSAGE.xml
src-db/database/sourcedata/AD_MODULE.xml
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/CheckUpdateConnectionPoolMerge.class
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DatabaseDecimalNumberCheck.class
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DatabaseVersionCheck.class
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/JdkVersionCheck.class
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/RemoveCostingRuleProcessExecutions.class
src-util/buildvalidation/src/org/openbravo/buildvalidation/CheckUpdateConnectionPoolMerge.java
src-util/buildvalidation/src/org/openbravo/buildvalidation/DatabaseDecimalNumberCheck.java
src-util/buildvalidation/src/org/openbravo/buildvalidation/DatabaseVersionCheck.java
src-util/buildvalidation/src/org/openbravo/buildvalidation/JdkVersionCheck.java
src-util/buildvalidation/src/org/openbravo/buildvalidation/RemoveCostingRuleProcessExecutions.java
src/org/openbravo/erpCommon/ad_forms/About.html
src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending.java
src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending_data.xsql
src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder_data.xsql
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java
src/org/openbravo/erpCommon/ad_reports/ReportInvoicesEditJR.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportInvoicesJR.java
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderInvoicedJasper.java
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderInvoicedJasper.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderProvidedJR.java
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderProvidedJR.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportShipmentEdition.jrxml
src/org/openbravo/erpCommon/security/Login.html
src/org/openbravo/erpCommon/security/Login_F1.html
src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java
src/org/openbravo/materialmgmt/GenerateValuedStockAggregated_data.xsql
--- a/.hgsigs	Tue Mar 14 17:48:14 2017 +0100
+++ b/.hgsigs	Wed Mar 15 12:57:57 2017 +0100
@@ -209,3 +209,4 @@
 fa51600e25b24b2eb3739898d293168ea94748a7 0 iEYEABECAAYFAlh/u8wACgkQCX/oGf+2qkPTnwCfZ29b107GdizLBcC+tzdP3HlnmUUAoN2kMLXvfTYSRLAQG/ziGm5P6kYA
 9753e90ea3e81f850f904feb531120b4e185394a 0 iEYEABECAAYFAliG6A8ACgkQCX/oGf+2qkPeeQCg6D9p++eslvzqEVlYK8RS0uzgZNsAoMELVWkte/AM/ilPxZ4vP37myscv
 a131c85d1d3d55b852f97622ce068baf80b7fe67 0 iEYEABECAAYFAli+qu8ACgkQCX/oGf+2qkNTOACfTznbhwkwUplXd8QjHIuJ7uBJdK4An3KWtbUrBZleCwS1xH3aa2n9p9bM
+3a7510a5ee0b43ac0a65e4eae9b089f42158bbe0 0 iEYEABECAAYFAljGfFgACgkQCX/oGf+2qkOgoQCgx3u3UhiV8NyyiBZLsFjlwicCp1EAoPAl4mZZ6/wURPq39Ef6Rtbe1BRb
--- a/.hgtags	Tue Mar 14 17:48:14 2017 +0100
+++ b/.hgtags	Wed Mar 15 12:57:57 2017 +0100
@@ -220,3 +220,4 @@
 b93f495b2cde680cf6558d93d72051429f4b9031 3.0PR16Q4.1
 31c79a32ce3a6b555dadb35c70d63113be6312e7 3.0PR16Q4.2
 eaeb76d8cd4ec1caf5bf43bc9b4111424d799a03 3.0PR16Q4.3
+273c24deef8f21e870cf563073cc653582a9fe9e 3.0PR17Q1