[HGVOL] Merged from PI
authorSandra Huguet <sandra.huguet@openbravo.com>
Wed, 07 Oct 2015 09:31:15 +0200
changeset 27917 ffa9a951cbae
parent 27866 a9652ead89b4 (current diff)
parent 27916 e8cf3936f4c1 (diff)
child 27930 8fb2fdfe64f7
child 27931 7fdbc48e67f4
[HGVOL] Merged from PI
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_MODULE.xml
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -6,7 +6,7 @@
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.27632]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.27639]]></VERSION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements.
 If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -7,7 +7,7 @@
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.27632]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--B97FC854C6DD41E692161585645A900F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--B97FC854C6DD41E692161585645A900F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--B97FC854C6DD41E692161585645A900F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.27632]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
 <!--B97FC854C6DD41E692161585645A900F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java	Wed Oct 07 09:31:15 2015 +0200
@@ -359,6 +359,21 @@
           selectedCreditLines, selectedCreditPayment);
 
       for (final FIN_Payment creditPayment : selectedCreditPayment) {
+        BusinessPartner businessPartner = creditPayment.getBusinessPartner();
+        if (businessPartner == null) {
+          throw new OBException(OBMessageUtils.messageBD("APRM_CreditWithoutBPartner"));
+        }
+        String currency = null;
+        if (businessPartner.getCurrency() == null) {
+          currency = creditPayment.getCurrency().getId();
+          businessPartner.setCurrency(creditPayment.getCurrency());
+        } else {
+          currency = businessPartner.getCurrency().getId();
+        }
+        if (!creditPayment.getCurrency().getId().equals(currency)) {
+          throw new OBException(String.format(OBMessageUtils.messageBD("APRM_CreditCurrency"),
+              businessPartner.getCurrency().getISOCode()));
+        }
         BigDecimal usedCreditAmt = selectedCreditPaymentAmounts.get(creditPayment.getId());
         if (strDifferenceAction.equals("refund")) {
           if (remainingRefundAmt.compareTo(usedCreditAmt) > 0) {
--- a/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -6,7 +6,7 @@
 <!--8A098711BB324335A19833286BDB093D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--8A098711BB324335A19833286BDB093D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8A098711BB324335A19833286BDB093D-->  <NAME><![CDATA[Apache External Connection Pool]]></NAME>
-<!--8A098711BB324335A19833286BDB093D-->  <VERSION><![CDATA[1.0.27632]]></VERSION>
+<!--8A098711BB324335A19833286BDB093D-->  <VERSION><![CDATA[1.0.27639]]></VERSION>
 <!--8A098711BB324335A19833286BDB093D-->  <DESCRIPTION><![CDATA[Apache External Connection Pool]]></DESCRIPTION>
 <!--8A098711BB324335A19833286BDB093D-->  <HELP><![CDATA[This module implements the Apache JDBC Connection Pool (http://wiki.openbravo.com/wiki/Modules:Apache_JDBC_Connection_Pool).]]></HELP>
 <!--8A098711BB324335A19833286BDB093D-->  <TYPE><![CDATA[M]]></TYPE>
--- a/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -7,7 +7,7 @@
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <AD_MODULE_ID><![CDATA[8A098711BB324335A19833286BDB093D]]></AD_MODULE_ID>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--1467C397BC5F4999A5606F39CD6FF8A4-->  <STARTVERSION><![CDATA[2.1.27632]]></STARTVERSION>
+<!--1467C397BC5F4999A5606F39CD6FF8A4-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -6,7 +6,7 @@
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <NAME><![CDATA[JBoss Weld]]></NAME>
-<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.27632]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.27639]]></VERSION>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <DESCRIPTION><![CDATA[JBoss Weld]]></DESCRIPTION>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <HELP><![CDATA[Provides the JBoss Weld framework: Java Contexts and Dependency Injection for the Java EE platform (CDI). For more information see http://seamframework.org/Weld]]></HELP>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL>
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -7,7 +7,7 @@
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.27632]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -6,7 +6,7 @@
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <NAME><![CDATA[User Interface Application]]></NAME>
-<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.27632]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.27639]]></VERSION>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <DESCRIPTION><![CDATA[Provides the main application components for the openbravo user interface]]></DESCRIPTION>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <HELP><![CDATA[Provides the main application components for the openbravo user interface. The main layout incorporates a navigation bar and a main view area.]]></HELP>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -7,7 +7,7 @@
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.27632]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--60A170212F36499D83B8AD38D01F46B3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.27632]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.27632]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.27632]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.27639]]></STARTVERSION>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java	Wed Oct 07 09:31:15 2015 +0200
@@ -436,18 +436,17 @@
       int noteCount, List<String> overwrittenAuxiliaryInputs) {
     JSONObject finalObject = new JSONObject();
     try {
-      if (mode.equals("NEW") || mode.equals("CHANGE")) {
+      if ((mode.equals("NEW") || mode.equals("CHANGE")) && !hiddenInputs.isEmpty()) {
+        JSONObject jsonHiddenInputs = new JSONObject();
+        for (String key : hiddenInputs.keySet()) {
+          jsonHiddenInputs.put(key, hiddenInputs.get(key));
+        }
+        finalObject.put("hiddenInputs", jsonHiddenInputs);
+      }
+      if (mode.equals("NEW") || mode.equals("EDIT") || mode.equals("CHANGE")) {
         JSONArray arrayMessages = new JSONArray(calloutMessages);
         finalObject.put("calloutMessages", arrayMessages);
-        if (!hiddenInputs.isEmpty()) {
-          JSONObject jsonHiddenInputs = new JSONObject();
-          for (String key : hiddenInputs.keySet()) {
-            jsonHiddenInputs.put(key, hiddenInputs.get(key));
-          }
-          finalObject.put("hiddenInputs", jsonHiddenInputs);
-        }
-      }
-      if (mode.equals("NEW") || mode.equals("EDIT") || mode.equals("CHANGE")) {
+
         JSONObject jsonColumnValues = new JSONObject();
         for (Field field : getADFieldList(tab.getId())) {
           if (field.getColumn() == null) {
@@ -637,6 +636,13 @@
     }
     List<String> changedCols = new ArrayList<String>();
     for (String col : allColumns) {
+      if (mode.equals("NEW") && containsIgnoreCase(getAuxiliaryInputNamesList(tab.getId()), col)) {
+        // creating a new record, there is an auxiliary input that has the same name than the
+        // field's column, in this case auxiliary input is used to calculate the default, so there
+        // is no need of calculating it here as it will be done in computeAuxiliaryInputs
+        continue;
+      }
+
       checkNamingCollisionWithAuxiliaryInput(tab, col);
       Field field = columnsOfFields.get(col);
       try {
@@ -946,10 +952,38 @@
       } catch (JSONException e) {
         log.error("Error while computing auxiliary input " + auxIn.getName(), e);
       }
+
       columnValues.put("inp" + Sqlc.TransformaNombreColumna(auxIn.getName()), jsonObj);
       RequestContext.get().setRequestParameter(
           "inp" + Sqlc.TransformaNombreColumna(auxIn.getName()),
           value == null || value.equals("null") ? null : value.toString());
+
+      if (mode.equals("NEW") && containsIgnoreCase(allColumns, auxIn.getName())) {
+        // auxiliary input used to calculate default value for a field, let's obtain the complete
+        // value from ui definition in order to obtain also its identifier
+        try {
+          Field field = null;
+          for (Field f : getADFieldList(tab.getId())) {
+            if (f.getColumn() != null
+                && auxIn.getName().equalsIgnoreCase(f.getColumn().getDBColumnName())) {
+              field = f;
+              break;
+            }
+          }
+          if (field != null) {
+            String columnId = field.getColumn().getId();
+            UIDefinition uiDef = UIDefinitionController.getInstance().getUIDefinition(columnId);
+            JSONObject jsonDefinition = new JSONObject(uiDef.getFieldProperties(field, true));
+            if (jsonDefinition.has("identifier")) {
+              jsonObj.put("identifier", jsonDefinition.get("identifier"));
+            }
+          }
+        } catch (Exception e) {
+          log.error("Error trying to calculate identifier for auxiliary input tab " + tab
+              + " aux input " + auxIn, e);
+        }
+      }
+
       // Now we insert session values for auxiliary inputs
       if (mode.equals("NEW") || mode.equals("EDIT") || mode.equals("SETSESSION")) {
         setSessionValue(tab.getWindow().getId() + "|" + auxIn.getName(), value);
@@ -1907,6 +1941,14 @@
     return cachedStructures.getAuxiliarInputList(tabId);
   }
 
+  private List<String> getAuxiliaryInputNamesList(String tabId) {
+    List<String> result = new ArrayList<String>();
+    for (AuxiliaryInput ai : cachedStructures.getAuxiliarInputList(tabId)) {
+      result.add(ai.getName());
+    }
+    return result;
+  }
+
   private String readParameter(Map<String, Object> parameters, String parameterName) {
     String paramValue = (String) parameters.get(parameterName);
     if (paramValue != null && paramValue.equalsIgnoreCase("null")) {
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -6,7 +6,7 @@
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <NAME><![CDATA[HTML Widget]]></NAME>
-<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.27632]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.27639]]></VERSION>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <DESCRIPTION><![CDATA[Provides the HTML Widget superclass that allows to create widget classes that embed the html code.]]></DESCRIPTION>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <HELP><![CDATA[With this module you can define your own widget classes just setting up your own html code or the html code provided by third parties.]]></HELP>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <URL><![CDATA[http://forge.openbravo.com/projects/htmlwidget]]></URL>
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -7,7 +7,7 @@
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <AD_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_MODULE_ID>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.27632]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -6,7 +6,7 @@
 <!--4B828F4D03264080AA1D2057B13F613C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <NAME><![CDATA[User Interface Client Kernel]]></NAME>
-<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.27632]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.27639]]></VERSION>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <DESCRIPTION><![CDATA[Provides framework functionality for the Openbravo User Interface]]></DESCRIPTION>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <HELP><![CDATA[The user interface client kernel is a generation framework for generating client (browser) components used in Openbravo. Its components are mainly used by other modules to provide customizable and extendable user interfaces.]]></HELP>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravoclientkernel]]></URL>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -7,7 +7,7 @@
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.27632]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.27632]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.27639]]></STARTVERSION>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <AD_DEPENDENT_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_DEPENDENT_MODULE_ID>
-<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.27632]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.27639]]></STARTVERSION>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java	Wed Oct 07 09:31:15 2015 +0200
@@ -183,7 +183,21 @@
                 field.getTab().getWindow().getId(), field.getColumn().getTable().getDBTableName(),
                 docTypeTarget, docType, false, false) + ">";
       } else {
-        String defaultS = field.getColumn().getDefaultValue();
+        final String windowId = field.getTab().getWindow().getId();
+        final String colName = field.getColumn().getDBColumnName();
+
+        final String prefValue = Utility.getPreference(rq.getVariablesSecureApp(), colName,
+            windowId);
+
+        String defaultS;
+        if (StringUtils.isNotBlank(prefValue)) {
+          // if there is a preference for this field, use it instead of the one that might be
+          // defined at column level
+          defaultS = prefValue;
+        } else {
+          defaultS = field.getColumn().getDefaultValue();
+        }
+
         if (defaultS == null || defaultS.equals("\"\"")) {
           defaultS = "";
         }
@@ -191,8 +205,7 @@
           return setNOWDefault();
         } else if (!defaultS.startsWith("@SQL=")) {
           columnValue = Utility.getDefault(new DalConnectionProvider(false),
-              rq.getVariablesSecureApp(), field.getColumn().getDBColumnName(), defaultS, field
-                  .getTab().getWindow().getId(), "");
+              rq.getVariablesSecureApp(), colName, defaultS, windowId, "");
         } else {
           ArrayList<String> params = new ArrayList<String>();
           String sql = parseSQL(defaultS, params);
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -6,7 +6,7 @@
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <NAME><![CDATA[Workspace & Widgets]]></NAME>
-<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.27632]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.27639]]></VERSION>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <DESCRIPTION><![CDATA[Workspace & Widgets]]></DESCRIPTION>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <HELP><![CDATA[Provides the infrastructure of workspace tab (formerly My Openbravo)]]></HELP>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <URL><![CDATA[http://forge.openbravo.com/projects/myopenbravo]]></URL>
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -7,7 +7,7 @@
 <!--15F51F03882F444CAB6593B4566DC929-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--15F51F03882F444CAB6593B4566DC929-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--15F51F03882F444CAB6593B4566DC929-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.27632]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
 <!--15F51F03882F444CAB6593B4566DC929-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--15F51F03882F444CAB6593B4566DC929-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Application]]></DEPENDANT_MODULE_NAME>
 <!--15F51F03882F444CAB6593B4566DC929-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.27632]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -6,7 +6,7 @@
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <NAME><![CDATA[Query/List Widget]]></NAME>
-<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.27632]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.27639]]></VERSION>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <DESCRIPTION><![CDATA[Provides the Query/List superclass widget that allows to create widget classes that prints a grid of data based on a query.]]></DESCRIPTION>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <HELP><![CDATA[With this module you can define your own widget classes that just with simple Application Dictionary shows a grid of data based on a HQL Query.]]></HELP>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <URL><![CDATA[http://forge.openbravo.com/projects/querylistwidget]]></URL>
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -7,7 +7,7 @@
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--26558497C31140BFAB067BA4BC47D799-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
 <!--26558497C31140BFAB067BA4BC47D799-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.27632]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -6,7 +6,7 @@
 <!--FF8080812D842086012D844F3CC0003E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080812D842086012D844F3CC0003E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080812D842086012D844F3CC0003E-->  <NAME><![CDATA[Widgets Collection]]></NAME>
-<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.27632]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.27639]]></VERSION>
 <!--FF8080812D842086012D844F3CC0003E-->  <DESCRIPTION><![CDATA[Collection of Workspace Widgets]]></DESCRIPTION>
 <!--FF8080812D842086012D844F3CC0003E-->  <HELP><![CDATA[Collection of Workspace Widgets]]></HELP>
 <!--FF8080812D842086012D844F3CC0003E-->  <URL><![CDATA[http://forge.openbravo.com/projects/widgetscollection]]></URL>
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -7,7 +7,7 @@
 <!--FF8080812D842086012D845002070046-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080812D842086012D845002070046-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
 <!--FF8080812D842086012D845002070046-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.27632]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
 <!--FF8080812D842086012D845002070046-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080812D842086012D845002070046-->  <DEPENDANT_MODULE_NAME><![CDATA[Workspace & Widgets]]></DEPENDANT_MODULE_NAME>
 <!--FF8080812D842086012D845002070046-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -6,7 +6,7 @@
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <NAME><![CDATA[Payment Report]]></NAME>
-<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.27632]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.27639]]></VERSION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <DESCRIPTION><![CDATA[Payment Report]]></DESCRIPTION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <URL><![CDATA[http://forge.openbravo.com/projects/paymentreport]]></URL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <TYPE><![CDATA[M]]></TYPE>
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -7,7 +7,7 @@
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.27632]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -6,7 +6,7 @@
 <!--3A3A943684D64DEF9EC39F588A656848-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <NAME><![CDATA[Orders Awaiting Delivery]]></NAME>
-<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.27632]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.27639]]></VERSION>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <DESCRIPTION><![CDATA[Report displaying sales orders not shipped.]]></DESCRIPTION>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <URL><![CDATA[http://forge.openbravo.com/projects/ordersawaitingdlivery]]></URL>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <TYPE><![CDATA[M]]></TYPE>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -7,7 +7,7 @@
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <AD_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_MODULE_ID>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.27632]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -6,7 +6,7 @@
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <NAME><![CDATA[JSON Datasource]]></NAME>
-<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.27632]]></VERSION>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.27639]]></VERSION>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <DESCRIPTION><![CDATA[Provides data source CRUD functionality using JSON as the data format]]></DESCRIPTION>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <HELP><![CDATA[This module implements the datasource concept. Datasources play a central role in Smartclient applications. The datasource module automatically creates a datasource for each Openbravo entity. In addition custom data source implementations can be defined.]]></HELP>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <URL><![CDATA[http://forge.openbravo.com/projects/datasourceservice]]></URL>
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -7,7 +7,7 @@
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.27632]]></STARTVERSION>
+<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.27639]]></STARTVERSION>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <AD_DEPENDENT_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_DEPENDENT_MODULE_ID>
-<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.27632]]></STARTVERSION>
+<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.27639]]></STARTVERSION>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.27632]]></STARTVERSION>
+<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--54AF8B39C55E4E7496902893ECD82786-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.27632]]></STARTVERSION>
+<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.27632]]></STARTVERSION>
+<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.27639]]></STARTVERSION>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -6,7 +6,7 @@
 <!--FF8080813129ADA401312CA1222A0005-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813129ADA401312CA1222A0005-->  <NAME><![CDATA[Integration with Google APIs]]></NAME>
-<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.27632]]></VERSION>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.27639]]></VERSION>
 <!--FF8080813129ADA401312CA1222A0005-->  <DESCRIPTION><![CDATA[Integration with Google APIs]]></DESCRIPTION>
 <!--FF8080813129ADA401312CA1222A0005-->  <TYPE><![CDATA[M]]></TYPE>
 <!--FF8080813129ADA401312CA1222A0005-->  <LICENSE><![CDATA[Licensed under the Openbravo Public License Version 1.1.
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -7,7 +7,7 @@
 <!--FF8080813141B198013141BA0F7D0012-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141BA0F7D0012-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
 <!--FF8080813141B198013141BA0F7D0012-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.27632]]></STARTVERSION>
+<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.27639]]></STARTVERSION>
 <!--FF8080813141B198013141BA0F7D0012-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813141B198013141BA0F7D0012-->  <DEPENDANT_MODULE_NAME><![CDATA[OpenID Service Integration]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813141B198013141BA0F7D0012-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--FF8080813151AEE1013151C4ACE6001B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.27632]]></STARTVERSION>
+<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -6,7 +6,7 @@
 <!--FF8080813141B198013141B86DD70003-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080813141B198013141B86DD70003-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141B86DD70003-->  <NAME><![CDATA[OpenID Service Integration]]></NAME>
-<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.27632]]></VERSION>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.27639]]></VERSION>
 <!--FF8080813141B198013141B86DD70003-->  <DESCRIPTION><![CDATA[OpenID Service Integration]]></DESCRIPTION>
 <!--FF8080813141B198013141B86DD70003-->  <TYPE><![CDATA[M]]></TYPE>
 <!--FF8080813141B198013141B86DD70003-->  <LICENSE><![CDATA[Licensed under the Openbravo Public License Version 1.1.
--- a/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -7,7 +7,7 @@
 <!--FF8080813141B198013141B8B21B0006-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141B8B21B0006-->  <AD_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_MODULE_ID>
 <!--FF8080813141B198013141B8B21B0006-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.27632]]></STARTVERSION>
+<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
 <!--FF8080813141B198013141B8B21B0006-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813141B198013141B8B21B0006-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813141B198013141B8B21B0006-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -6,7 +6,7 @@
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <NAME><![CDATA[JSON REST Webservice]]></NAME>
-<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.27632]]></VERSION>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.27639]]></VERSION>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <DESCRIPTION><![CDATA[Provides a JSON REST webservice for CRUD service requests]]></DESCRIPTION>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <HELP><![CDATA[Provides a JSON REST webservice for CRUD service requests. Both the servlet implementation (receiving HTTP REST requests in JSON) as the backend processing are provided.]]></HELP>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravojsonrest]]></URL>
--- a/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -7,7 +7,7 @@
 <!--9E3E7B42DB16405FB794496D309D7044-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <AD_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_MODULE_ID>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.27632]]></STARTVERSION>
+<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -6,7 +6,7 @@
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <NAME><![CDATA[User Interface Selector]]></NAME>
-<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.27632]]></VERSION>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.27639]]></VERSION>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <DESCRIPTION><![CDATA[Provides a selector with a suggestion box and popup grid window]]></DESCRIPTION>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <HELP><![CDATA[The Openbravo selector provides new selector functionality which is used inside of existing Openbravo forms. The selector is mainly used for supporting foreign key references in the user interface. The selector combines both suggestion box behavior with a popup grid.]]></HELP>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <URL><![CDATA[http://forge.openbravo.com/projects/selector]]></URL>
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -7,7 +7,7 @@
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.27632]]></STARTVERSION>
+<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.27639]]></STARTVERSION>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.27632]]></STARTVERSION>
+<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Application]]></DEPENDANT_MODULE_NAME>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.27632]]></STARTVERSION>
+<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.27632]]></STARTVERSION>
+<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.27639]]></STARTVERSION>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--C8DAC574B88649D08C9468521B343F12-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--C8DAC574B88649D08C9468521B343F12-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--C8DAC574B88649D08C9468521B343F12-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.27632]]></STARTVERSION>
+<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
 <!--C8DAC574B88649D08C9468521B343F12-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--C8DAC574B88649D08C9468521B343F12-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--C8DAC574B88649D08C9468521B343F12-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -77,7 +77,7 @@
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.27632]]></STARTVERSION>
+<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -6,7 +6,7 @@
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <NAME><![CDATA[2.50 to 3.00 Compatibility Skin]]></NAME>
-<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.27632]]></VERSION>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.27639]]></VERSION>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <DESCRIPTION><![CDATA[Skin module to proper visualization of classic windows inside the MDI interface]]></DESCRIPTION>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <HELP><![CDATA[With this skin module the classic windows styles will display in a way more coherent with the new 3.00 styles]]></HELP>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <URL><![CDATA[www.openbravo.com]]></URL>
--- a/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -7,7 +7,7 @@
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <AD_MODULE_ID><![CDATA[96998CBC42744B3DBEE28AC8095C9335]]></AD_MODULE_ID>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.27632]]></STARTVERSION>
+<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -6,7 +6,7 @@
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <NAME><![CDATA[Smartclient]]></NAME>
-<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.27632]]></VERSION>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.27639]]></VERSION>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <DESCRIPTION><![CDATA[SmartClient libraries for use within Openbravo]]></DESCRIPTION>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <HELP><![CDATA[This module contains the SmartClient libraries for usage by other modules. It also contains some simple test pages to validate that SmartClient is working correctly. Also contains generic Openbravo SmartClient components]]></HELP>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <URL><![CDATA[http://forge.openbravo.com/projects/obsmartclient]]></URL>
--- a/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -7,7 +7,7 @@
 <!--086331E18477496B8AC74D2CFEBD1307-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.27632]]></STARTVERSION>
+<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--DC5D4EF450244482BD2B458DAA496333-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.27632]]></STARTVERSION>
+<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.27632]]></STARTVERSION>
+<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.27639]]></STARTVERSION>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -6,7 +6,7 @@
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <NAME><![CDATA[Log Clean Up Utility]]></NAME>
-<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION><![CDATA[1.0.27632]]></VERSION>
+<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION><![CDATA[1.0.27639]]></VERSION>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <DESCRIPTION><![CDATA[Log Clean Up Utility]]></DESCRIPTION>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <HELP><![CDATA[Utility to periodically cleanup log tables]]></HELP>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <URL><![CDATA[http://centralrepository.openbravo.com/heartbeat-server/org.openbravo.forge.ui/ForgeProjectDetail?projectId=7DC25E3B7ADE426CAD71E7804B95C1BF]]></URL>
--- a/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -7,7 +7,7 @@
 <!--86EBD30DEB8045508185B457896C9F6D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <AD_MODULE_ID><![CDATA[8A34B301DC524EA3A07513DF9F42CC90]]></AD_MODULE_ID>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--86EBD30DEB8045508185B457896C9F6D-->  <STARTVERSION><![CDATA[2.1.27632]]></STARTVERSION>
+<!--86EBD30DEB8045508185B457896C9F6D-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -6,7 +6,7 @@
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <NAME><![CDATA[Standard Roles]]></NAME>
-<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.27632]]></VERSION>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.27639]]></VERSION>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <DESCRIPTION><![CDATA[Pre-configured collection of standard ERP roles]]></DESCRIPTION>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <HELP><![CDATA[This dataset contains the following roles with their access to corresponding Openbravo entities - windows, reports, actions.
 * Employee - Any person of the enterprise
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -7,7 +7,7 @@
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <AD_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_MODULE_ID>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.27632]]></STARTVERSION>
+<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--30F966407A6F4E15965821BAEE34D25B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <AD_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_MODULE_ID>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.27632]]></STARTVERSION>
+<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--F93CE30003B24F8F8886510B0065EECC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <AD_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_MODULE_ID>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <AD_DEPENDENT_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_DEPENDENT_MODULE_ID>
-<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.27632]]></STARTVERSION>
+<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.27639]]></STARTVERSION>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <DEPENDANT_MODULE_NAME><![CDATA[Orders Awaiting Delivery]]></DEPENDANT_MODULE_NAME>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -6,7 +6,7 @@
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <NAME><![CDATA[Openbravo 3.0 Framework]]></NAME>
-<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.27632]]></VERSION>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.27639]]></VERSION>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <DESCRIPTION><![CDATA[Openbravo 3.0 Framework]]></DESCRIPTION>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <HELP><![CDATA[Contains all the components required to run the Openbravo 3.0 framework]]></HELP>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravov30framework]]></URL>
--- a/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -7,7 +7,7 @@
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.27632]]></STARTVERSION>
+<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--025B181F63CA47B48A920F6983242390-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--025B181F63CA47B48A920F6983242390-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--025B181F63CA47B48A920F6983242390-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.27632]]></STARTVERSION>
+<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
 <!--025B181F63CA47B48A920F6983242390-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--025B181F63CA47B48A920F6983242390-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--025B181F63CA47B48A920F6983242390-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.27632]]></STARTVERSION>
+<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Application]]></DEPENDANT_MODULE_NAME>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_DEPENDENT_MODULE_ID>
-<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.27632]]></STARTVERSION>
+<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.27639]]></STARTVERSION>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <DEPENDANT_MODULE_NAME><![CDATA[Query/List Widget]]></DEPENDANT_MODULE_NAME>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--224754C3EF674C93B0D468F47BAAB824-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.27632]]></STARTVERSION>
+<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -77,7 +77,7 @@
 <!--5B72D24032DD4879A950194139D961B6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--5B72D24032DD4879A950194139D961B6-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--5B72D24032DD4879A950194139D961B6-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.27632]]></STARTVERSION>
+<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
 <!--5B72D24032DD4879A950194139D961B6-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--5B72D24032DD4879A950194139D961B6-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--5B72D24032DD4879A950194139D961B6-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -91,7 +91,7 @@
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <AD_DEPENDENT_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_DEPENDENT_MODULE_ID>
-<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.27632]]></STARTVERSION>
+<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.27639]]></STARTVERSION>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <DEPENDANT_MODULE_NAME><![CDATA[HTML Widget]]></DEPENDANT_MODULE_NAME>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -105,7 +105,7 @@
 <!--98C47FF058F8413B8A2B26036061446E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--98C47FF058F8413B8A2B26036061446E-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--98C47FF058F8413B8A2B26036061446E-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.27632]]></STARTVERSION>
+<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.27639]]></STARTVERSION>
 <!--98C47FF058F8413B8A2B26036061446E-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--98C47FF058F8413B8A2B26036061446E-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--98C47FF058F8413B8A2B26036061446E-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -119,7 +119,7 @@
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <AD_DEPENDENT_MODULE_ID><![CDATA[96998CBC42744B3DBEE28AC8095C9335]]></AD_DEPENDENT_MODULE_ID>
-<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.27632]]></STARTVERSION>
+<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.27639]]></STARTVERSION>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <DEPENDANT_MODULE_NAME><![CDATA[2.50 to 3.00 Compatibility Skin]]></DEPENDANT_MODULE_NAME>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -133,7 +133,7 @@
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.27632]]></STARTVERSION>
+<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -147,7 +147,7 @@
 <!--E72A053A403C4A98A189C105B850ADB0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.27632]]></STARTVERSION>
+<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.27639]]></STARTVERSION>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -161,7 +161,7 @@
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <AD_DEPENDENT_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_DEPENDENT_MODULE_ID>
-<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.27632]]></STARTVERSION>
+<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.27639]]></STARTVERSION>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -6,7 +6,7 @@
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <NAME><![CDATA[Openbravo 3.0]]></NAME>
-<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.27632]]></VERSION>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.27639]]></VERSION>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <DESCRIPTION><![CDATA[Openbravo 3.0 distribution template]]></DESCRIPTION>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HELP><![CDATA[Openbravo 3.0 is a collection (distribution) of modules. This template is a container of all the modules and configuration changes that compose Openbravo 3.0.]]></HELP>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <URL><![CDATA[http://forge.openbravo.com/projects/vthree]]></URL>
--- a/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -7,7 +7,7 @@
 <!--48D556894CE54CF998DC97882E904CBD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--48D556894CE54CF998DC97882E904CBD-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--48D556894CE54CF998DC97882E904CBD-->  <AD_DEPENDENT_MODULE_ID><![CDATA[8A098711BB324335A19833286BDB093D]]></AD_DEPENDENT_MODULE_ID>
-<!--48D556894CE54CF998DC97882E904CBD-->  <STARTVERSION><![CDATA[1.0.27632]]></STARTVERSION>
+<!--48D556894CE54CF998DC97882E904CBD-->  <STARTVERSION><![CDATA[1.0.27639]]></STARTVERSION>
 <!--48D556894CE54CF998DC97882E904CBD-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--48D556894CE54CF998DC97882E904CBD-->  <DEPENDANT_MODULE_NAME><![CDATA[Apache External Connection Pool]]></DEPENDANT_MODULE_NAME>
 <!--48D556894CE54CF998DC97882E904CBD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--4D11E3A70650475381139522373CD191-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4D11E3A70650475381139522373CD191-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--4D11E3A70650475381139522373CD191-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.27632]]></STARTVERSION>
+<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.27639]]></STARTVERSION>
 <!--4D11E3A70650475381139522373CD191-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--4D11E3A70650475381139522373CD191-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--4D11E3A70650475381139522373CD191-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_DEPENDENT_MODULE_ID>
-<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.27632]]></STARTVERSION>
+<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <DEPENDANT_MODULE_NAME><![CDATA[Payment Report]]></DEPENDANT_MODULE_NAME>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--60834727BB114764ACEF019F40A34562-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--60834727BB114764ACEF019F40A34562-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--60834727BB114764ACEF019F40A34562-->  <AD_DEPENDENT_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_DEPENDENT_MODULE_ID>
-<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.27632]]></STARTVERSION>
+<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.27639]]></STARTVERSION>
 <!--60834727BB114764ACEF019F40A34562-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--60834727BB114764ACEF019F40A34562-->  <DEPENDANT_MODULE_NAME><![CDATA[Orders Awaiting Delivery]]></DEPENDANT_MODULE_NAME>
 <!--60834727BB114764ACEF019F40A34562-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--8418885E97D643138B6D907671351E3D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8418885E97D643138B6D907671351E3D-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--8418885E97D643138B6D907671351E3D-->  <AD_DEPENDENT_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_DEPENDENT_MODULE_ID>
-<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.27632]]></STARTVERSION>
+<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
 <!--8418885E97D643138B6D907671351E3D-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--8418885E97D643138B6D907671351E3D-->  <DEPENDANT_MODULE_NAME><![CDATA[Standard Roles]]></DEPENDANT_MODULE_NAME>
 <!--8418885E97D643138B6D907671351E3D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -77,7 +77,7 @@
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.27632]]></STARTVERSION>
+<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MINOR]]></DEPENDENCY_ENFORCEMENT>
@@ -91,7 +91,7 @@
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.27632]]></STARTVERSION>
+<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.27639]]></STARTVERSION>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -105,7 +105,7 @@
 <!--FEF6E40F244A4061B7C62CB755663712-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <AD_DEPENDENT_MODULE_ID><![CDATA[8A34B301DC524EA3A07513DF9F42CC90]]></AD_DEPENDENT_MODULE_ID>
-<!--FEF6E40F244A4061B7C62CB755663712-->  <STARTVERSION><![CDATA[1.0.27632]]></STARTVERSION>
+<!--FEF6E40F244A4061B7C62CB755663712-->  <STARTVERSION><![CDATA[1.0.27639]]></STARTVERSION>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <DEPENDANT_MODULE_NAME><![CDATA[Log Clean Up Utility]]></DEPENDANT_MODULE_NAME>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -119,7 +119,7 @@
 <!--FF8080813189932B013189B45B59003A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813189932B013189B45B59003A-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FF8080813189932B013189B45B59003A-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.27632]]></STARTVERSION>
+<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.27639]]></STARTVERSION>
 <!--FF8080813189932B013189B45B59003A-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8080813189932B013189B45B59003A-->  <DEPENDANT_MODULE_NAME><![CDATA[OpenID Service Integration]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813189932B013189B45B59003A-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -133,7 +133,7 @@
 <!--FF8080813189932B013189B4C00F003D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813189932B013189B4C00F003D-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FF8080813189932B013189B4C00F003D-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.27632]]></STARTVERSION>
+<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.27639]]></STARTVERSION>
 <!--FF8080813189932B013189B4C00F003D-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8080813189932B013189B4C00F003D-->  <DEPENDANT_MODULE_NAME><![CDATA[Integration with Google APIs]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813189932B013189B4C00F003D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -147,7 +147,7 @@
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.27632]]></STARTVERSION>
+<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.27639]]></STARTVERSION>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDANT_MODULE_NAME><![CDATA[Widgets Collection]]></DEPENDANT_MODULE_NAME>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/src-db/database/model/functions/MA_WORKEFFORT_VALIDATE.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/src-db/database/model/functions/MA_WORKEFFORT_VALIDATE.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -308,6 +308,38 @@
         FINISH_PROCESS:=TRUE;
       END IF;
     END IF;
+    IF(NOT FINISH_PROCESS) THEN
+      DECLARE
+        v_Message_ProductionRun VARCHAR(2000) :='';
+        v_Message_ProductLine VARCHAR(2000) :='';
+        BEGIN
+          FOR CUR_ProductionPlan IN
+            (SELECT pp.Line, pp.M_PRODUCTIONPLAN_ID
+            FROM M_PRODUCTION p, M_PRODUCTIONPLAN pp
+            WHERE p.M_Production_ID=pp.M_Production_ID
+            AND pp.M_Production_ID=v_Record_ID
+            ORDER BY pp.Line)
+          LOOP
+            FOR CUR_PL_Post IN
+              (SELECT pl.Line
+              FROM M_PRODUCTIONLINE pl, M_PRODUCT pr
+              WHERE Cur_ProductionPlan.M_ProductionPlan_ID=pl.M_ProductionPlan_ID
+              AND pl.M_PRODUCT_ID=pr.M_PRODUCT_ID
+              AND pr.ISACTIVE='N'
+              ORDER BY pl.Line)
+            LOOP
+              v_Message_ProductLine:=v_Message_ProductLine||CUR_PL_Post.line||', ';
+            END LOOP;
+            IF(v_Message_ProductLine != '') THEN
+              v_Message_ProductionRun:=v_Message_ProductionRun||'@ProductionRunLine@'||Cur_ProductionPlan.line||' @ProductLine@'||v_Message_ProductLine;
+              v_Message_ProductLine:='';
+            END IF;
+          END LOOP;
+          IF v_Message_ProductionRun != '' THEN
+            RAISE_APPLICATION_ERROR(-20000, v_Message_ProductionRun||'@InActiveProducts@');
+          END IF;
+        END;
+    END IF;
     -- All Production Lines
     IF(NOT FINISH_PROCESS) THEN
       FOR CUR_PL_Post IN
--- a/src-db/database/model/functions/MRP_RUN_EXPLODE.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/src-db/database/model/functions/MRP_RUN_EXPLODE.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -37,7 +37,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) 2001-2012 Openbravo SLU
+* All portions are Copyright (C) 2001-2015 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -60,6 +60,8 @@
   Cur_Dependants RECORD;
   Cur_Parents RECORD;
   v_planneddate DATE;
+  Cur_ProcessPlanVersion RECORD;
+  v_ProcessPlan_Version_ID VARCHAR(32);
 BEGIN
   BEGIN --BODY
 
@@ -109,11 +111,24 @@
 	  Mrp_Run_Insertlines(p_Client_ID, p_Org_ID, p_User_ID, p_Run_ID, Cur_Run_Lines.M_Product_ID, -1*Cur_Run_Lines.Qty, -1*Cur_Run_Lines.Qty, Cur_Run_Lines.MRP_RUN_Line_ID, (CASE Cur_Run_Lines.ispurchased WHEN 'Y' THEN 'MP' ELSE 'WP' END), 'N', NULL, NULL, NULL, NULL, Cur_Run_Lines.MA_Processplan_ID, v_planneddate, (CASE Cur_Run_Lines.ispurchased WHEN 'Y' THEN (v_planneddate) ELSE v_planneddate - (CASE Cur_Run_Lines.DELAYMIN > (CASE WHEN Cur_Run_Lines.CAPACITY IS NULL THEN 0 ELSE CEIL(Cur_Run_Lines.Qty/Cur_Run_Lines.CAPACITY) END) WHEN true THEN Cur_Run_Lines.DELAYMIN ELSE (CASE WHEN Cur_Run_Lines.CAPACITY IS NULL THEN 0 ELSE CEIL(Cur_Run_Lines.Qty/Cur_Run_Lines.CAPACITY) END) END) END), 'Y', (CASE WHEN Cur_Run_Lines.ispurchased = 'Y' THEN 'Y' ELSE 'N' END), NULL, v_Aux_ID);
         ELSE
           v_ResultStr := 'Explode dependant products';
+          FOR Cur_ProcessPlanVersion IN (
+           select ma_processplan_version_id
+             FROM ma_processplan_totalized
+           where datefrom <= Cur_Run_Lines.plannedorderdate
+             and dateto > Cur_Run_Lines.plannedorderdate
+             and produced = Cur_Run_Lines.M_Product_ID
+             order by datefrom desc
+          )
+          LOOP
+            v_ProcessPlan_Version_ID:=Cur_ProcessPlanVersion.ma_processplan_version_id;
+            EXIT;
+          END LOOP;
           FOR Cur_Dependants IN (SELECT MA_PROCESSPLAN_TOT_AUX.DEPENDANTPRODUCT, DEPQTY/PROQTY AS qty,
                                         M_PRODUCT.ISPURCHASED
                                  FROM MA_PROCESSPLAN_TOT_AUX, M_PRODUCT
                                  WHERE PRODUCED = Cur_Run_Lines.M_Product_ID
-                                   AND MA_PROCESSPLAN_TOT_AUX.DEPENDANTPRODUCT = M_PRODUCT.M_PRODUCT_ID) LOOP
+                                   AND MA_PROCESSPLAN_TOT_AUX.DEPENDANTPRODUCT = M_PRODUCT.M_PRODUCT_ID
+                                   AND MA_PROCESSPLAN_TOT_AUX.MA_PROCESSPLAN_VERSION_ID = v_ProcessPlan_Version_ID) LOOP
             MRP_RUN_INITIALIZE(p_User_ID, p_Org_ID, p_Client_ID, p_Run_ID, p_Planner_ID, Cur_Dependants.DependantProduct,
                        NULL, NULL, NULL, NULL, p_TimeHorizon,
                        p_PlanningDate, 'Y');
--- a/src-db/database/model/functions/M_INOUT_POST.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/src-db/database/model/functions/M_INOUT_POST.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -231,6 +231,24 @@
              RAISE_APPLICATION_ERROR(-20000, '@Inline@ '||v_Message_Qty||' '||'@ProductNotNullAndMovementQtyZero@') ;
           END IF;
 	     End ;
+      DECLARE
+      v_Message_Inactive_Products VARCHAR(2000) :='';
+      BEGIN
+        FOR Cur_Lines IN (
+          SELECT IOL.line
+          FROM M_InOutLine IOL, M_PRODUCT P
+          WHERE IOL.M_INOUT_ID=v_Record_ID
+          AND P.M_PRODUCT_ID = IOL.M_PRODUCT_ID
+          AND IOL.M_PRODUCT_ID IS NOT NULL AND P.ISACTIVE='N'
+          ORDER BY IOL.line
+          )
+        LOOP
+          v_Message_Inactive_Products:=v_Message_Inactive_Products||Cur_Lines.line||', ';
+        END LOOP;
+        IF v_Message_Inactive_Products != '' THEN
+          RAISE_APPLICATION_ERROR(-20000, '@Inline@ '||v_Message_Inactive_Products||' '||'@InActiveProducts@') ;
+        END IF;
+      END;
       SELECT CASE WHEN COALESCE(instr(M_INOUT.Description,'*R*:'),0) = 0 THEN 'N' ELSE 'Y' END
             INTO v_IsReversedDoc
             FROM M_INOUT
--- a/src-db/database/model/functions/M_PRODUCTION_RUN.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/src-db/database/model/functions/M_PRODUCTION_RUN.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -546,6 +546,37 @@
       v_Message:= '@ConsumedProductWithPostiveQty@' || ' @ReferProductionPlanLines@' || ': ' || v_Message;
       RAISE_APPLICATION_ERROR(-20000, v_Message);
     END IF;
+
+    DECLARE
+        v_Message_ProductionRun VARCHAR(2000) :='';
+        v_Message_ProductLine VARCHAR(2000) :='';
+        BEGIN
+          FOR CUR_ProductionPlan IN
+            (SELECT pp.Line, pp.M_PRODUCTIONPLAN_ID
+            FROM M_PRODUCTION p, M_PRODUCTIONPLAN pp
+            WHERE p.M_Production_ID=pp.M_Production_ID
+            AND pp.M_Production_ID=v_Record_ID
+            ORDER BY pp.Line)
+          LOOP
+            FOR CUR_PL_Post IN
+              (SELECT pl.Line
+              FROM M_PRODUCTIONLINE pl, M_PRODUCT pr
+              WHERE Cur_ProductionPlan.M_ProductionPlan_ID=pl.M_ProductionPlan_ID
+              AND pl.M_PRODUCT_ID=pr.M_PRODUCT_ID
+              AND pr.ISACTIVE='N'
+              ORDER BY pl.Line)
+            LOOP
+              v_Message_ProductLine:=v_Message_ProductLine||CUR_PL_Post.line||', ';
+            END LOOP;
+            IF(v_Message_ProductLine != '') THEN
+              v_Message_ProductionRun:=v_Message_ProductionRun||'@ProductionRunLine@'||Cur_ProductionPlan.line||' @ProductLine@'||v_Message_ProductLine;
+              v_Message_ProductLine:='';
+            END IF;
+          END LOOP;
+          IF v_Message_ProductionRun != '' THEN
+            RAISE_APPLICATION_ERROR(-20000, v_Message_ProductionRun||'@InActiveProducts@');
+          END IF;
+        END;
     
     SELECT count(*) INTO v_count
     FROM dual
--- a/src-db/database/model/triggers/M_INOUTLINE_TRG.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/src-db/database/model/triggers/M_INOUTLINE_TRG.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -34,7 +34,7 @@
  * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
  * created by ComPiere are Copyright (C) ComPiere, Inc.;   All Rights Reserved.
  * Contributor(s): Openbravo SLU
- * Contributions are Copyright (C) 2001-2013 Openbravo S.L.U.
+ * Contributions are Copyright (C) 2001-2015 Openbravo S.L.U.
  ******************************************************************************/
      
 BEGIN
@@ -191,7 +191,7 @@
  END IF;
  
  -- UPDATING inventory
- IF (UPDATING OR DELETING) THEN
+ IF (DELETING) THEN
     IF (:old.M_PRODUCT_ID IS NOT NULL AND :OLD.M_LOCATOR_ID IS NOT NULL) THEN
    SELECT COUNT(*) INTO V_STOCKED
   FROM M_PRODUCT
@@ -204,7 +204,7 @@
    END IF;
     END IF;
   END IF;
- IF (INSERTING OR UPDATING) THEN
+ IF (INSERTING) THEN
    IF (:NEW.M_PRODUCT_ID IS NOT NULL AND :NEW.M_LOCATOR_ID IS NOT NULL) THEN
    SELECT COUNT(*) INTO V_STOCKED
   FROM M_PRODUCT
@@ -217,6 +217,45 @@
    END IF;
     END IF;
   END IF;
+  IF (UPDATING) THEN
+    IF (:OLD.AD_CLIENT_ID <> :NEW.AD_CLIENT_ID
+      OR :OLD.AD_ORG_ID <> :NEW.AD_ORG_ID
+      OR :OLD.UPDATEDBY <> :NEW.UPDATEDBY
+      OR COALESCE(:OLD.M_Product_ID,'0') <> COALESCE(:NEW.M_Product_ID,'0')
+      OR COALESCE(:OLD.M_LOCATOR_ID, '0') <> COALESCE(:NEW.M_LOCATOR_ID, '0')
+      OR COALESCE(:OLD.M_AttributeSetInstance_ID,'0') <> COALESCE(:NEW.M_AttributeSetInstance_ID,'0')
+      OR :OLD.C_UOM_ID <> :NEW.C_UOM_ID
+      OR COALESCE(:OLD.M_Product_UOM_ID,'0') <> COALESCE(:NEW.M_Product_UOM_ID,'0')
+      OR :OLD.MOVEMENTQTY <> :NEW.MOVEMENTQTY
+      OR COALESCE(:OLD.QUANTITYORDER, 0) <> COALESCE(:NEW.QUANTITYORDER, 0)) THEN
+      
+      IF (:OLD.M_PRODUCT_ID IS NOT NULL AND :OLD.M_LOCATOR_ID IS NOT NULL) THEN
+        SELECT COUNT(*) INTO V_STOCKED
+          FROM M_PRODUCT
+          WHERE M_Product_ID=:OLD.M_PRODUCT_ID
+          AND IsStocked = 'Y' AND ProductType = 'I';
+        IF V_STOCKED > 0 THEN
+          M_UPDATE_INVENTORY(:OLD.AD_CLIENT_ID, :OLD.AD_ORG_ID, :OLD.UPDATEDBY, :OLD.M_PRODUCT_ID, :OLD.M_LOCATOR_ID,
+          :OLD.M_ATTRIBUTESETINSTANCE_ID, :OLD.C_UOM_ID,
+          :OLD.M_PRODUCT_UOM_ID, NULL, NULL, NULL, v_qtyold, v_qtyorderold);
+        END IF;
+      END IF;
+
+      IF (:NEW.M_PRODUCT_ID IS NOT NULL AND :NEW.M_LOCATOR_ID IS NOT NULL) THEN
+        SELECT COUNT(*) INTO V_STOCKED
+          FROM M_PRODUCT
+          WHERE M_Product_ID=:NEW.M_PRODUCT_ID
+          AND IsStocked = 'Y' AND ProductType = 'I';
+        IF V_STOCKED > 0 THEN
+          M_UPDATE_INVENTORY(:NEW.AD_CLIENT_ID, :NEW.AD_ORG_ID, :NEW.UPDATEDBY, :NEW.M_PRODUCT_ID, :NEW.M_LOCATOR_ID,
+          :NEW.M_ATTRIBUTESETINSTANCE_ID, :NEW.C_UOM_ID,
+          :NEW.M_PRODUCT_UOM_ID, NULL, NULL, NULL, v_qty, v_qtyorder);
+        END IF;
+      END IF;
+  
+    END IF;
+  END IF;
+
   IF (INSERTING OR UPDATING) THEN
    --Does not allow to change the attribute set value
    -- for products which attribute set value type is Fixed
--- a/src-db/database/model/views/MA_PROCESSPLAN_TOTALIZED.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/src-db/database/model/views/MA_PROCESSPLAN_TOTALIZED.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
   <database name="VIEW MA_PROCESSPLAN_TOTALIZED">
-    <view name="MA_PROCESSPLAN_TOTALIZED"><![CDATA[SELECT ma_processplan_version.ma_processplan_id, ma_processplan_version.ma_processplan_version_id, m_product.m_product_id AS produced, sp1.qty AS proqty, sp2.m_product_id AS dependantproduct, sp2.qty AS depqty FROM m_product, ma_processplan, ma_processplan_version, (SELECT ma_sequence.ma_processplan_version_id, ma_sequenceproduct.m_product_id, sum(CASE ma_sequenceproduct.productiontype WHEN '+' THEN ma_sequenceproduct.quantity * ma_sequence.multiplier WHEN '-' THEN ma_sequenceproduct.quantity * ma_sequence.multiplier * (-1) ELSE NULL END) AS qty FROM ma_sequence, ma_sequenceproduct WHERE ma_sequence.ma_sequence_id = ma_sequenceproduct.ma_sequence_id AND ma_sequence.isactive = 'Y' AND ma_sequenceproduct.isactive = 'Y' GROUP BY ma_sequence.ma_processplan_version_id, ma_sequenceproduct.m_product_id) sp1, (SELECT ma_sequence.ma_processplan_version_id, ma_sequenceproduct.m_product_id, sum(CASE ma_sequenceproduct.productiontype WHEN '+' THEN ma_sequenceproduct.quantity * ma_sequence.multiplier WHEN '-' THEN ma_sequenceproduct.quantity * ma_sequence.multiplier * (-1) ELSE NULL END) AS qty FROM ma_sequence, ma_sequenceproduct WHERE ma_sequence.ma_sequence_id = ma_sequenceproduct.ma_sequence_id AND ma_sequence.isactive = 'Y' AND ma_sequenceproduct.isactive = 'Y' GROUP BY ma_sequence.ma_processplan_version_id, ma_sequenceproduct.m_product_id) sp2 WHERE ma_processplan.ma_processplan_id = ma_processplan_version.ma_processplan_id AND m_product.ma_processplan_id = ma_processplan_version.ma_processplan_id AND ma_processplan.isactive = 'Y' AND ma_processplan_version.isactive = 'Y' AND ma_processplan_version.datefrom <= now() AND ma_processplan_version.dateto > now() AND ma_processplan_version.ma_processplan_version_id = sp1.ma_processplan_version_id AND ma_processplan_version.ma_processplan_version_id = sp2.ma_processplan_version_id AND sp1.m_product_id = m_product.m_product_id AND sp2.m_product_id <> m_product.m_product_id AND sp1.qty > 0 AND sp2.qty <> 0]]></view>
+    <view name="MA_PROCESSPLAN_TOTALIZED"><![CDATA[SELECT ma_processplan_version.ma_processplan_id, ma_processplan_version.ma_processplan_version_id, m_product.m_product_id AS produced, sp1.qty AS proqty, sp2.m_product_id AS dependantproduct, sp2.qty AS depqty, ma_processplan_version.datefrom, ma_processplan_version.dateto FROM m_product, ma_processplan, ma_processplan_version, (SELECT ma_sequence.ma_processplan_version_id, ma_sequenceproduct.m_product_id, sum(CASE ma_sequenceproduct.productiontype WHEN '+' THEN ma_sequenceproduct.quantity * ma_sequence.multiplier WHEN '-' THEN ma_sequenceproduct.quantity * ma_sequence.multiplier * (-1) ELSE NULL END) AS qty FROM ma_sequence, ma_sequenceproduct WHERE ma_sequence.ma_sequence_id = ma_sequenceproduct.ma_sequence_id AND ma_sequence.isactive = 'Y' AND ma_sequenceproduct.isactive = 'Y' GROUP BY ma_sequence.ma_processplan_version_id, ma_sequenceproduct.m_product_id) sp1, (SELECT ma_sequence.ma_processplan_version_id, ma_sequenceproduct.m_product_id, sum(CASE ma_sequenceproduct.productiontype WHEN '+' THEN ma_sequenceproduct.quantity * ma_sequence.multiplier WHEN '-' THEN ma_sequenceproduct.quantity * ma_sequence.multiplier * (-1) ELSE NULL END) AS qty FROM ma_sequence, ma_sequenceproduct WHERE ma_sequence.ma_sequence_id = ma_sequenceproduct.ma_sequence_id AND ma_sequence.isactive = 'Y' AND ma_sequenceproduct.isactive = 'Y' GROUP BY ma_sequence.ma_processplan_version_id, ma_sequenceproduct.m_product_id) sp2 WHERE ma_processplan.ma_processplan_id = ma_processplan_version.ma_processplan_id AND m_product.ma_processplan_id = ma_processplan_version.ma_processplan_id AND ma_processplan.isactive = 'Y' AND ma_processplan_version.isactive = 'Y' AND ma_processplan_version.ma_processplan_version_id = sp1.ma_processplan_version_id AND ma_processplan_version.ma_processplan_version_id = sp2.ma_processplan_version_id AND sp1.m_product_id = m_product.m_product_id AND sp2.m_product_id <> m_product.m_product_id AND sp1.qty > 0 AND sp2.qty <> 0]]></view>
   </database>
--- a/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -782,7 +782,7 @@
 <!--09BF7886BE7846C3B870F354B8301159-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--09BF7886BE7846C3B870F354B8301159-->  <AD_TAB_ID><![CDATA[186]]></AD_TAB_ID>
 <!--09BF7886BE7846C3B870F354B8301159-->  <NAME><![CDATA[DOCBASETYPE]]></NAME>
-<!--09BF7886BE7846C3B870F354B8301159-->  <CODE><![CDATA[@SQL=select max(docbasetype) from c_doctype where c_doctype_id = @c_doctypetarget_id@]]></CODE>
+<!--09BF7886BE7846C3B870F354B8301159-->  <CODE><![CDATA[@SQL=select coalesce(max(docbasetype), 'SOO') from c_doctype where c_doctype_id = @c_doctypetarget_id@]]></CODE>
 <!--09BF7886BE7846C3B870F354B8301159-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--09BF7886BE7846C3B870F354B8301159--></AD_AUXILIARINPUT>
 
@@ -1052,7 +1052,7 @@
 <!--17F5DEA4A5254BDDA77560A7D67667B6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--17F5DEA4A5254BDDA77560A7D67667B6-->  <AD_TAB_ID><![CDATA[294]]></AD_TAB_ID>
 <!--17F5DEA4A5254BDDA77560A7D67667B6-->  <NAME><![CDATA[DOCBASETYPE]]></NAME>
-<!--17F5DEA4A5254BDDA77560A7D67667B6-->  <CODE><![CDATA[@SQL=select max(docbasetype) from c_doctype where c_doctype_id = @c_doctypetarget_id@]]></CODE>
+<!--17F5DEA4A5254BDDA77560A7D67667B6-->  <CODE><![CDATA[@SQL=select coalesce(max(docbasetype), 'POO') from c_doctype where c_doctype_id = @c_doctypetarget_id@]]></CODE>
 <!--17F5DEA4A5254BDDA77560A7D67667B6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--17F5DEA4A5254BDDA77560A7D67667B6--></AD_AUXILIARINPUT>
 
@@ -1287,7 +1287,7 @@
 <!--29AB487A0544464C8498B3A9D2201BE3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--29AB487A0544464C8498B3A9D2201BE3-->  <AD_TAB_ID><![CDATA[4CA5324BD037430B8E682B41C1DAA8CC]]></AD_TAB_ID>
 <!--29AB487A0544464C8498B3A9D2201BE3-->  <NAME><![CDATA[DOCBASETYPE]]></NAME>
-<!--29AB487A0544464C8498B3A9D2201BE3-->  <CODE><![CDATA[@SQL=select max(dt.docbasetype) from c_orderline_acctdimension olacct 
+<!--29AB487A0544464C8498B3A9D2201BE3-->  <CODE><![CDATA[@SQL=select coalesce(max(dt.docbasetype), 'POO') from c_orderline_acctdimension olacct 
                            join c_orderline ol on (olacct.c_orderline_id=ol.c_orderline_id)
                            join c_order ord on (ol.c_order_id=ord.c_order_id)
                            join c_doctype dt on (ord.c_doctypetarget_id = dt.c_doctype_id)
@@ -1403,7 +1403,7 @@
 <!--2F68ED80A1824966845A6CED4A2B5B45-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2F68ED80A1824966845A6CED4A2B5B45-->  <AD_TAB_ID><![CDATA[187]]></AD_TAB_ID>
 <!--2F68ED80A1824966845A6CED4A2B5B45-->  <NAME><![CDATA[DOCBASETYPE]]></NAME>
-<!--2F68ED80A1824966845A6CED4A2B5B45-->  <CODE><![CDATA[@SQL=select max(dt.docbasetype) from c_order ord join c_doctype dt on (ord.c_doctypetarget_id = dt.c_doctype_id)
+<!--2F68ED80A1824966845A6CED4A2B5B45-->  <CODE><![CDATA[@SQL=select coalesce(max(dt.docbasetype), 'SOO') from c_order ord join c_doctype dt on (ord.c_doctypetarget_id = dt.c_doctype_id)
 where ord.c_order_id = @c_order_id@]]></CODE>
 <!--2F68ED80A1824966845A6CED4A2B5B45-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2F68ED80A1824966845A6CED4A2B5B45--></AD_AUXILIARINPUT>
@@ -1557,7 +1557,7 @@
 <!--3752F4D586254CA0BAA6CE2AA8E6137F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3752F4D586254CA0BAA6CE2AA8E6137F-->  <AD_TAB_ID><![CDATA[83F933AC3F5B427F9A04C9DB0257F26E]]></AD_TAB_ID>
 <!--3752F4D586254CA0BAA6CE2AA8E6137F-->  <NAME><![CDATA[DOCBASETYPE]]></NAME>
-<!--3752F4D586254CA0BAA6CE2AA8E6137F-->  <CODE><![CDATA[@SQL=select max(dt.docbasetype) from c_orderline_acctdimension olacct 
+<!--3752F4D586254CA0BAA6CE2AA8E6137F-->  <CODE><![CDATA[@SQL=select coalesce(max(dt.docbasetype), 'SOO') from c_orderline_acctdimension olacct 
                            join c_orderline ol on (olacct.c_orderline_id=ol.c_orderline_id)
                            join c_order ord on (ol.c_order_id=ord.c_order_id)
                            join c_doctype dt on (ord.c_doctypetarget_id = dt.c_doctype_id)
@@ -1605,7 +1605,7 @@
 <!--396DA37927A34D009819599FB5F5F8B0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--396DA37927A34D009819599FB5F5F8B0-->  <AD_TAB_ID><![CDATA[22B201B931E540EDA0B6630B50E3B8D3]]></AD_TAB_ID>
 <!--396DA37927A34D009819599FB5F5F8B0-->  <NAME><![CDATA[DOCBASETYPE]]></NAME>
-<!--396DA37927A34D009819599FB5F5F8B0-->  <CODE><![CDATA[@SQL=select max(dt.docbasetype) from c_invoiceline_acctdimension ilacct 
+<!--396DA37927A34D009819599FB5F5F8B0-->  <CODE><![CDATA[@SQL=select coalesce(max(dt.docbasetype), 'ARI') from c_invoiceline_acctdimension ilacct 
                            join c_invoiceline il on (ilacct.c_invoiceline_id=il.c_invoiceline_id)
                            join c_invoice inv on (il.c_invoice_id=inv.c_invoice_id)
                            join c_doctype dt on (inv.c_doctypetarget_id = dt.c_doctype_id)
@@ -2381,7 +2381,7 @@
 <!--68CD2AFDCEAB45ADB0690B33067B7940-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--68CD2AFDCEAB45ADB0690B33067B7940-->  <AD_TAB_ID><![CDATA[290]]></AD_TAB_ID>
 <!--68CD2AFDCEAB45ADB0690B33067B7940-->  <NAME><![CDATA[DOCBASETYPE]]></NAME>
-<!--68CD2AFDCEAB45ADB0690B33067B7940-->  <CODE><![CDATA[@SQL=select max(docbasetype) from c_doctype where c_doctype_id = @c_doctypetarget_id@]]></CODE>
+<!--68CD2AFDCEAB45ADB0690B33067B7940-->  <CODE><![CDATA[@SQL=select coalesce(max(docbasetype), 'API') from c_doctype where c_doctype_id = @c_doctypetarget_id@]]></CODE>
 <!--68CD2AFDCEAB45ADB0690B33067B7940-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--68CD2AFDCEAB45ADB0690B33067B7940--></AD_AUXILIARINPUT>
 
@@ -2546,7 +2546,7 @@
 <!--7A6DD0A1AF304BE288BBFBE305EA1227-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7A6DD0A1AF304BE288BBFBE305EA1227-->  <AD_TAB_ID><![CDATA[263]]></AD_TAB_ID>
 <!--7A6DD0A1AF304BE288BBFBE305EA1227-->  <NAME><![CDATA[DOCBASETYPE]]></NAME>
-<!--7A6DD0A1AF304BE288BBFBE305EA1227-->  <CODE><![CDATA[@SQL=select max(docbasetype) from c_doctype where c_doctype_id = @c_doctypetarget_id@]]></CODE>
+<!--7A6DD0A1AF304BE288BBFBE305EA1227-->  <CODE><![CDATA[@SQL=select coalesce(max(docbasetype), 'ARI') from c_doctype where c_doctype_id = @c_doctypetarget_id@]]></CODE>
 <!--7A6DD0A1AF304BE288BBFBE305EA1227-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7A6DD0A1AF304BE288BBFBE305EA1227--></AD_AUXILIARINPUT>
 
@@ -2734,7 +2734,7 @@
 <!--861880FCEE6846A1B6BF4E129EDAF3DD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--861880FCEE6846A1B6BF4E129EDAF3DD-->  <AD_TAB_ID><![CDATA[291]]></AD_TAB_ID>
 <!--861880FCEE6846A1B6BF4E129EDAF3DD-->  <NAME><![CDATA[DOCBASETYPE]]></NAME>
-<!--861880FCEE6846A1B6BF4E129EDAF3DD-->  <CODE><![CDATA[@SQL=select max(dt.docbasetype) from c_invoice inv join c_doctype dt on (inv.c_doctypetarget_id = dt.c_doctype_id)
+<!--861880FCEE6846A1B6BF4E129EDAF3DD-->  <CODE><![CDATA[@SQL=select coalesce(max(dt.docbasetype), 'API') from c_invoice inv join c_doctype dt on (inv.c_doctypetarget_id = dt.c_doctype_id)
 where inv.c_invoice_id = @c_invoice_id@]]></CODE>
 <!--861880FCEE6846A1B6BF4E129EDAF3DD-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--861880FCEE6846A1B6BF4E129EDAF3DD--></AD_AUXILIARINPUT>
@@ -3043,7 +3043,7 @@
 <!--9E0F5BB107EE463B8E4F18395952D8F2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9E0F5BB107EE463B8E4F18395952D8F2-->  <AD_TAB_ID><![CDATA[293]]></AD_TAB_ID>
 <!--9E0F5BB107EE463B8E4F18395952D8F2-->  <NAME><![CDATA[DOCBASETYPE]]></NAME>
-<!--9E0F5BB107EE463B8E4F18395952D8F2-->  <CODE><![CDATA[@SQL=select max(dt.docbasetype) from c_order ord join c_doctype dt on (ord.c_doctypetarget_id = dt.c_doctype_id)
+<!--9E0F5BB107EE463B8E4F18395952D8F2-->  <CODE><![CDATA[@SQL=select coalesce(max(dt.docbasetype), 'POO') from c_order ord join c_doctype dt on (ord.c_doctypetarget_id = dt.c_doctype_id)
 where ord.c_order_id = @c_order_id@]]></CODE>
 <!--9E0F5BB107EE463B8E4F18395952D8F2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--9E0F5BB107EE463B8E4F18395952D8F2--></AD_AUXILIARINPUT>
@@ -3411,7 +3411,7 @@
 <!--B727417F9385474AB816BA585B1DAD74-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--B727417F9385474AB816BA585B1DAD74-->  <AD_TAB_ID><![CDATA[270]]></AD_TAB_ID>
 <!--B727417F9385474AB816BA585B1DAD74-->  <NAME><![CDATA[DOCBASETYPE]]></NAME>
-<!--B727417F9385474AB816BA585B1DAD74-->  <CODE><![CDATA[@SQL=select max(dt.docbasetype) from c_invoice inv join c_doctype dt on (inv.c_doctypetarget_id = dt.c_doctype_id)
+<!--B727417F9385474AB816BA585B1DAD74-->  <CODE><![CDATA[@SQL=select coalesce(max(dt.docbasetype), 'ARI') from c_invoice inv join c_doctype dt on (inv.c_doctypetarget_id = dt.c_doctype_id)
 where inv.c_invoice_id = @c_invoice_id@]]></CODE>
 <!--B727417F9385474AB816BA585B1DAD74-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--B727417F9385474AB816BA585B1DAD74--></AD_AUXILIARINPUT>
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -40713,7 +40713,6 @@
 <!--2760-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--2760-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--2760-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--2760-->  <AD_CALLOUT_ID><![CDATA[EC19112DD95B4BEABFF032BBD9F10821]]></AD_CALLOUT_ID>
 <!--2760-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--2760-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2760-->  <POSITION><![CDATA[2]]></POSITION>
--- a/src-db/database/sourcedata/AD_MESSAGE.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -16391,6 +16391,18 @@
 <!--11314163807C4401B2964F93256597EA-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--11314163807C4401B2964F93256597EA--></AD_MESSAGE>
 
+<!--113D2212643A4188A76F4E95C3FEB98A--><AD_MESSAGE>
+<!--113D2212643A4188A76F4E95C3FEB98A-->  <AD_MESSAGE_ID><![CDATA[113D2212643A4188A76F4E95C3FEB98A]]></AD_MESSAGE_ID>
+<!--113D2212643A4188A76F4E95C3FEB98A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--113D2212643A4188A76F4E95C3FEB98A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--113D2212643A4188A76F4E95C3FEB98A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--113D2212643A4188A76F4E95C3FEB98A-->  <VALUE><![CDATA[InActiveProducts]]></VALUE>
+<!--113D2212643A4188A76F4E95C3FEB98A-->  <MSGTEXT><![CDATA[Product used in transaction is inactive. ]]></MSGTEXT>
+<!--113D2212643A4188A76F4E95C3FEB98A-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--113D2212643A4188A76F4E95C3FEB98A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--113D2212643A4188A76F4E95C3FEB98A-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--113D2212643A4188A76F4E95C3FEB98A--></AD_MESSAGE>
+
 <!--11509F0E2D6E4D4A96518FECB69A5B8F--><AD_MESSAGE>
 <!--11509F0E2D6E4D4A96518FECB69A5B8F-->  <AD_MESSAGE_ID><![CDATA[11509F0E2D6E4D4A96518FECB69A5B8F]]></AD_MESSAGE_ID>
 <!--11509F0E2D6E4D4A96518FECB69A5B8F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -17327,6 +17339,18 @@
 <!--2280EA8FD12C41D49D861A4681AB4A17-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--2280EA8FD12C41D49D861A4681AB4A17--></AD_MESSAGE>
 
+<!--22B1A5A415954591ADDA0FA81E684E87--><AD_MESSAGE>
+<!--22B1A5A415954591ADDA0FA81E684E87-->  <AD_MESSAGE_ID><![CDATA[22B1A5A415954591ADDA0FA81E684E87]]></AD_MESSAGE_ID>
+<!--22B1A5A415954591ADDA0FA81E684E87-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--22B1A5A415954591ADDA0FA81E684E87-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--22B1A5A415954591ADDA0FA81E684E87-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--22B1A5A415954591ADDA0FA81E684E87-->  <VALUE><![CDATA[ProductionRunLine]]></VALUE>
+<!--22B1A5A415954591ADDA0FA81E684E87-->  <MSGTEXT><![CDATA[Production Run Line No. ]]></MSGTEXT>
+<!--22B1A5A415954591ADDA0FA81E684E87-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--22B1A5A415954591ADDA0FA81E684E87-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--22B1A5A415954591ADDA0FA81E684E87-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--22B1A5A415954591ADDA0FA81E684E87--></AD_MESSAGE>
+
 <!--22BAFF96A26542FF91EC98794CE1FD86--><AD_MESSAGE>
 <!--22BAFF96A26542FF91EC98794CE1FD86-->  <AD_MESSAGE_ID><![CDATA[22BAFF96A26542FF91EC98794CE1FD86]]></AD_MESSAGE_ID>
 <!--22BAFF96A26542FF91EC98794CE1FD86-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21567,6 +21591,18 @@
 <!--8750F1DB1207450E8947C482FF43E029-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--8750F1DB1207450E8947C482FF43E029--></AD_MESSAGE>
 
+<!--87F4030110BF457ABC427FEA68750143--><AD_MESSAGE>
+<!--87F4030110BF457ABC427FEA68750143-->  <AD_MESSAGE_ID><![CDATA[87F4030110BF457ABC427FEA68750143]]></AD_MESSAGE_ID>
+<!--87F4030110BF457ABC427FEA68750143-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--87F4030110BF457ABC427FEA68750143-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--87F4030110BF457ABC427FEA68750143-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--87F4030110BF457ABC427FEA68750143-->  <VALUE><![CDATA[ProductLine]]></VALUE>
+<!--87F4030110BF457ABC427FEA68750143-->  <MSGTEXT><![CDATA[Product Line No. ]]></MSGTEXT>
+<!--87F4030110BF457ABC427FEA68750143-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--87F4030110BF457ABC427FEA68750143-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--87F4030110BF457ABC427FEA68750143-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--87F4030110BF457ABC427FEA68750143--></AD_MESSAGE>
+
 <!--88A1D0A0F67F49339B2639EA4E5F6B4B--><AD_MESSAGE>
 <!--88A1D0A0F67F49339B2639EA4E5F6B4B-->  <AD_MESSAGE_ID><![CDATA[88A1D0A0F67F49339B2639EA4E5F6B4B]]></AD_MESSAGE_ID>
 <!--88A1D0A0F67F49339B2639EA4E5F6B4B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 30 09:45:50 2015 +0200
+++ b/src-db/database/sourcedata/AD_MODULE.xml	Wed Oct 07 09:31:15 2015 +0200
@@ -6,7 +6,7 @@
 <!--0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0-->  <NAME><![CDATA[Core]]></NAME>
-<!--0-->  <VERSION><![CDATA[3.0.27632]]></VERSION>
+<!--0-->  <VERSION><![CDATA[3.0.27639]]></VERSION>
 <!--0-->  <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
 <!--0-->  <HELP><![CDATA[Core module is the base one, all developments in core are included as part of the standard Openbravo ERP.]]></HELP>
 <!--0-->  <URL><![CDATA[www.openbravo.com]]></URL>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-test/src/org/openbravo/test/db/model/triggers/M_inoutlinetrgTest.java	Wed Oct 07 09:31:15 2015 +0200
@@ -0,0 +1,647 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2015 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+ */
+
+package org.openbravo.test.db.model.triggers;
+
+import static org.junit.Assert.assertTrue;
+
+import java.math.BigDecimal;
+import java.sql.SQLException;
+import java.util.Date;
+import java.util.List;
+
+import org.hibernate.Query;
+import org.junit.Test;
+import org.openbravo.base.exception.OBException;
+import org.openbravo.base.provider.OBProvider;
+import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.model.ad.utility.Sequence;
+import org.openbravo.model.common.businesspartner.BusinessPartner;
+import org.openbravo.model.common.businesspartner.Location;
+import org.openbravo.model.common.enterprise.DocumentType;
+import org.openbravo.model.common.enterprise.Locator;
+import org.openbravo.model.common.enterprise.Warehouse;
+import org.openbravo.model.common.plm.AttributeSetInstance;
+import org.openbravo.model.common.plm.Product;
+import org.openbravo.model.common.plm.ProductUOM;
+import org.openbravo.model.common.uom.UOM;
+import org.openbravo.model.materialmgmt.onhandquantity.StorageDetail;
+import org.openbravo.model.materialmgmt.transaction.ShipmentInOut;
+import org.openbravo.model.materialmgmt.transaction.ShipmentInOutLine;
+import org.openbravo.test.base.OBBaseTest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class M_inoutlinetrgTest extends OBBaseTest {
+
+  private static Logger log = LoggerFactory.getLogger(M_inoutlinetrgTest.class);
+  // User Openbravo
+  private static String USER_ID = "100";
+
+  // Role QA Testing Admin
+  private static String ROLE_ID = "4028E6C72959682B01295A071429011E";
+
+  // QA Testing Client
+  private static final String ClientId = "4028E6C72959682B01295A070852010D";
+
+  // Spain Organization
+  private static final String OrganizationId = "357947E87C284935AD1D783CF6F099A1";
+
+  // Movement Quantity: 10
+  private static BigDecimal MovementQty = BigDecimal.TEN;
+
+  private BigDecimal afterValue = BigDecimal.ZERO;
+  private BigDecimal beforeValue = BigDecimal.ZERO;
+
+  private StorageDetail storageDetail;
+  private ShipmentInOut inOut;
+  private ShipmentInOutLine inOutLine;
+  private Product product;
+  private Locator locator;
+  private AttributeSetInstance attributeSetInstance;
+
+  private void salesSetup() {
+    // Product: Soccer Ball
+    final String ProductId = "EBCD272DC37B4ABBB12B96139E5837BF";
+    // Locator: spain111
+    final String LocatorId = "4028E6C72959682B01295ECFEF6502A3";
+    // Orange
+    final String attributeSetInstanceId = "E2F81DE34D404177BB13E2B4198B83AB";
+
+    product = OBDal.getInstance().get(Product.class, ProductId);
+    locator = OBDal.getInstance().get(Locator.class, LocatorId);
+    attributeSetInstance = OBDal.getInstance().get(AttributeSetInstance.class,
+        attributeSetInstanceId);
+  }
+
+  private void purchaseSetup() {
+    // Product: T-Shirts
+    final String ProductId = "0CF7C882B8BD4D249F3BCC8727A736D1";
+    // Locator: M01
+    final String LocatorId = "96DEDCC179504711A81497DE68900F49";
+    //
+    final String attributeSetInstanceId = "0";
+
+    product = OBDal.getInstance().get(Product.class, ProductId);
+    locator = OBDal.getInstance().get(Locator.class, LocatorId);
+    attributeSetInstance = OBDal.getInstance().get(AttributeSetInstance.class,
+        attributeSetInstanceId);
+  }
+
+  @Test
+  public void testM_InOutLineTrg_Sales1() throws SQLException {
+    salesSetup();
+    batchOfTests(true, 1);
+  }
+
+  @Test
+  public void testM_InOutLineTrg_Sales2() throws SQLException {
+    salesSetup();
+    batchOfTests(true, 2);
+  }
+
+  @Test
+  public void testM_InOutLineTrg_Sales4() throws SQLException {
+    salesSetup();
+    batchOfTests(true, 4);
+  }
+
+  @Test
+  public void testM_InOutLineTrg_Purchase1() throws SQLException {
+    purchaseSetup();
+    batchOfTests(false, 1);
+  }
+
+  @Test
+  public void testM_InOutLineTrg_Purchase2() throws SQLException {
+    purchaseSetup();
+    batchOfTests(false, 2);
+  }
+
+  @Test
+  public void testM_InOutLineTrg_Purchase4() throws SQLException {
+    purchaseSetup();
+    batchOfTests(false, 4);
+  }
+
+  private void batchOfTests(boolean isSales, int numberOfLines) throws SQLException {
+    log.info("START TEST for Sales = " + isSales + ". Number of lines: " + numberOfLines);
+
+    test_CreateLineWith10Products(isSales, numberOfLines);
+    test_SetProductAsNull();
+    test_SetAProductAgain();
+    test_UpdateDescription();
+    test_UpdateMovementQuantity();
+    test_UpdateMovementNegativeQuantity();
+    test_UpdateMovementQuantity();
+    test_UpdateMovementQuantityToSameQuantity();
+    // Return bin
+    test_UpdateLocator(OBDal.getInstance().get(Locator.class, "67C3E9C2ADF74AC7A48C0F94CE571AB9"));
+    test_UpdateLocator(locator);
+    if (isSales) {
+      // blue
+      test_UpdateAttribute(OBDal.getInstance().get(AttributeSetInstance.class,
+          "1B78D7E95FBC47788B4962B11E80002B"));
+      test_UpdateAttribute(attributeSetInstance);
+    }
+    test_DeleteLine();
+
+    OBDal.getInstance().remove(inOut);
+
+    log.info("END TEST for Sales = " + isSales + ". Number of lines: " + numberOfLines);
+  }
+
+  // Create a new shipment line with a Product (10 units)
+  private void test_CreateLineWith10Products(boolean isSales, int numberOfLines)
+      throws SQLException {
+    inOut = insertMInOut(isSales);
+    assertTrue("M_Inout header not inserted successfully ", inOut != null);
+
+    storageDetail = getStorageDetail(product, product.getUOM(), locator, null, attributeSetInstance);
+    if (storageDetail != null) {
+      OBDal.getInstance().refresh(storageDetail);
+      beforeValue = storageDetail.getQuantityInDraftTransactions();
+    } else {
+      beforeValue = BigDecimal.ZERO;
+    }
+
+    log.info("*************** Create a new shipment line with a Product (10 units) *****************");
+    log.info("Qty in Draft transaction before insertion: " + beforeValue);
+
+    for (int i = 0; i < numberOfLines; i++) {
+      inOutLine = insertMInOutLine(inOut);
+      assertTrue(inOutLine != null);
+    }
+
+    storageDetail = getStorageDetail(product, inOutLine.getUOM(), inOutLine.getStorageBin(),
+        inOutLine.getOrderUOM(), attributeSetInstance);
+    OBDal.getInstance().refresh(storageDetail);
+
+    afterValue = storageDetail.getQuantityInDraftTransactions();
+    log.info("Qty in Draft transaction after insertion " + afterValue);
+
+    assertTrue("Quantities should not be equal because a new line with a product has been saved",
+        afterValue.compareTo(beforeValue) != 0);
+  }
+
+  // Set Product null
+  private void test_SetProductAsNull() throws SQLException {
+    OBDal.getInstance().refresh(storageDetail);
+    beforeValue = storageDetail.getQuantityInDraftTransactions();
+
+    log.info("*************** Set Product null *****************");
+    log.info("Qty in Draft transaction before setting product as null in m_inoutline "
+        + beforeValue);
+
+    updateMInOutLine(ShipmentInOutLine.PROPERTY_PRODUCT, null);
+    assertTrue(inOutLine.getProduct() == null);
+
+    storageDetail = getStorageDetail(product, inOutLine.getUOM(), inOutLine.getStorageBin(),
+        inOutLine.getOrderUOM(), attributeSetInstance);
+    if (storageDetail != null) {
+      OBDal.getInstance().refresh(storageDetail);
+      afterValue = storageDetail.getQuantityInDraftTransactions();
+    } else {
+      afterValue = BigDecimal.ZERO;
+    }
+
+    log.info("Qty in Draft transaction after setting product as null in m_inoutline " + afterValue);
+
+    assertTrue("Quantities should not be equal because product has been removed",
+        afterValue.compareTo(beforeValue) != 0);
+  }
+
+  // Set blank product in InOutLine with Product: Distribution good A
+  private void test_SetAProductAgain() throws SQLException {
+    if (storageDetail != null) {
+      OBDal.getInstance().refresh(storageDetail);
+      beforeValue = storageDetail.getQuantityInDraftTransactions();
+    } else {
+      beforeValue = BigDecimal.ZERO;
+    }
+
+    log.info("*************** Set Product not null *****************");
+    log.info("Qty in Draft transaction before setting null product with value in m_inoutline "
+        + beforeValue);
+
+    updateMInOutLine(ShipmentInOutLine.PROPERTY_PRODUCT, product);
+
+    storageDetail = getStorageDetail(product, inOutLine.getUOM(), inOutLine.getStorageBin(),
+        inOutLine.getOrderUOM(), attributeSetInstance);
+    OBDal.getInstance().refresh(storageDetail);
+
+    afterValue = storageDetail.getQuantityInDraftTransactions();
+
+    log.info("Qty in Draft transaction after setting null product with value in m_inoutline "
+        + afterValue);
+
+    assertTrue("Quantities should not be equal because a product has been set again",
+        afterValue.compareTo(beforeValue) != 0);
+
+  }
+
+  // Update description
+  private void test_UpdateDescription() throws SQLException {
+    OBDal.getInstance().getConnection().commit();
+    OBDal.getInstance().refresh(storageDetail);
+    beforeValue = storageDetail.getQuantityInDraftTransactions();
+    final Date previousDate = storageDetail.getUpdated();
+
+    log.info("*************** Update description *****************");
+    updateMInOutLine(ShipmentInOutLine.PROPERTY_DESCRIPTION, "description updated for this line");
+
+    storageDetail = getStorageDetail(product, inOutLine.getUOM(), inOutLine.getStorageBin(),
+        inOutLine.getOrderUOM(), attributeSetInstance);
+    OBDal.getInstance().refresh(storageDetail);
+
+    afterValue = storageDetail.getQuantityInDraftTransactions();
+    final Date newDate = storageDetail.getUpdated();
+
+    log.info("Qty in Draft transaction before updating description in m_inoutline " + beforeValue);
+    log.info("Qty in Draft transaction after updating description in m_inoutline " + afterValue);
+
+    assertTrue("Quantities should be equal because we have only updated the description",
+        afterValue.compareTo(beforeValue) == 0);
+
+    log.info("Previous modification in Storage detail: " + previousDate);
+    log.info("Las modification in Storage detail: " + newDate);
+
+    // FIXME This assert usually is not able to detect a problem because the m_update_inventory set
+    // the updated column with UPDATED=to_date(now()), which seems to set always the same date
+    // because to_date() is declared as IMMUTABLE. To properly test it, it should be UPDATED=now().
+    // However the assert is kept as it doesn't create false positives
+    assertTrue(
+        "Storage detail is not updated because only description has been updated. Previous: "
+            + previousDate + ". newDate: " + newDate, previousDate.compareTo(newDate) == 0);
+  }
+
+  // Update product quantity (positive qty)
+  private void test_UpdateMovementQuantity() throws SQLException {
+    OBDal.getInstance().refresh(storageDetail);
+    beforeValue = storageDetail.getQuantityInDraftTransactions();
+    log.info("*************** Update Product quantity (1 Unit) *****************");
+
+    updateMInOutLine(ShipmentInOutLine.PROPERTY_MOVEMENTQUANTITY, BigDecimal.ONE);
+
+    storageDetail = getStorageDetail(product, inOutLine.getUOM(), inOutLine.getStorageBin(),
+        inOutLine.getOrderUOM(), attributeSetInstance);
+    OBDal.getInstance().refresh(storageDetail);
+
+    afterValue = storageDetail.getQuantityInDraftTransactions();
+
+    log.info("Qty in Draft transaction before updating quantity " + beforeValue);
+    log.info("Qty in Draft transaction after updating quantity " + afterValue);
+
+    assertTrue("Quantities should not be equal because quantity has been updated",
+        afterValue.compareTo(beforeValue) != 0);
+  }
+
+  // Update product quantity to the same quantity
+  private void test_UpdateMovementQuantityToSameQuantity() throws SQLException {
+    OBDal.getInstance().refresh(storageDetail);
+    OBDal.getInstance().refresh(inOutLine);
+    beforeValue = storageDetail.getQuantityInDraftTransactions();
+    log.info("*************** Update Product quantity to the same quantity (no change) *****************");
+
+    updateMInOutLine(ShipmentInOutLine.PROPERTY_MOVEMENTQUANTITY, inOutLine.getMovementQuantity());
+
+    storageDetail = getStorageDetail(product, inOutLine.getUOM(), inOutLine.getStorageBin(),
+        inOutLine.getOrderUOM(), attributeSetInstance);
+    OBDal.getInstance().refresh(storageDetail);
+
+    afterValue = storageDetail.getQuantityInDraftTransactions();
+
+    log.info("Qty in Draft transaction before updating quantity " + beforeValue);
+    log.info("Qty in Draft transaction after updating quantity " + afterValue);
+
+    assertTrue("Quantities should be equal because quantity has not been actually updated",
+        afterValue.compareTo(beforeValue) == 0);
+  }
+
+  // Update product quantity (negative qty)
+  private void test_UpdateMovementNegativeQuantity() throws SQLException {
+    OBDal.getInstance().refresh(storageDetail);
+    beforeValue = storageDetail.getQuantityInDraftTransactions();
+    log.info("*************** Update Product negative quantity (-2 Unit) *****************");
+
+    updateMInOutLine(ShipmentInOutLine.PROPERTY_MOVEMENTQUANTITY, new BigDecimal("-2"));
+
+    storageDetail = getStorageDetail(product, inOutLine.getUOM(), inOutLine.getStorageBin(),
+        inOutLine.getOrderUOM(), attributeSetInstance);
+    OBDal.getInstance().refresh(storageDetail);
+
+    afterValue = storageDetail.getQuantityInDraftTransactions();
+
+    log.info("Qty in Draft transaction before updating quantity " + beforeValue);
+    log.info("Qty in Draft transaction after updating quantity " + afterValue);
+
+    assertTrue("Quantities should not be equal because quantity has been updated",
+        afterValue.compareTo(beforeValue) != 0);
+  }
+
+  // Update attribute
+  private void test_UpdateAttribute(AttributeSetInstance newAttributeSetInstance)
+      throws SQLException {
+    final AttributeSetInstance previousAttributeSetInstance = inOutLine.getAttributeSetValue();
+    storageDetail = getStorageDetail(product, inOutLine.getUOM(), inOutLine.getStorageBin(),
+        inOutLine.getOrderUOM(), previousAttributeSetInstance);
+    if (storageDetail != null) {
+      OBDal.getInstance().refresh(storageDetail);
+      beforeValue = storageDetail.getQuantityInDraftTransactions();
+    } else {
+      beforeValue = BigDecimal.ZERO;
+    }
+
+    log.info("*************** Update attribute *****************");
+
+    BigDecimal beforeValueNewAttribute;
+    try {
+      storageDetail = getStorageDetail(product, inOutLine.getUOM(), inOutLine.getStorageBin(),
+          inOutLine.getOrderUOM(), newAttributeSetInstance);
+      OBDal.getInstance().refresh(storageDetail);
+      beforeValueNewAttribute = storageDetail.getQuantityInDraftTransactions();
+    } catch (Exception notfound) {
+      beforeValueNewAttribute = BigDecimal.ZERO;
+    }
+
+    updateMInOutLine(ShipmentInOutLine.PROPERTY_ATTRIBUTESETVALUE, newAttributeSetInstance);
+
+    storageDetail = getStorageDetail(product, inOutLine.getUOM(), inOutLine.getStorageBin(),
+        inOutLine.getOrderUOM(), previousAttributeSetInstance);
+    if (storageDetail != null) {
+      OBDal.getInstance().refresh(storageDetail);
+      afterValue = storageDetail.getQuantityInDraftTransactions();
+    } else {
+      afterValue = BigDecimal.ZERO;
+    }
+
+    log.info("Qty in Draft transaction for old attributesetinstance before updating attributesetinstance "
+        + beforeValue);
+    log.info("Qty in Draft transaction for old attributesetinstance after updating attributesetinstance "
+        + afterValue);
+
+    assertTrue(
+        "Quantities should not be equal for old attributesetinstance because we have updated the attributesetinstance",
+        afterValue.compareTo(beforeValue) != 0);
+
+    storageDetail = getStorageDetail(product, inOutLine.getUOM(), inOutLine.getStorageBin(),
+        inOutLine.getOrderUOM(), newAttributeSetInstance);
+    BigDecimal afterValueNewAttribute = BigDecimal.ZERO;
+    if (storageDetail != null) {
+      OBDal.getInstance().refresh(storageDetail);
+      afterValueNewAttribute = storageDetail.getQuantityInDraftTransactions();
+    }
+
+    log.info("Qty in Draft transaction for new attributesetinstance before updating attributesetinstance "
+        + beforeValueNewAttribute);
+    log.info("Qty in Draft transaction for new attributesetinstance after updating attributesetinstance "
+        + afterValueNewAttribute);
+
+    assertTrue(
+        "Quantities should not be equal for new attributesetinstance because we have updated the attributesetinstance",
+        afterValueNewAttribute.compareTo(beforeValueNewAttribute) != 0);
+  }
+
+  // Update locator
+  private void test_UpdateLocator(Locator newLocator) throws SQLException {
+    final Locator previousLocator = inOutLine.getStorageBin();
+    storageDetail = getStorageDetail(product, inOutLine.getUOM(), previousLocator,
+        inOutLine.getOrderUOM(), inOutLine.getAttributeSetValue());
+    if (storageDetail != null) {
+      OBDal.getInstance().refresh(storageDetail);
+      beforeValue = storageDetail.getQuantityInDraftTransactions();
+    } else {
+      beforeValue = BigDecimal.ZERO;
+    }
+
+    log.info("*************** Update locator *****************");
+
+    BigDecimal beforeValueNewLocator;
+    try {
+      storageDetail = getStorageDetail(product, inOutLine.getUOM(), newLocator,
+          inOutLine.getOrderUOM(), inOutLine.getAttributeSetValue());
+      OBDal.getInstance().refresh(storageDetail);
+      beforeValueNewLocator = storageDetail.getQuantityInDraftTransactions();
+    } catch (Exception notfound) {
+      beforeValueNewLocator = BigDecimal.ZERO;
+    }
+
+    updateMInOutLine(ShipmentInOutLine.PROPERTY_STORAGEBIN, newLocator);
+
+    storageDetail = getStorageDetail(product, inOutLine.getUOM(), previousLocator,
+        inOutLine.getOrderUOM(), inOutLine.getAttributeSetValue());
+    if (storageDetail != null) {
+      OBDal.getInstance().refresh(storageDetail);
+      afterValue = storageDetail.getQuantityInDraftTransactions();
+    } else {
+      afterValue = BigDecimal.ZERO;
+    }
+
+    log.info("Qty in Draft transaction for old locator before updating locator " + beforeValue);
+    log.info("Qty in Draft transaction for old locator after updating locator " + afterValue);
+
+    assertTrue(
+        "Quantities should not be equal for old locator because we have updated the locator",
+        afterValue.compareTo(beforeValue) != 0);
+
+    storageDetail = getStorageDetail(product, inOutLine.getUOM(), newLocator,
+        inOutLine.getOrderUOM(), inOutLine.getAttributeSetValue());
+    BigDecimal afterValueNewLocator = BigDecimal.ZERO;
+    if (storageDetail != null) {
+      OBDal.getInstance().refresh(storageDetail);
+      afterValueNewLocator = storageDetail.getQuantityInDraftTransactions();
+    }
+
+    log.info("Qty in Draft transaction for new locator before updating locator "
+        + beforeValueNewLocator);
+    log.info("Qty in Draft transaction for new locator after updating locator "
+        + afterValueNewLocator);
+
+    assertTrue(
+        "Quantities should not be equal for new locator because we have updated the locator",
+        afterValueNewLocator.compareTo(beforeValueNewLocator) != 0);
+
+  }
+
+  // Delete a M_InoutLine
+  private void test_DeleteLine() throws SQLException {
+    OBDal.getInstance().refresh(storageDetail);
+    beforeValue = storageDetail.getQuantityInDraftTransactions();
+
+    log.info("*************** Delete line *****************");
+    log.info("Qty in Draft transaction before deletion: " + beforeValue);
+
+    deleteMInOutLines();
+    assertTrue(inOut.getMaterialMgmtShipmentInOutLineList().isEmpty());
+
+    storageDetail = getStorageDetail(product, product.getUOM(), locator, null, attributeSetInstance);
+    if (storageDetail != null) {
+      OBDal.getInstance().refresh(storageDetail);
+      afterValue = storageDetail.getQuantityInDraftTransactions();
+    } else {
+      afterValue = BigDecimal.ZERO;
+    }
+
+    log.info("Qty in Draft transaction after deletion: " + afterValue);
+
+    assertTrue("Quantities should not be equal because line has been deleted",
+        afterValue.compareTo(beforeValue) != 0);
+  }
+
+  private ShipmentInOut insertMInOut(boolean isSales) throws SQLException {
+    final String shipment_DocumentTypeId;
+    final String shipment_DocSequenceId = "FF8080812C2ABFC6012C2B3BDF4A004D";
+    final String customerId;
+    final String customerAddressId;
+    // Warehouse: Spain Warehouse
+    final String WarehouseId = "4D7B97565A024DB7B4C61650FA2B9560";
+    if (isSales) {
+      // MM Shipment Document Type, Document Sequence
+      shipment_DocumentTypeId = "FF8080812C2ABFC6012C2B3BDF4A004E";
+
+      // Business Partner: Customer A
+      customerId = "4028E6C72959682B01295F40C3CB02EC";
+      customerAddressId = "4028E6C72959682B01295F40C43802EE";
+    } else {
+      // MM Shipment Document Type
+      shipment_DocumentTypeId = "FF8080812C2ABFC6012C2B3BDF530078";
+
+      // Business Partner: Creditor
+      customerId = "4028E6C72959682B01295F40CA140307";
+      customerAddressId = "4028E6C72959682B01295F40CA620309";
+    }
+
+    try {
+      OBContext.setAdminMode(true);
+      // Set QA context
+      OBContext.setOBContext(USER_ID, ROLE_ID, ClientId, OrganizationId);
+      ShipmentInOut shipmentInOut = OBProvider.getInstance().get(ShipmentInOut.class);
+      BusinessPartner bpartner = OBDal.getInstance().get(BusinessPartner.class, customerId);
+      Location bpLocation = OBDal.getInstance().get(Location.class, customerAddressId);
+      DocumentType doctype = OBDal.getInstance().get(DocumentType.class, shipment_DocumentTypeId);
+      Warehouse warehouse = OBDal.getInstance().get(Warehouse.class, WarehouseId);
+      shipmentInOut.setBusinessPartner(bpartner);
+      shipmentInOut.setDocumentType(doctype);
+      shipmentInOut.setPartnerAddress(bpLocation);
+      shipmentInOut.setDocumentNo(getDocumentNo(shipment_DocSequenceId));
+      shipmentInOut.setMovementDate(new Date());
+      shipmentInOut.setAccountingDate(new Date());
+      shipmentInOut.setWarehouse(warehouse);
+      shipmentInOut.setSalesTransaction(isSales);
+
+      OBDal.getInstance().save(shipmentInOut);
+      OBDal.getInstance().getConnection().commit();
+      OBDal.getInstance().refresh(shipmentInOut);
+
+      return shipmentInOut;
+    } finally {
+      OBContext.restorePreviousMode();
+    }
+
+  }
+
+  private ShipmentInOutLine insertMInOutLine(ShipmentInOut shipmentInOut) throws SQLException {
+    try {
+      OBContext.setAdminMode(true);
+      // Set QA context
+      OBContext.setOBContext(USER_ID, ROLE_ID, ClientId, OrganizationId);
+      ShipmentInOutLine shipmentInOutLine = OBProvider.getInstance().get(ShipmentInOutLine.class);
+      shipmentInOutLine.setShipmentReceipt(shipmentInOut);
+      shipmentInOutLine.setLineNo(10L);
+      shipmentInOutLine.setProduct(product);
+      shipmentInOutLine.setMovementQuantity(MovementQty);
+      shipmentInOutLine.setStorageBin(locator);
+      shipmentInOutLine.setUOM(product.getUOM());
+      shipmentInOutLine.setAttributeSetValue(attributeSetInstance);
+      OBDal.getInstance().save(shipmentInOutLine);
+      OBDal.getInstance().getConnection().commit();
+      OBDal.getInstance().refresh(shipmentInOutLine);
+
+      return shipmentInOutLine;
+
+    } finally {
+      OBContext.restorePreviousMode();
+    }
+  }
+
+  private void updateMInOutLine(String propertyName, Object value) throws SQLException {
+    inOutLine.set(propertyName, value);
+    OBDal.getInstance().save(inOutLine);
+    OBDal.getInstance().getConnection().commit();
+    OBDal.getInstance().refresh(inOutLine);
+
+  }
+
+  private void deleteMInOutLines() throws SQLException {
+    final StringBuffer hqlString = new StringBuffer();
+    hqlString
+        .append(" delete from MaterialMgmtShipmentInOutLine where shipmentReceipt.id = :mInOutId ");
+    Query deleteQry = OBDal.getInstance().getSession().createQuery(hqlString.toString());
+    deleteQry.setString("mInOutId", inOut.getId());
+    deleteQry.executeUpdate();
+    OBDal.getInstance().getConnection().commit();
+    OBDal.getInstance().refresh(inOut);
+  }
+
+  // Calculates the next document number for this sequence
+  private String getDocumentNo(String sequenceId) {
+    try {
+      Sequence sequence = OBDal.getInstance().get(Sequence.class, sequenceId);
+      String prefix = sequence.getPrefix() == null ? "" : sequence.getPrefix();
+      String suffix = sequence.getSuffix() == null ? "" : sequence.getSuffix();
+      String documentNo = prefix + sequence.getNextAssignedNumber().toString() + suffix;
+      sequence.setNextAssignedNumber(sequence.getNextAssignedNumber() + sequence.getIncrementBy());
+      return documentNo;
+    } catch (Exception e) {
+      throw new OBException(e);
+    }
+  }
+
+  private StorageDetail getStorageDetail(Product _product, UOM uom, Locator _locator,
+      ProductUOM productUom, AttributeSetInstance _attributeInstance) {
+    final StringBuffer hqlString = new StringBuffer();
+    hqlString.append(" select sd from  MaterialMgmtStorageDetail sd ");
+    hqlString.append(" where sd.product.id = :productId ");
+    hqlString.append(" and sd.storageBin.id = :locatorId ");
+    hqlString.append(" and sd.uOM.id = :uomId ");
+    hqlString.append(" and sd.attributeSetValue.id = :attributeSetInstanceId ");
+    if (productUom != null) {
+      hqlString.append(" and sd.orderUOM.id = :productUOMId ");
+    } else {
+      hqlString.append(" and sd.orderUOM.id is null ");
+    }
+
+    Query query = OBDal.getInstance().getSession().createQuery(hqlString.toString());
+    query.setParameter("productId", _product.getId());
+    query.setParameter("locatorId", _locator.getId());
+    query.setParameter("uomId", uom.getId());
+    query.setParameter("attributeSetInstanceId", _attributeInstance.getId());
+    if (productUom != null) {
+      query.setParameter("productUOMId", productUom.getId());
+    }
+    query.setMaxResults(1);
+
+    List<?> queryList = query.list();
+    if (!queryList.isEmpty()) {
+      return (StorageDetail) queryList.get(0);
+    }
+    return null;
+  }
+}
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_ProductPrice_PriceListVersion.java	Wed Sep 30 09:45:50 2015 +0200
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_ProductPrice_PriceListVersion.java	Wed Oct 07 09:31:15 2015 +0200
@@ -36,6 +36,12 @@
 import org.openbravo.model.pricing.pricelist.PriceListVersion;
 import org.openbravo.xmlEngine.XmlDocument;
 
+/* Replaced by {@link org.openbravo.event.ProductPriceObserver.ProductPriceObserver},
+ * which always overrides the organization by the price list version one. Note that the
+ * UI has a validation to display only Price List Versions belonging to organizations
+ * with access for the role
+ */
+@Deprecated
 public class SL_ProductPrice_PriceListVersion extends HttpSecureAppServlet {
   private static final long serialVersionUID = 1L;
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/event/ProductPriceObserver.java	Wed Oct 07 09:31:15 2015 +0200
@@ -0,0 +1,86 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html 
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License. 
+ * The Original Code is Openbravo ERP. 
+ * The Initial Developer of the Original Code is Openbravo SLU 
+ * All portions are Copyright (C) 2015 Openbravo SLU 
+ * All Rights Reserved. 
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+ */
+
+package org.openbravo.event;
+
+import javax.enterprise.event.Observes;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.openbravo.base.model.Entity;
+import org.openbravo.base.model.ModelProvider;
+import org.openbravo.base.model.Property;
+import org.openbravo.client.kernel.event.EntityNewEvent;
+import org.openbravo.client.kernel.event.EntityPersistenceEvent;
+import org.openbravo.client.kernel.event.EntityPersistenceEventObserver;
+import org.openbravo.client.kernel.event.EntityUpdateEvent;
+import org.openbravo.model.common.enterprise.Organization;
+import org.openbravo.model.pricing.pricelist.PriceListVersion;
+import org.openbravo.model.pricing.pricelist.ProductPrice;
+
+public class ProductPriceObserver extends EntityPersistenceEventObserver {
+
+  private static Entity[] entities = { ModelProvider.getInstance().getEntity(
+      ProductPrice.ENTITY_NAME) };
+  protected Logger logger = Logger.getLogger(this.getClass());
+
+  @Override
+  protected Entity[] getObservedEntities() {
+    return entities;
+  }
+
+  public void onSave(@Observes EntityNewEvent event) {
+    if (!isValidEvent(event)) {
+      return;
+    }
+
+    overrideProductPriceOrganization(event);
+  }
+
+  public void onUpdate(@Observes EntityUpdateEvent event) {
+    if (!isValidEvent(event)) {
+      return;
+    }
+
+    overrideProductPriceOrganization(event);
+  }
+
+  /**
+   * Sets the Product Price Organization equal to the Price List organization
+   */
+  private void overrideProductPriceOrganization(EntityPersistenceEvent event) {
+    if (event instanceof EntityNewEvent || event instanceof EntityUpdateEvent) {
+      final Entity productPriceEntity = ModelProvider.getInstance().getEntity(
+          ProductPrice.ENTITY_NAME);
+      final Property orgProperty = productPriceEntity
+          .getProperty(ProductPrice.PROPERTY_ORGANIZATION);
+      final Property plvProperty = productPriceEntity
+          .getProperty(ProductPrice.PROPERTY_PRICELISTVERSION);
+
+      final Organization org = (Organization) event.getCurrentState(orgProperty);
+      final PriceListVersion plv = (PriceListVersion) event.getCurrentState(plvProperty);
+      if (plv != null) {
+        final Organization plOrg = plv.getOrganization();
+        if (org != null && plOrg != null && !StringUtils.equals(org.getId(), plOrg.getId())) {
+          event.setCurrentState(orgProperty, plOrg);
+        }
+      }
+    }
+  }
+}