[reconciliation refactor] merge to PI
authorSandra Huguet <sandra.huguet@openbravo.com>
Wed, 10 Sep 2014 13:50:06 +0200
changeset 24652 368a0bdcd20a
parent 24651 1607cf9354b8 (current diff)
parent 24419 c1ab9098a54a (diff)
child 24653 0502d92f27f3
[reconciliation refactor] merge to PI
lib/runtime/ant-1.7.1.jar
lib/runtime/ant-apache-log4j.jar
lib/runtime/ant-launcher.jar
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_ELEMENT.xml
src-db/database/sourcedata/AD_FIELD.xml
src-db/database/sourcedata/AD_REFERENCE.xml
src-db/database/sourcedata/AD_TAB.xml
src-db/database/sourcedata/AD_TABLE.xml
src/org/openbravo/erpCommon/ad_forms/DocMatchInv.java
--- a/.hgsigs	Tue Sep 09 13:08:31 2014 +0200
+++ b/.hgsigs	Wed Sep 10 13:50:06 2014 +0200
@@ -154,3 +154,4 @@
 9607751357e9e3a411c0919759ed81196befcad9 0 iEYEABECAAYFAlPHZVkACgkQCX/oGf+2qkORBQCfZJPiBWcEMNURibADGn9o+u+snwgAoP4ZMSkLCsu4PSf75rZn4gStM4wh
 11ed6ecc0a194545a1f8a3af2b2674b0ec319f99 0 iEYEABECAAYFAlPblXoACgkQCX/oGf+2qkOuxACfX5e+wRgLJw88VUyHl32C+QC8PY8AoOoARsJUAOnu8IgYYwNjyw5xMlKC
 a9d6608b6cabe9e27fa31cbf2a49a69b2d583e0a 0 iEUEABECAAYFAlPfOfMACgkQCX/oGf+2qkP8GQCY8T/ZXMymIqGubZ6h2LbjE7Uc4gCg5A/numsq2gypnrNri+wMt1HLLWA=
+c63d4e4125e832602ed1da786f756c26c7fdcd2a 0 iEYEABECAAYFAlQISYIACgkQCX/oGf+2qkMciwCgo6ZYlA+XmT9DC0n2zO7P5okbQngAoITq7wESNiiLk56/3Rzw7gGtOgMe
--- a/.hgtags	Tue Sep 09 13:08:31 2014 +0200
+++ b/.hgtags	Wed Sep 10 13:50:06 2014 +0200
@@ -165,3 +165,4 @@
 73f3bc31a2293109ebdc6e5b2f8b3f1870df7528 3.0PR14Q2.4
 abfe5a20ef579b8edaf9866346ee876a00e87eee 3.0PR14Q2.5
 d7d2abe0f424775dcdf9139410ae161881be1fb8 3.0PR14Q3
+a5483762bc5de5e3e934785f3baffda3a2d96db2 3.0PR14Q3.1
--- a/build.xml	Tue Sep 09 13:08:31 2014 +0200
+++ b/build.xml	Wed Sep 10 13:50:06 2014 +0200
@@ -1158,9 +1158,9 @@
         <pathelement path="${base.lib}/runtime/postgresql-9.0-801.jdbc4.jar" />
         <pathelement path="${base.lib}/runtime/ojdbc6.jar" />
         <pathelement path="${base.lib}/runtime/commons-collectionsi-3.2.1.jar" />
-        <pathelement path="${base.lib}/runtime/ant-1.7.1.jar" />
-        <pathelement path="${base.lib}/runtime/ant-launcher.jar" />
-        <pathelement path="${base.lib}/runtime/ant-apache-log4j.jar" />
+        <pathelement path="${base.lib}/runtime/ant-1.9.2.jar" />
+        <pathelement path="${base.lib}/runtime/ant-launcher-1.9.2.jar" />
+        <pathelement path="${base.lib}/runtime/ant-apache-log4j-1.9.2.jar" />
         <pathelement path="${base.lib}/runtime/ant-nodeps.jar" />
       </classpath>
     </java>
--- a/legal/Licensing.txt	Tue Sep 09 13:08:31 2014 +0200
+++ b/legal/Licensing.txt	Wed Sep 10 13:50:06 2014 +0200
@@ -78,9 +78,9 @@
 # YUIAnt.jar
 Copyright (c) 2007, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: (http://developer.yahoo.net/yui/license.txt)
 
-# ant-1.7.1.jar
-# ant-apache-log4j.jar
-# ant-launcher.jar
+# ant-1.9.2.jar
+# ant-apache-log4j-1.9.2.jar
+# ant-launcher-1.9.2.jar
 # ant-nodeps.jar
 # avalon-framework-4.1.5.jar
 # axis-ant.jar
Binary file lib/runtime/ant-1.7.1.jar has changed
Binary file lib/runtime/ant-1.9.2.jar has changed
Binary file lib/runtime/ant-apache-log4j-1.9.2.jar has changed
Binary file lib/runtime/ant-apache-log4j.jar has changed
Binary file lib/runtime/ant-launcher-1.9.2.jar has changed
Binary file lib/runtime/ant-launcher.jar has changed
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.24417]]></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.24341]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.24417]]></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.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.24417]]></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.24341]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.24417]]></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.24341]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.24417]]></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.24341]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.24417]]></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/process/BaseProcessActionHandler.java	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java	Wed Sep 10 13:50:06 2014 +0200
@@ -22,7 +22,9 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
+import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
 import org.hibernate.criterion.Restrictions;
 import org.openbravo.base.util.Check;
@@ -77,11 +79,19 @@
         return jsonRequest;
       }
 
+      JSONObject context = null;
+      if (StringUtils.isNotEmpty(content)) {
+        try {
+          context = new JSONObject(content);
+        } catch (JSONException e) {
+          log.error("Error getting context for process definition " + processDefinition, e);
+        }
+      }
       for (Parameter param : processDefinition.getOBUIAPPParameterList()) {
         if (param.isFixed()) {
           if (param.isEvaluateFixedValue()) {
             parameters.put(param.getDBColumnName(),
-                ParameterUtils.getParameterFixedValue(fixRequestMap(parameters), param));
+                ParameterUtils.getParameterFixedValue(fixRequestMap(parameters, context), param));
           } else {
             parameters.put(param.getDBColumnName(), param.getFixedValue());
           }
@@ -200,11 +210,21 @@
     return qAccess.count() > 0;
   }
 
-  /*
+  /**
    * The request map is <String, Object> because includes the HTTP request and HTTP session, is not
    * required to handle process parameters
+   * 
+   * @deprecated use {@link BaseProcessActionHandler#fixRequestMap(Map, JSONObject)}
    */
   protected Map<String, String> fixRequestMap(Map<String, Object> parameters) {
+    return fixRequestMap(parameters, null);
+  }
+
+  /**
+   * Fixes the request map adding an "context" key to include context info in order to make it
+   * available to be evaluated by FilterExpression
+   */
+  protected Map<String, String> fixRequestMap(Map<String, Object> parameters, JSONObject context) {
     final Map<String, String> retval = new HashMap<String, String>();
     for (Entry<String, Object> entries : parameters.entrySet()) {
       if (entries.getKey().equals(KernelConstants.HTTP_REQUEST)
@@ -213,6 +233,9 @@
       }
       retval.put(entries.getKey(), entries.getValue().toString());
     }
+    if (context != null) {
+      retval.put("context", context.toString());
+    }
     return retval;
   }
 
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/process/DefaultsProcessActionHandler.java	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/process/DefaultsProcessActionHandler.java	Wed Sep 10 13:50:06 2014 +0200
@@ -24,6 +24,7 @@
 
 import javax.servlet.http.HttpSession;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
@@ -67,12 +68,17 @@
       OBContext.setAdminMode(true);
 
       final String processId = (String) parameters.get("processId");
+      final Process processDefinition = OBDal.getInstance().get(Process.class, processId);
 
       JSONObject context = null;
-      if (parameters.get("context") != null) {
-        context = new JSONObject((String) parameters.get("context"));
+      if (StringUtils.isNotEmpty(content)) {
+        try {
+          context = new JSONObject(content);
+        } catch (JSONException e) {
+          log.error("Error getting context for process definition " + processDefinition, e);
+        }
       }
-      final Process processDefinition = OBDal.getInstance().get(Process.class, processId);
+
       JSONObject defaults = new JSONObject();
       JSONObject filterExpressions = new JSONObject();
       final List<Parameter> orderedParams = new ArrayList<Parameter>();
@@ -105,7 +111,7 @@
               defaultValue = context.get(inpName);
               inpName = "inp" + Sqlc.TransformaNombreColumna(param.getDBColumnName());
             } else {
-              Map<String, String> requestMap = fixRequestMap(parameters);
+              Map<String, String> requestMap = fixRequestMap(parameters, context);
               requestMap.put("currentParam", param.getDBColumnName());
               defaultValue = ParameterUtils.getJSExpressionResult(requestMap,
                   (HttpSession) parameters.get(KernelConstants.HTTP_SESSION), rawDefaultValue);
@@ -156,7 +162,7 @@
                   Object defaultExpression;
                   parameters.put("filterExpressionColumnName", field.getColumn().getDBColumnName());
                   defaultExpression = ParameterUtils.getJSExpressionResult(
-                      fixRequestMap(parameters),
+                      fixRequestMap(parameters, context),
                       (HttpSession) parameters.get(KernelConstants.HTTP_SESSION),
                       rawDefaultExpression);
 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js	Wed Sep 10 13:50:06 2014 +0200
@@ -41,6 +41,12 @@
       targetFld.valueMap[targetFld.getValue()] = display;
       if (targetFld.displayField) {
         targetFld.form.setValue(targetFld.displayField, display);
+        //setting the grid value so that it is not lost when there is another search field in the grid.
+        //refer issue https://issues.openbravo.com/view.php?id=27243
+        if (targetFld.form.grid && targetFld.form.grid.getEditForm()) {
+          targetFld.form.grid.setEditValue(targetFld.form.grid.getEditRow(), targetFld.name, value);
+          targetFld.form.grid.setEditValue(targetFld.form.grid.getEditRow(), targetFld.displayField, display);
+        }
       }
       targetFld.updateValueMap(true);
 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js	Wed Sep 10 13:50:06 2014 +0200
@@ -459,5 +459,9 @@
       this.setData([]);
       this.fetchData(this.getCriteria());
     }
+  },
+
+  isWritable: function (record) {
+    return !record._readOnly;
   }
 });
\ No newline at end of file
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Wed Sep 10 13:50:06 2014 +0200
@@ -2111,7 +2111,7 @@
 
   deleteSelectedRows: function (autoSaveDone) {
     var msg, dialogTitle, view = this,
-        deleteCount, callback;
+        deleteCount, callback, currentGrid;
 
     if (!this.readOnly && this.isDeleteableTable) {
       // first save what we have edited
@@ -2124,14 +2124,18 @@
         this.standardWindow.doActionAfterAutoSave(actionObject, false);
         return;
       }
-
-      deleteCount = this.viewGrid.getSelection().length;
+      if (this.isShowingTree) {
+        currentGrid = this.treeGrid;
+      } else {
+        currentGrid = this.viewGrid;
+      }
+      deleteCount = currentGrid.getSelection().length;
 
       if (deleteCount === 1) {
         msg = OB.I18N.getLabel('OBUIAPP_DeleteConfirmationSingle');
         dialogTitle = OB.I18N.getLabel('OBUIAPP_DialogTitle_DeleteRecord');
       } else {
-        msg = OB.I18N.getLabel('OBUIAPP_DeleteConfirmationMultiple', [this.viewGrid.getSelection().length]);
+        msg = OB.I18N.getLabel('OBUIAPP_DeleteConfirmationMultiple', [deleteCount]);
         dialogTitle = OB.I18N.getLabel('OBUIAPP_DialogTitle_DeleteRecords');
       }
 
@@ -2149,7 +2153,7 @@
 
         removeCallBack = function (resp, data, req) {
           var length, localData = resp.dataObject || resp.data || data,
-              i, updateTotalRows;
+              i, updateTotalRows, currentGrid;
 
           if (!localData) {
             // bail out, an error occured which should be displayed to the user now
@@ -2165,6 +2169,11 @@
             status = localData.response.status;
           }
           if (status === isc.RPCResponse.STATUS_SUCCESS) {
+            if (view.isShowingTree) {
+              currentGrid = view.treeGrid;
+            } else {
+              currentGrid = view.viewGrid;
+            }
             if (view.isShowingForm) {
               view.switchFormGridVisibility();
             }
@@ -2172,7 +2181,7 @@
             if (deleteData) {
               // note totalrows is used when inserting a new row, to determine after which
               // record to add a new row
-              updateTotalRows = (view.viewGrid.data.getLength() === view.viewGrid.data.totalRows);
+              updateTotalRows = (currentGrid.data.getLength() === currentGrid.data.totalRows);
               // deleteData is computed below
               length = deleteData.ids.length;
               for (i = 0; i < length; i++) {
@@ -2181,21 +2190,22 @@
                 });
               }
               view.viewGrid.data.handleUpdate('remove', recordInfos, false, req);
+              if (view.treeGrid) {
+                view.treeGrid.data.handleUpdate('remove', recordInfos, false, req);
+              }
               if (updateTotalRows) {
-                view.viewGrid.data.totalRows = view.viewGrid.data.getLength();
+                currentGrid.data.totalRows = currentGrid.data.getLength();
               }
             } else if (doUpdateTotalRows) {
-              view.viewGrid.data.totalRows = view.viewGrid.data.getLength();
+              currentGrid.data.totalRows = currentGrid.data.getLength();
             }
             view.viewGrid.updateRowCountDisplay();
-
             // Refresh the grid based on Refresh After Deletion preference
             if (OB.PropertyStore.get("OBUIAPP_RefreshAfterDeletion", view.standardWindow.windowId) === 'Y') {
               view.viewGrid.refreshGrid();
             } else {
               view.refreshChildViews();
             }
-
             view.refreshParentRecord();
           } else {
             // get the error message from the dataObject 
@@ -2215,9 +2225,16 @@
           isc.clearPrompt();
         };
         if (ok) {
-          selection = view.viewGrid.getSelection().duplicate();
+
+          if (view.isShowingTree) {
+            currentGrid = view.treeGrid;
+          } else {
+            currentGrid = view.viewGrid;
+          }
+
+          selection = currentGrid.getSelection().duplicate();
           // deselect the current records
-          view.viewGrid.deselectAllRecords();
+          currentGrid.deselectAllRecords();
 
           if (selection.length > 1) {
             deleteData = {};
@@ -2231,9 +2248,16 @@
               refreshGrid: true
             });
           } else {
+            if (view.isShowingTree) {
+              deleteData = {};
+              deleteData.entity = view.entity;
+              deleteData.ids = [];
+              length = selection.length;
+              deleteData.ids.push(selection[0][OB.Constants.ID]);
+            }
             // note totalrows is used when inserting a new row, to determine after which
             // record to add a new row
-            doUpdateTotalRows = (view.viewGrid.data.getLength() === view.viewGrid.data.totalRows);
+            doUpdateTotalRows = (currentGrid.data.getLength() === currentGrid.data.totalRows);
             // note remove data expects only the id, the record key as the first param
             view.viewGrid.removeData({
               id: selection[0].id
@@ -2332,7 +2356,6 @@
   },
 
   setHalfSplit: function () {
-    this.setHeight('100%');
     var i, tab, pane;
     if (this.members[1]) {
       // divide the space between the first and second level
@@ -2344,7 +2367,6 @@
         // makes a difference what the order of resizing is, first resize the 
         // one which will be larger, then the one which will be smaller.
         this.members[1].setHeight('50%');
-        this.members[0].setHeight('50%');
       }
       this.members[1].setState(isc.OBStandardView.STATE_IN_MID);
     } else {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js	Wed Sep 10 13:50:06 2014 +0200
@@ -286,7 +286,11 @@
       processClass = isc[className] || isc[originalClassName];
 
       if (processClass) {
-        processOwnerView = this.getProcessOwnerView(params.processId);
+        if (params.processOwnerView) {
+          processOwnerView = params.processOwnerView;
+        } else {
+          processOwnerView = this.getProcessOwnerView(params.processId);
+        }
         runningProcess = processClass.create(isc.addProperties({}, params, {
           parentWindow: this,
           sourceView: this.activeView,
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalization.js	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalization.js	Wed Sep 10 13:50:06 2014 +0200
@@ -187,7 +187,7 @@
 
     // for each field create a tree record, a tree record is identified
     // by its name
-    if (isc.isA.SectionItem(fld)) {
+    if (isc.isA.SectionItem(fld) || fld.type === 'OBSectionItem') {
       // section items are shown as folders which can not be dragged
       // or edited
       record = {
@@ -204,12 +204,13 @@
         title: fld.title,
         name: fld.name,
         hiddenInForm: fld.hiddenInForm,
-        startRow: fld.startRow,
-        colSpan: fld.colSpan,
         required: fld.required,
         hasDefaultValue: fld.hasDefaultValue,
-        rowSpan: fld.rowSpan
+        colSpan: (fld.colSpan !== undefined) ? fld.colSpan : 1,
+        rowSpan: (fld.rowSpan !== undefined) ? fld.rowSpan : 1,
+        startRow: (fld.startRow !== undefined) ? fld.startRow : false
       };
+
     }
 
     // is used below to get rid of non-displayed fields which 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js	Wed Sep 10 13:50:06 2014 +0200
@@ -51,7 +51,7 @@
     var i, field, items = [],
         buttonLayout = [],
         newButton, cancelButton, view = this,
-        newShowIf, params, updatedExpandSection;
+        newShowIf, context, updatedExpandSection;
 
     // this flag can be used by Selenium to determine when defaults are set
     this.defaultsAreSet = false;
@@ -293,21 +293,19 @@
     this.members.push(this.loading);
     this.Super('initWidget', arguments);
 
-    params = {
+    context = this.getUnderLyingRecordContext(false, true, true, true);
+
+    // allow to add external parameters
+    isc.addProperties(context, this.externalParams);
+
+    if (this.callerField && this.callerField.view && this.callerField.view.getContextInfo) {
+      isc.addProperties(context || {}, this.callerField.view.getContextInfo(true /*excludeGrids*/ ));
+    }
+
+    OB.RemoteCallManager.call('org.openbravo.client.application.process.DefaultsProcessActionHandler', context, {
       processId: this.processId,
       windowId: this.windowId
-    };
-
-    // allow to add external parameters
-    isc.addProperties(params, this.externalParams);
-
-    params.context = this.getUnderLyingRecordContext(false, true, true, true);
-
-    if (this.callerField && this.callerField.view && this.callerField.view.getContextInfo) {
-      isc.addProperties(params.context || {}, this.callerField.view.getContextInfo(true /*excludeGrids*/ ));
-    }
-
-    OB.RemoteCallManager.call('org.openbravo.client.application.process.DefaultsProcessActionHandler', {}, params, function (rpcResponse, data, rpcRequest) {
+    }, function (rpcResponse, data, rpcRequest) {
       view.handleDefaults(data);
     });
 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js	Wed Sep 10 13:50:06 2014 +0200
@@ -159,16 +159,20 @@
     updateState: function () {
       var view = this.view,
           form = view.viewForm,
-          grid = view.viewGrid,
-          selectedRecords = grid.getSelectedRecords(),
-          length = selectedRecords.length,
-          i;
+          currentGrid, length, selectedRecords, i;
+      if (view.isShowingTree) {
+        currentGrid = view.treeGrid;
+      } else {
+        currentGrid = view.viewGrid;
+      }
+      selectedRecords = currentGrid.getSelectedRecords();
+      length = selectedRecords.length;
       if (!this.view.isDeleteableTable) {
         this.setDisabled(true);
         return;
       }
       for (i = 0; i < length; i++) {
-        if (!grid.isWritable(selectedRecords[i])) {
+        if (!currentGrid.isWritable(selectedRecords[i])) {
           this.setDisabled(true);
           return;
         }
@@ -180,7 +184,7 @@
       if (view.isShowingForm) {
         this.setDisabled(form.isSaving || form.readOnly || view.singleRecord || !view.hasValidState() || form.isNew || (view.standardWindow.allowDelete === 'N'));
       } else {
-        this.setDisabled(view.readOnly || view.singleRecord || !view.hasValidState() || !grid.getSelectedRecords() || grid.getSelectedRecords().length === 0 || (view.standardWindow.allowDelete === 'N'));
+        this.setDisabled(view.readOnly || view.singleRecord || !view.hasValidState() || !currentGrid.getSelectedRecords() || currentGrid.getSelectedRecords().length === 0 || (view.standardWindow.allowDelete === 'N'));
       }
     },
     keyboardShortcutId: 'ToolBar_Eliminate'
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.24417]]></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.24341]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.24417]]></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.24341]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.24417]]></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/KernelApplicationInitializer.java	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelApplicationInitializer.java	Wed Sep 10 13:50:06 2014 +0200
@@ -37,5 +37,7 @@
         new StandardSQLFunction("ad_org_getcalendarowner", new StringType()));
     OBDal.getInstance().registerSQLFunction("ad_org_getperiodcontrolallow",
         new StandardSQLFunction("ad_org_getperiodcontrolallow", new StringType()));
+    OBDal.getInstance().registerSQLFunction("m_isparent_ch_value",
+        new StandardSQLFunction("m_isparent_ch_value", new StringType()));
   }
 }
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceComponent.java	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceComponent.java	Wed Sep 10 13:50:06 2014 +0200
@@ -30,6 +30,7 @@
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.log4j.Logger;
+import org.openbravo.base.session.OBPropertiesProvider;
 import org.openbravo.client.kernel.BaseComponentProvider.ComponentResource;
 import org.openbravo.client.kernel.BaseComponentProvider.ComponentResource.ComponentResourceType;
 import org.openbravo.dal.core.OBContext;
@@ -243,7 +244,8 @@
        * 
        * TODO: don't load the ob-debug.js file if not in use
        */
-      if (isInDevelopment() || referer.indexOf("/ret-") > 0) {
+      if (isInDevelopment()
+          || OBPropertiesProvider.getInstance().getBooleanProperty("test.environment")) {
         sb.insert(0, "var isDebug = true;\n\n");
       }
       sb.append("if (window.onerror && window.onerror.name === '"
@@ -264,7 +266,8 @@
     // when changing development status, system needs to be restarted.
     final String output;
     // in classicmode the isc combined is included, compressing that gives errors
-    if (!isInDevelopment() && !isClassicMode()) {
+    if (!isInDevelopment() && !isClassicMode()
+        && !OBPropertiesProvider.getInstance().getBooleanProperty("test.environment")) {
       output = JSCompressor.getInstance().compress(sb.toString());
     } else {
       output = sb.toString();
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.24417]]></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.24341]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.24417]]></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.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java	Wed Sep 10 13:50:06 2014 +0200
@@ -266,13 +266,13 @@
               if (queryAliases[i].equals(column.getDisplayExpression())
                   || (!isExport && queryAliases[i].equals(column.getLinkExpression()))) {
                 Object value = resultList[i];
-                if (value instanceof Timestamp) {
+                if (domainType instanceof DateDomainType || domainType instanceof DateDomainType) {
+                    value = xmlDateFormat.format(value);
+                  }
+                else if (value instanceof Timestamp) {
                   value = xmlDateTimeFormat.format(value);
                   value = JsonUtils.convertToCorrectXSDFormat((String) value);
                 }
-                if (value instanceof Date) {
-                  value = xmlDateFormat.format(value);
-                }
 
                 if (domainType instanceof BooleanDomainType) {
                   if (value instanceof String) {
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></VERSION>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></STARTVERSION>
+<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.24417]]></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.24341]]></STARTVERSION>
+<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.24417]]></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.24341]]></STARTVERSION>
+<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.24417]]></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.24341]]></STARTVERSION>
+<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.24417]]></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.24341]]></STARTVERSION>
+<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></VERSION>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></STARTVERSION>
+<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.24417]]></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.24341]]></STARTVERSION>
+<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></VERSION>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></STARTVERSION>
+<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></VERSION>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></STARTVERSION>
+<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></VERSION>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></STARTVERSION>
+<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.24417]]></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.24341]]></STARTVERSION>
+<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.24417]]></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.24341]]></STARTVERSION>
+<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.24417]]></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.24341]]></STARTVERSION>
+<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.24417]]></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.24341]]></STARTVERSION>
+<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.24417]]></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.24341]]></STARTVERSION>
+<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.24417]]></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.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js	Wed Sep 10 13:50:06 2014 +0200
@@ -392,8 +392,6 @@
       isc.addProperties(data, this.view.sourceView.getContextInfo(false, true));
     }
 
-
-
     callback = function (resp, data, req) {
       selectorWindow.fetchDefaultsCallback(resp, data, req);
     };
@@ -655,7 +653,9 @@
       click: function (form, item, icon) {
         var enteredValue = {};
         enteredValue[item.defaultPopupFilterField] = item.getEnteredValue();
-        item.openProcess([enteredValue]);
+        item.openProcess([enteredValue], {
+          processOwnerView: form.view
+        });
       }
     }];
 
@@ -847,8 +847,8 @@
     this.selectorWindow.open();
   },
 
-  openProcess: function (enteredValues) {
-    var view, standardWindow;
+  openProcess: function (enteredValues, additionalProcessProperties) {
+    var params, view, standardWindow;
     if (this.form && this.form.view) {
       // If the selector is in a standard window
       view = this.form.view;
@@ -856,15 +856,19 @@
       // If the selector is in a parameter window
       view = this.form.paramWindow.parentWindow.view;
     }
-    standardWindow = view.standardWindow;
-    standardWindow.openProcess({
+    params = {
       callerField: this,
       enteredValues: enteredValues,
       paramWindow: true,
       processId: this.processId,
       windowId: view.windowId,
       windowTitle: OB.I18N.getLabel('OBUISEL_AddNewRecord', [this.title])
-    });
+    };
+    if (additionalProcessProperties) {
+      isc.addProperties(params, additionalProcessProperties);
+    }
+    standardWindow = view.standardWindow;
+    standardWindow.openProcess(params);
   },
 
   keyPress: function (item, form, keyName, characterValue) {
--- a/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></VERSION>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></STARTVERSION>
+<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></VERSION>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></STARTVERSION>
+<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.24417]]></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.24341]]></STARTVERSION>
+<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.24417]]></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.24341]]></STARTVERSION>
+<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.24417]]></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.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></VERSION>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></STARTVERSION>
+<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.24417]]></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.24341]]></STARTVERSION>
+<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.24417]]></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.24341]]></STARTVERSION>
+<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></VERSION>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></STARTVERSION>
+<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.24417]]></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.24341]]></STARTVERSION>
+<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.24417]]></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.24341]]></STARTVERSION>
+<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.24417]]></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.24341]]></STARTVERSION>
+<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.24417]]></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.24341]]></STARTVERSION>
+<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.24417]]></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.24341]]></STARTVERSION>
+<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.24417]]></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.24341]]></STARTVERSION>
+<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.24417]]></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.24341]]></STARTVERSION>
+<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.24417]]></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.24341]]></STARTVERSION>
+<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.24417]]></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.24341]]></STARTVERSION>
+<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.24417]]></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.24341]]></STARTVERSION>
+<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.24417]]></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.24341]]></STARTVERSION>
+<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></VERSION>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.24417]]></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	Tue Sep 09 13:08:31 2014 +0200
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 10 13:50:06 2014 +0200
@@ -7,7 +7,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.24341]]></STARTVERSION>
+<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.24417]]></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>
@@ -21,7 +21,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.24341]]></STARTVERSION>
+<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.24417]]></STARTVERSION>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <DEPENDANT_MODULE_NAME><![CDATA[Payment Report]]></DEPENDANT_MODULE_NAME>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,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.24341]]></STARTVERSION>
+<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.24417]]></STARTVERSION>
 <!--60834727BB114764ACEF019F40A34562-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--60834727BB114764ACEF019F40A34562-->  <DEPENDANT_MODULE_NAME><![CDATA[Orders Awaiting Delivery]]></DEPENDANT_MODULE_NAME>
 <!--60834727BB114764ACEF019F40A34562-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,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.24341]]></STARTVERSION>
+<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.24417]]></STARTVERSION>
 <!--8418885E97D643138B6D907671351E3D-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--8418885E97D643138B6D907671351E3D-->  <DEPENDANT_MODULE_NAME><![CDATA[Standard Roles]]></DEPENDANT_MODULE_NAME>
 <!--8418885E97D643138B6D907671351E3D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,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.24341]]></STARTVERSION>
+<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.24417]]></STARTVERSION>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MINOR]]></DEPENDENCY_ENFORCEMENT>
@@ -77,7 +77,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.24341]]></STARTVERSION>
+<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.24417]]></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>
@@ -91,7 +91,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.24341]]></STARTVERSION>
+<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.24417]]></STARTVERSION>
 <!--FF8080813189932B013189B45B59003A-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8080813189932B013189B45B59003A-->  <DEPENDANT_MODULE_NAME><![CDATA[OpenID Service Integration]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813189932B013189B45B59003A-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -105,7 +105,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.24341]]></STARTVERSION>
+<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.24417]]></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>
@@ -119,7 +119,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.24341]]></STARTVERSION>
+<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.24417]]></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-core/.classpath	Tue Sep 09 13:08:31 2014 +0200
+++ b/src-core/.classpath	Wed Sep 10 13:50:06 2014 +0200
@@ -13,8 +13,8 @@
 	<classpathentry kind="lib" path="/openbravo/lib/runtime/commons-codec-1.5.jar"/>
 	<classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-1.2.16.jar"/>
 	<classpathentry kind="lib" path="/openbravo/lib/runtime/commons-io-2.0.1.jar"/>
-	<classpathentry kind="lib" path="/openbravo/lib/runtime/ant-1.7.1.jar"/>
-	<classpathentry kind="lib" path="/openbravo/lib/runtime/ant-apache-log4j.jar"/>
 	<classpathentry kind="lib" path="/openbravo/lib/build/servlet-api.jar"/>
+	<classpathentry kind="lib" path="/openbravo/lib/runtime/ant-1.9.2.jar"/>
+	<classpathentry kind="lib" path="/openbravo/lib/runtime/ant-apache-log4j-1.9.2.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/functions/M_ISPARENT_CH_VALUE.xml	Wed Sep 10 13:50:06 2014 +0200
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+  <database name="FUNCTION M_ISPARENT_CH_VALUE">
+    <function name="M_ISPARENT_CH_VALUE" type="NUMERIC">
+      <parameter name="p_ch_value_id" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_parent_ch_value_id" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_char_id" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <body><![CDATA[/*************************************************************************
+* 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) 2014 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+/*************************************************************************
+* Title: Return 'Characteristic Value Level' if ch_value_id is a leaf of the characteristic tree
+*    where parent_ch_value_id is the root. Else return -1
+************************************************************************/
+  v_Level NUMBER:=0;
+  v_treeID varchar2(32) ;
+  v_Parent VARCHAR(32) ;
+  v_Node   VARCHAR(32) ;
+BEGIN
+  SELECT MAX(AD_TREE_ID)
+  INTO v_treeID
+  FROM m_characteristic
+  WHERE m_characteristic_id = p_char_id;
+  v_Parent := p_ch_value_id;
+  WHILE v_Parent IS NOT NULL
+  LOOP
+    v_Level:=v_Level + 1;
+    SELECT MAX(NODE_ID),
+      MAX(PARENT_ID)
+    INTO v_Node,
+      v_Parent
+    FROM AD_TREENODE
+    WHERE AD_TREE_ID=v_treeID
+      AND NODE_ID=v_Parent;
+    IF v_Node=p_parent_ch_value_id THEN
+      RETURN v_Level;
+    END IF;
+  END LOOP;
+  RETURN(-1) ;
+END M_ISPARENT_CH_VALUE
+]]></body>
+    </function>
+  </database>
--- a/src-db/database/model/functions/M_PROMOTION_CALCULATE.xml	Tue Sep 09 13:08:31 2014 +0200
+++ b/src-db/database/model/functions/M_PROMOTION_CALCULATE.xml	Wed Sep 10 13:50:06 2014 +0200
@@ -294,6 +294,23 @@
           WHERE O.M_OFFER_ID = M_OFFER.M_OFFER_ID
             AND O.AD_ORG_ID = Cur_Order.AD_Org_ID
           )))
+          AND ((CHARACTERISTICS_SELECTION = 'Y'
+          AND NOT EXISTS
+          (SELECT 1
+          FROM M_OFFER_CHARACTERISTIC C, M_PRODUCT_CH_VALUE V
+          WHERE C.M_OFFER_ID = M_OFFER.M_OFFER_ID
+            AND V.M_PRODUCT_ID = Cur_Order.M_Product_ID
+            AND m_isparent_ch_value(V.M_CH_VALUE_ID, C.M_CH_VALUE_ID, C.M_CHARACTERISTIC_ID) <> -1
+          ))
+          OR(CHARACTERISTICS_SELECTION = 'N'
+          AND EXISTS
+          (SELECT 1
+          FROM M_OFFER_CHARACTERISTIC C, M_PRODUCT_CH_VALUE V
+          WHERE C.M_OFFER_ID = M_OFFER.M_OFFER_ID
+            AND V.M_PRODUCT_ID = Cur_Order.M_Product_ID
+            AND m_isparent_ch_value(V.M_CH_VALUE_ID, C.M_CH_VALUE_ID, C.M_CHARACTERISTIC_ID) <> -1
+          ))
+          )
         ORDER BY PRIORITY,
           M_OFFER_ID
         )
--- a/src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml	Tue Sep 09 13:08:31 2014 +0200
+++ b/src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml	Wed Sep 10 13:50:06 2014 +0200
@@ -209,6 +209,9 @@
         <index-column name="FIN_RECONCILIATION_ID"/>
         <index-column name="STATUS"/>
       </index>
+      <index name="FIN_FINACC_TRANSACTION_POSTED" unique="false">
+        <index-column name="POSTED"/>
+      </index>
       <unique name="FIN_FINACC_TRANSACTION_UN">
         <unique-column name="FIN_PAYMENT_ID"/>
       </unique>
--- a/src-db/database/model/tables/M_OFFER.xml	Tue Sep 09 13:08:31 2014 +0200
+++ b/src-db/database/model/tables/M_OFFER.xml	Wed Sep 10 13:50:06 2014 +0200
@@ -117,6 +117,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="CHARACTERISTICS_SELECTION" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault><![CDATA['Y']]></onCreateDefault>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="M_OFFER_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/tables/M_OFFER_CHARACTERISTIC.xml	Wed Sep 10 13:50:06 2014 +0200
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+  <database name="TABLE M_OFFER_CHARACTERISTIC">
+    <table name="M_OFFER_CHARACTERISTIC" primaryKey="M_OFFER_CHARACTERISTIC_KEY">
+      <column name="M_OFFER_CHARACTERISTIC_ID" primaryKey="true" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="M_OFFER_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="M_CHARACTERISTIC_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="M_CH_VALUE_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <foreign-key foreignTable="AD_CLIENT" name="M_OFF_CHAR_AD_CLIENT">
+        <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="M_OFF_CHAR_AD_ORG">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="M_CHARACTERISTIC" name="M_OFF_CHAR_CHARACTERISTIC">
+        <reference local="M_CHARACTERISTIC_ID" foreign="M_CHARACTERISTIC_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="M_CH_VALUE" name="M_OFF_CHAR_CHVALUE">
+        <reference local="M_CH_VALUE_ID" foreign="M_CH_VALUE_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="M_OFFER" name="M_OFF_CHAR_OFFER">
+        <reference local="M_OFFER_ID" foreign="M_OFFER_ID"/>
+      </foreign-key>
+      <index name="M_OFFER_CHARACTERISTIC_OFFER" unique="false">
+        <index-column name="M_OFFER_ID"/>
+      </index>
+      <check name="M_OFF_CHAR_ISACTIVE"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+    </table>
+  </database>
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Tue Sep 09 13:08:31 2014 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Wed Sep 10 13:50:06 2014 +0200
@@ -220128,6 +220128,41 @@
 <!--00FA42F2239C49ACA79CAC3A030F8DCD-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--00FA42F2239C49ACA79CAC3A030F8DCD--></AD_COLUMN>
 
+<!--01730FB593B944F7AE8DCF140C9B6C90--><AD_COLUMN>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <AD_COLUMN_ID><![CDATA[01730FB593B944F7AE8DCF140C9B6C90]]></AD_COLUMN_ID>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <NAME><![CDATA[M_Offer_ID]]></NAME>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <COLUMNNAME><![CDATA[M_Offer_ID]]></COLUMNNAME>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <AD_TABLE_ID><![CDATA[8FF90F99857D4F0F842FE3B2C356E9B4]]></AD_TABLE_ID>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <ISPARENT><![CDATA[Y]]></ISPARENT>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <AD_ELEMENT_ID><![CDATA[800273]]></AD_ELEMENT_ID>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <POSITION><![CDATA[9]]></POSITION>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--01730FB593B944F7AE8DCF140C9B6C90--></AD_COLUMN>
+
 <!--01AB98F2E1B247CF9FE89FEECECA077D--><AD_COLUMN>
 <!--01AB98F2E1B247CF9FE89FEECECA077D-->  <AD_COLUMN_ID><![CDATA[01AB98F2E1B247CF9FE89FEECECA077D]]></AD_COLUMN_ID>
 <!--01AB98F2E1B247CF9FE89FEECECA077D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -229561,6 +229596,41 @@
 <!--2B8EAE6B89BE4C418795AA11EE377A3E-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--2B8EAE6B89BE4C418795AA11EE377A3E--></AD_COLUMN>
 
+<!--2B9B0E3218C742D4B7FE0F2681294FDC--><AD_COLUMN>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <AD_COLUMN_ID><![CDATA[2B9B0E3218C742D4B7FE0F2681294FDC]]></AD_COLUMN_ID>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <NAME><![CDATA[M_Ch_Value_ID]]></NAME>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <HELP><![CDATA[Identifies a possible value of a Product Characteristic]]></HELP>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <COLUMNNAME><![CDATA[M_Ch_Value_ID]]></COLUMNNAME>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <AD_TABLE_ID><![CDATA[8FF90F99857D4F0F842FE3B2C356E9B4]]></AD_TABLE_ID>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <AD_REFERENCE_ID><![CDATA[8C57A4A2E05F4261A1FADF47C30398AD]]></AD_REFERENCE_ID>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <AD_REFERENCE_VALUE_ID><![CDATA[ADE80203FF1D4143854E6B938CF3E8B9]]></AD_REFERENCE_VALUE_ID>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <SEQNO><![CDATA[120]]></SEQNO>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <AD_ELEMENT_ID><![CDATA[D6A392F2D7B69EE2E040007F01002D70]]></AD_ELEMENT_ID>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <POSITION><![CDATA[11]]></POSITION>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC--></AD_COLUMN>
+
 <!--2B9E746AE09F4E88AE00CBA9DBFC4062--><AD_COLUMN>
 <!--2B9E746AE09F4E88AE00CBA9DBFC4062-->  <AD_COLUMN_ID><![CDATA[2B9E746AE09F4E88AE00CBA9DBFC4062]]></AD_COLUMN_ID>
 <!--2B9E746AE09F4E88AE00CBA9DBFC4062-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -229960,6 +230030,41 @@
 <!--2D56F14A0C524D8F95282389F1A45878-->  <SQLLOGIC><![CDATA[SELECT coalesce(sum(psd.doubtfuldebt_amount),0) FROM fin_payment_scheduledetail psd left join fin_payment_detail pd on psd.fin_payment_detail_id = pd.fin_payment_detail_id left join fin_payment p on pd.fin_payment_id = p.fin_payment_id WHERE psd.fin_payment_schedule_invoice = fin_payment_schedule_id and psd.isinvoicepaid = 'N']]></SQLLOGIC>
 <!--2D56F14A0C524D8F95282389F1A45878--></AD_COLUMN>
 
+<!--2D64DA0BA824432DB229752F8B22A487--><AD_COLUMN>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <AD_COLUMN_ID><![CDATA[2D64DA0BA824432DB229752F8B22A487]]></AD_COLUMN_ID>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <NAME><![CDATA[Created By]]></NAME>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <DESCRIPTION><![CDATA[User who created this records]]></DESCRIPTION>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <HELP><![CDATA[The Created By field indicates the user who created this record.]]></HELP>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <COLUMNNAME><![CDATA[Createdby]]></COLUMNNAME>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <AD_TABLE_ID><![CDATA[8FF90F99857D4F0F842FE3B2C356E9B4]]></AD_TABLE_ID>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <AD_ELEMENT_ID><![CDATA[246]]></AD_ELEMENT_ID>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <POSITION><![CDATA[6]]></POSITION>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--2D64DA0BA824432DB229752F8B22A487--></AD_COLUMN>
+
 <!--2D699F3974F64AFD8A48DC90748F4DBE--><AD_COLUMN>
 <!--2D699F3974F64AFD8A48DC90748F4DBE-->  <AD_COLUMN_ID><![CDATA[2D699F3974F64AFD8A48DC90748F4DBE]]></AD_COLUMN_ID>
 <!--2D699F3974F64AFD8A48DC90748F4DBE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -231655,6 +231760,42 @@
 <!--36D80698B9BF4F46BB523AC48EBA40CD-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--36D80698B9BF4F46BB523AC48EBA40CD--></AD_COLUMN>
 
+<!--36DE0332BC8240C7AC6AF5A1867EAC60--><AD_COLUMN>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <AD_COLUMN_ID><![CDATA[36DE0332BC8240C7AC6AF5A1867EAC60]]></AD_COLUMN_ID>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <NAME><![CDATA[Client]]></NAME>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <COLUMNNAME><![CDATA[AD_Client_ID]]></COLUMNNAME>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <AD_TABLE_ID><![CDATA[8FF90F99857D4F0F842FE3B2C356E9B4]]></AD_TABLE_ID>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <DEFAULTVALUE><![CDATA[@AD_CLIENT_ID@]]></DEFAULTVALUE>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <AD_ELEMENT_ID><![CDATA[102]]></AD_ELEMENT_ID>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <POSITION><![CDATA[2]]></POSITION>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60--></AD_COLUMN>
+
 <!--36EFD16DCDE148C5AE42895FD64F58FD--><AD_COLUMN>
 <!--36EFD16DCDE148C5AE42895FD64F58FD-->  <AD_COLUMN_ID><![CDATA[36EFD16DCDE148C5AE42895FD64F58FD]]></AD_COLUMN_ID>
 <!--36EFD16DCDE148C5AE42895FD64F58FD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -281329,6 +281470,42 @@
 <!--8391DD88AF66E827E040007F01016D35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--8391DD88AF66E827E040007F01016D35--></AD_COLUMN>
 
+<!--83B57470A50D49F5830CE6F8F947F993--><AD_COLUMN>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <AD_COLUMN_ID><![CDATA[83B57470A50D49F5830CE6F8F947F993]]></AD_COLUMN_ID>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <NAME><![CDATA[Updated]]></NAME>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <AD_TABLE_ID><![CDATA[8FF90F99857D4F0F842FE3B2C356E9B4]]></AD_TABLE_ID>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <AD_ELEMENT_ID><![CDATA[607]]></AD_ELEMENT_ID>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <POSITION><![CDATA[7]]></POSITION>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--83B57470A50D49F5830CE6F8F947F993--></AD_COLUMN>
+
 <!--8412930246D8472BA11E4B067115CD48--><AD_COLUMN>
 <!--8412930246D8472BA11E4B067115CD48-->  <AD_COLUMN_ID><![CDATA[8412930246D8472BA11E4B067115CD48]]></AD_COLUMN_ID>
 <!--8412930246D8472BA11E4B067115CD48-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -306446,6 +306623,42 @@
 <!--B928FFF6908B0124E040007F01004E03-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--B928FFF6908B0124E040007F01004E03--></AD_COLUMN>
 
+<!--B930E5F7089142CE90ABE9C5B01F59B2--><AD_COLUMN>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <AD_COLUMN_ID><![CDATA[B930E5F7089142CE90ABE9C5B01F59B2]]></AD_COLUMN_ID>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <NAME><![CDATA[Creation Date]]></NAME>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <DESCRIPTION><![CDATA[The date that this record is completed.]]></DESCRIPTION>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <HELP><![CDATA[The Created field indicates the date that this record was created.]]></HELP>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <COLUMNNAME><![CDATA[Created]]></COLUMNNAME>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <AD_TABLE_ID><![CDATA[8FF90F99857D4F0F842FE3B2C356E9B4]]></AD_TABLE_ID>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <AD_ELEMENT_ID><![CDATA[245]]></AD_ELEMENT_ID>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <POSITION><![CDATA[5]]></POSITION>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--B930E5F7089142CE90ABE9C5B01F59B2--></AD_COLUMN>
+
 <!--B9336FB7C2B0400EB495358FAB55E17F--><AD_COLUMN>
 <!--B9336FB7C2B0400EB495358FAB55E17F-->  <AD_COLUMN_ID><![CDATA[B9336FB7C2B0400EB495358FAB55E17F]]></AD_COLUMN_ID>
 <!--B9336FB7C2B0400EB495358FAB55E17F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -307500,6 +307713,44 @@
 <!--BACF545D3162DE54E040007F01006998-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--BACF545D3162DE54E040007F01006998--></AD_COLUMN>
 
+<!--BAE18F6D77384FA0AFF85A092F7655C9--><AD_COLUMN>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <AD_COLUMN_ID><![CDATA[BAE18F6D77384FA0AFF85A092F7655C9]]></AD_COLUMN_ID>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <NAME><![CDATA[Active]]></NAME>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <HELP><![CDATA[There are two methods of making records unavailable in the system: One is to delete the record, the other is to de-activate the record. A de-activated record is not available for selection, but available for reporting. There are two reasons for de-activating and not deleting records: 
+(1) The system requires the record for auditing purposes.
+(2) The record is referenced by other records. E.g., you cannot delete a Business Partner, if there are existing invoices for it. By de-activating the Business Partner you prevent it from being used in future transactions.]]></HELP>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <COLUMNNAME><![CDATA[Isactive]]></COLUMNNAME>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <AD_TABLE_ID><![CDATA[8FF90F99857D4F0F842FE3B2C356E9B4]]></AD_TABLE_ID>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <AD_ELEMENT_ID><![CDATA[348]]></AD_ELEMENT_ID>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <POSITION><![CDATA[4]]></POSITION>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--BAE18F6D77384FA0AFF85A092F7655C9--></AD_COLUMN>
+
 <!--BAE2D17A6582452F9B756C8BC88FACBE--><AD_COLUMN>
 <!--BAE2D17A6582452F9B756C8BC88FACBE-->  <AD_COLUMN_ID><![CDATA[BAE2D17A6582452F9B756C8BC88FACBE]]></AD_COLUMN_ID>
 <!--BAE2D17A6582452F9B756C8BC88FACBE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -313095,6 +313346,42 @@
 <!--CAE75AF8924D478DB01BFB1B77FBA473-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--CAE75AF8924D478DB01BFB1B77FBA473--></AD_COLUMN>
 
+<!--CB017DFEE5BE4203BC36BD905328B0AE--><AD_COLUMN>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <AD_COLUMN_ID><![CDATA[CB017DFEE5BE4203BC36BD905328B0AE]]></AD_COLUMN_ID>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <NAME><![CDATA[Organization]]></NAME>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <AD_TABLE_ID><![CDATA[8FF90F99857D4F0F842FE3B2C356E9B4]]></AD_TABLE_ID>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <DEFAULTVALUE><![CDATA[@AD_ORG_ID@]]></DEFAULTVALUE>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <POSITION><![CDATA[3]]></POSITION>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--CB017DFEE5BE4203BC36BD905328B0AE--></AD_COLUMN>
+
 <!--CB0FCC032C944B238FC720EEDD6061D2--><AD_COLUMN>
 <!--CB0FCC032C944B238FC720EEDD6061D2-->  <AD_COLUMN_ID><![CDATA[CB0FCC032C944B238FC720EEDD6061D2]]></AD_COLUMN_ID>
 <!--CB0FCC032C944B238FC720EEDD6061D2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -315030,6 +315317,41 @@
 <!--CE328F1A9A0A4A0EA7875B685F863C94-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--CE328F1A9A0A4A0EA7875B685F863C94--></AD_COLUMN>
 
+<!--CE3EEC5836914BEDA7C59F72D06D91D8--><AD_COLUMN>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <AD_COLUMN_ID><![CDATA[CE3EEC5836914BEDA7C59F72D06D91D8]]></AD_COLUMN_ID>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <NAME><![CDATA[Updated By]]></NAME>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <DESCRIPTION><![CDATA[User who updated this records]]></DESCRIPTION>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <HELP><![CDATA[The Updated By field indicates the user who updated this record.]]></HELP>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <COLUMNNAME><![CDATA[Updatedby]]></COLUMNNAME>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <AD_TABLE_ID><![CDATA[8FF90F99857D4F0F842FE3B2C356E9B4]]></AD_TABLE_ID>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <AD_ELEMENT_ID><![CDATA[608]]></AD_ELEMENT_ID>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <POSITION><![CDATA[8]]></POSITION>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8--></AD_COLUMN>
+
 <!--CE4DBA92A2E80C3CE040007F0100316C--><AD_COLUMN>
 <!--CE4DBA92A2E80C3CE040007F0100316C-->  <AD_COLUMN_ID><![CDATA[CE4DBA92A2E80C3CE040007F0100316C]]></AD_COLUMN_ID>
 <!--CE4DBA92A2E80C3CE040007F0100316C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -327088,6 +327410,77 @@
 <!--ED9A643C18EC4A3E811C9A0E20C59B80-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--ED9A643C18EC4A3E811C9A0E20C59B80--></AD_COLUMN>
 
+<!--EDA2301E6E14420BBA6E6D35589B0824--><AD_COLUMN>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <AD_COLUMN_ID><![CDATA[EDA2301E6E14420BBA6E6D35589B0824]]></AD_COLUMN_ID>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <NAME><![CDATA[Included Characteristics]]></NAME>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <DESCRIPTION><![CDATA[Product Characteristics Selection Mode]]></DESCRIPTION>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <HELP><![CDATA[Defines the way Product Characteristics will be selected (including or excluding the taken ones)]]></HELP>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <COLUMNNAME><![CDATA[Characteristics_Selection]]></COLUMNNAME>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <AD_TABLE_ID><![CDATA[800062]]></AD_TABLE_ID>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <AD_REFERENCE_VALUE_ID><![CDATA[800029]]></AD_REFERENCE_VALUE_ID>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <SEQNO><![CDATA[400]]></SEQNO>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <AD_ELEMENT_ID><![CDATA[6559D13B4A0444D7AA9FBCFD21F98E9E]]></AD_ELEMENT_ID>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <POSITION><![CDATA[43]]></POSITION>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--EDA2301E6E14420BBA6E6D35589B0824--></AD_COLUMN>
+
+<!--EDA51A595C0C4FE893801660D87AD9AD--><AD_COLUMN>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <AD_COLUMN_ID><![CDATA[EDA51A595C0C4FE893801660D87AD9AD]]></AD_COLUMN_ID>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <NAME><![CDATA[M_Offer_Characteristic_ID]]></NAME>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <HELP><![CDATA[Definition of a Product Characteristic]]></HELP>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <COLUMNNAME><![CDATA[M_Offer_Characteristic_ID]]></COLUMNNAME>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <AD_TABLE_ID><![CDATA[8FF90F99857D4F0F842FE3B2C356E9B4]]></AD_TABLE_ID>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <ISKEY><![CDATA[Y]]></ISKEY>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <AD_ELEMENT_ID><![CDATA[D69FE5544E75D667E040007F01001784]]></AD_ELEMENT_ID>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <POSITION><![CDATA[1]]></POSITION>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--EDA51A595C0C4FE893801660D87AD9AD--></AD_COLUMN>
+
 <!--EDA6910C9FA81555E040007F010144E5--><AD_COLUMN>
 <!--EDA6910C9FA81555E040007F010144E5-->  <AD_COLUMN_ID><![CDATA[EDA6910C9FA81555E040007F010144E5]]></AD_COLUMN_ID>
 <!--EDA6910C9FA81555E040007F010144E5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -330473,6 +330866,40 @@
 <!--FCA27DEA87A04D738AAB1452C9FE14F7-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--FCA27DEA87A04D738AAB1452C9FE14F7--></AD_COLUMN>
 
+<!--FCA68B79DB904650A60CD5BC389A1036--><AD_COLUMN>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <AD_COLUMN_ID><![CDATA[FCA68B79DB904650A60CD5BC389A1036]]></AD_COLUMN_ID>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <NAME><![CDATA[M_Characteristic_ID]]></NAME>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <HELP><![CDATA[Definition of a Product Characteristic]]></HELP>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <COLUMNNAME><![CDATA[M_Characteristic_ID]]></COLUMNNAME>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <AD_TABLE_ID><![CDATA[8FF90F99857D4F0F842FE3B2C356E9B4]]></AD_TABLE_ID>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <ISPARENT><![CDATA[Y]]></ISPARENT>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <SEQNO><![CDATA[90]]></SEQNO>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <AD_ELEMENT_ID><![CDATA[D69FE5544E75D667E040007F01001784]]></AD_ELEMENT_ID>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <POSITION><![CDATA[10]]></POSITION>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--FCA68B79DB904650A60CD5BC389A1036--></AD_COLUMN>
+
 <!--FCE99F38BC0B43038220279E67815376--><AD_COLUMN>
 <!--FCE99F38BC0B43038220279E67815376-->  <AD_COLUMN_ID><![CDATA[FCE99F38BC0B43038220279E67815376]]></AD_COLUMN_ID>
 <!--FCE99F38BC0B43038220279E67815376-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_ELEMENT.xml	Tue Sep 09 13:08:31 2014 +0200
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml	Wed Sep 10 13:50:06 2014 +0200
@@ -25184,6 +25184,20 @@
 <!--64F864C280D511DD91661FA657CE0B73-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--64F864C280D511DD91661FA657CE0B73--></AD_ELEMENT>
 
+<!--6559D13B4A0444D7AA9FBCFD21F98E9E--><AD_ELEMENT>
+<!--6559D13B4A0444D7AA9FBCFD21F98E9E-->  <AD_ELEMENT_ID><![CDATA[6559D13B4A0444D7AA9FBCFD21F98E9E]]></AD_ELEMENT_ID>
+<!--6559D13B4A0444D7AA9FBCFD21F98E9E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6559D13B4A0444D7AA9FBCFD21F98E9E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6559D13B4A0444D7AA9FBCFD21F98E9E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6559D13B4A0444D7AA9FBCFD21F98E9E-->  <COLUMNNAME><![CDATA[Characteristic_Selection]]></COLUMNNAME>
+<!--6559D13B4A0444D7AA9FBCFD21F98E9E-->  <NAME><![CDATA[Included Characteristics]]></NAME>
+<!--6559D13B4A0444D7AA9FBCFD21F98E9E-->  <PRINTNAME><![CDATA[Product Characteristics Selection Mode]]></PRINTNAME>
+<!--6559D13B4A0444D7AA9FBCFD21F98E9E-->  <DESCRIPTION><![CDATA[Product Characteristics Selection Mode]]></DESCRIPTION>
+<!--6559D13B4A0444D7AA9FBCFD21F98E9E-->  <HELP><![CDATA[Defines the way Product Characteristics will be selected (including or excluding the taken ones)]]></HELP>
+<!--6559D13B4A0444D7AA9FBCFD21F98E9E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6559D13B4A0444D7AA9FBCFD21F98E9E-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--6559D13B4A0444D7AA9FBCFD21F98E9E--></AD_ELEMENT>
+
 <!--65F38EB415F049629A3ED49DD6BABF31--><AD_ELEMENT>
 <!--65F38EB415F049629A3ED49DD6BABF31-->  <AD_ELEMENT_ID><![CDATA[65F38EB415F049629A3ED49DD6BABF31]]></AD_ELEMENT_ID>
 <!--65F38EB415F049629A3ED49DD6BABF31-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Tue Sep 09 13:08:31 2014 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Wed Sep 10 13:50:06 2014 +0200
@@ -182772,6 +182772,33 @@
 <!--19B25B5CCE9F4D809670A9773ABB10CC-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--19B25B5CCE9F4D809670A9773ABB10CC--></AD_FIELD>
 
+<!--19D5946877B649FFB7EE9060020AB602--><AD_FIELD>
+<!--19D5946877B649FFB7EE9060020AB602-->  <AD_FIELD_ID><![CDATA[19D5946877B649FFB7EE9060020AB602]]></AD_FIELD_ID>
+<!--19D5946877B649FFB7EE9060020AB602-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--19D5946877B649FFB7EE9060020AB602-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--19D5946877B649FFB7EE9060020AB602-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--19D5946877B649FFB7EE9060020AB602-->  <NAME><![CDATA[Client]]></NAME>
+<!--19D5946877B649FFB7EE9060020AB602-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--19D5946877B649FFB7EE9060020AB602-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--19D5946877B649FFB7EE9060020AB602-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--19D5946877B649FFB7EE9060020AB602-->  <AD_TAB_ID><![CDATA[D28DF93499FC45D4B1DC4C0029FFA914]]></AD_TAB_ID>
+<!--19D5946877B649FFB7EE9060020AB602-->  <AD_COLUMN_ID><![CDATA[36DE0332BC8240C7AC6AF5A1867EAC60]]></AD_COLUMN_ID>
+<!--19D5946877B649FFB7EE9060020AB602-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--19D5946877B649FFB7EE9060020AB602-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--19D5946877B649FFB7EE9060020AB602-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--19D5946877B649FFB7EE9060020AB602-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--19D5946877B649FFB7EE9060020AB602-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--19D5946877B649FFB7EE9060020AB602-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--19D5946877B649FFB7EE9060020AB602-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--19D5946877B649FFB7EE9060020AB602-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--19D5946877B649FFB7EE9060020AB602-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--19D5946877B649FFB7EE9060020AB602-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--19D5946877B649FFB7EE9060020AB602-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--19D5946877B649FFB7EE9060020AB602-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--19D5946877B649FFB7EE9060020AB602-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--19D5946877B649FFB7EE9060020AB602-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--19D5946877B649FFB7EE9060020AB602--></AD_FIELD>
+
 <!--1A19D2C2CA9042E8A34A71847CA9E7CA--><AD_FIELD>
 <!--1A19D2C2CA9042E8A34A71847CA9E7CA-->  <AD_FIELD_ID><![CDATA[1A19D2C2CA9042E8A34A71847CA9E7CA]]></AD_FIELD_ID>
 <!--1A19D2C2CA9042E8A34A71847CA9E7CA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -193923,6 +193950,35 @@
 <!--3DE09F050A624C9D9E5477D0A94491A1-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--3DE09F050A624C9D9E5477D0A94491A1--></AD_FIELD>
 
+<!--3E3169911F044405AB4ED0F424E84CD5--><AD_FIELD>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <AD_FIELD_ID><![CDATA[3E3169911F044405AB4ED0F424E84CD5]]></AD_FIELD_ID>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <NAME><![CDATA[Included Characteristics]]></NAME>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <DESCRIPTION><![CDATA[Product Characteristics Selection Mode]]></DESCRIPTION>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <HELP><![CDATA[Defines the way Product Characteristics will be selected (including or excluding the taken ones)]]></HELP>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <AD_TAB_ID><![CDATA[800079]]></AD_TAB_ID>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <AD_COLUMN_ID><![CDATA[EDA2301E6E14420BBA6E6D35589B0824]]></AD_COLUMN_ID>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <SEQNO><![CDATA[152]]></SEQNO>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <GRID_SEQNO><![CDATA[155]]></GRID_SEQNO>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--3E3169911F044405AB4ED0F424E84CD5--></AD_FIELD>
+
 <!--3E4741567DA14D638DCD3AA008D18EC3--><AD_FIELD>
 <!--3E4741567DA14D638DCD3AA008D18EC3-->  <AD_FIELD_ID><![CDATA[3E4741567DA14D638DCD3AA008D18EC3]]></AD_FIELD_ID>
 <!--3E4741567DA14D638DCD3AA008D18EC3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -194546,6 +194602,33 @@
 <!--4067AD7F0E8F41FBA5E1FD302A6623C5-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--4067AD7F0E8F41FBA5E1FD302A6623C5--></AD_FIELD>
 
+<!--406CA27D80324D949C3CCB6120EBA84E--><AD_FIELD>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <AD_FIELD_ID><![CDATA[406CA27D80324D949C3CCB6120EBA84E]]></AD_FIELD_ID>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <NAME><![CDATA[Characteristic Value]]></NAME>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <HELP><![CDATA[Identifies a possible value of a Product Characteristic]]></HELP>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <AD_TAB_ID><![CDATA[D28DF93499FC45D4B1DC4C0029FFA914]]></AD_TAB_ID>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <AD_COLUMN_ID><![CDATA[2B9B0E3218C742D4B7FE0F2681294FDC]]></AD_COLUMN_ID>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--406CA27D80324D949C3CCB6120EBA84E--></AD_FIELD>
+
 <!--406CCAB2151D498799711099C60AECD1--><AD_FIELD>
 <!--406CCAB2151D498799711099C60AECD1-->  <AD_FIELD_ID><![CDATA[406CCAB2151D498799711099C60AECD1]]></AD_FIELD_ID>
 <!--406CCAB2151D498799711099C60AECD1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -203291,6 +203374,34 @@
 <!--569E7164AA3BAC7FE040007F01003003-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--569E7164AA3BAC7FE040007F01003003--></AD_FIELD>
 
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2--><AD_FIELD>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <AD_FIELD_ID><![CDATA[56B3BA3CF9024D688DCFAF2B3DD174F2]]></AD_FIELD_ID>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <NAME><![CDATA[Organization]]></NAME>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <AD_TAB_ID><![CDATA[D28DF93499FC45D4B1DC4C0029FFA914]]></AD_TAB_ID>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <AD_COLUMN_ID><![CDATA[CB017DFEE5BE4203BC36BD905328B0AE]]></AD_COLUMN_ID>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2--></AD_FIELD>
+
 <!--56C90AF5286248D2804D12424D687AC1--><AD_FIELD>
 <!--56C90AF5286248D2804D12424D687AC1-->  <AD_FIELD_ID><![CDATA[56C90AF5286248D2804D12424D687AC1]]></AD_FIELD_ID>
 <!--56C90AF5286248D2804D12424D687AC1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -212873,6 +212984,32 @@
 <!--5FF0B38B62ED48A394B5FACE1259D83E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--5FF0B38B62ED48A394B5FACE1259D83E--></AD_FIELD>
 
+<!--6007073CF8AC4E42937C11424D63BACC--><AD_FIELD>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <AD_FIELD_ID><![CDATA[6007073CF8AC4E42937C11424D63BACC]]></AD_FIELD_ID>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <NAME><![CDATA[Characteristic]]></NAME>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <HELP><![CDATA[Definition of a Product Characteristic]]></HELP>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <AD_TAB_ID><![CDATA[D28DF93499FC45D4B1DC4C0029FFA914]]></AD_TAB_ID>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <AD_COLUMN_ID><![CDATA[EDA51A595C0C4FE893801660D87AD9AD]]></AD_COLUMN_ID>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--6007073CF8AC4E42937C11424D63BACC--></AD_FIELD>
+
 <!--600FD4C80DCC42AF82AEF75DCC7BC961--><AD_FIELD>
 <!--600FD4C80DCC42AF82AEF75DCC7BC961-->  <AD_FIELD_ID><![CDATA[600FD4C80DCC42AF82AEF75DCC7BC961]]></AD_FIELD_ID>
 <!--600FD4C80DCC42AF82AEF75DCC7BC961-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -222668,7 +222805,8 @@
 <!--79DD2F85FF0A49A4B79E076566795E54-->  <AD_COLUMN_ID><![CDATA[283EA4C588214FF9987F6BEE7F27C9CC]]></AD_COLUMN_ID>
 <!--79DD2F85FF0A49A4B79E076566795E54-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--79DD2F85FF0A49A4B79E076566795E54-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--79DD2F85FF0A49A4B79E076566795E54-->  <DISPLAYLOGIC><![CDATA[@M_Offer_Type_ID@!'20E4EC27397344309A2185097392D964' & @M_Offer_Type_ID@!'7B49D8CC4E084A75B7CB4D85A6A3A578' & @M_Offer_Type_ID@!'8338556C0FBF45249512DB343FEFD280' & @M_Offer_Type_ID@!'D1D193305A6443B09B299259493B272A']]></DISPLAYLOGIC>
+<!--79DD2F85FF0A49A4B79E076566795E54-->  <DISPLAYLOGIC><![CDATA[@M_Offer_Type_ID@!'20E4EC27397344309A2185097392D964' & @M_Offer_Type_ID@!'7B49D8CC4E084A75B7CB4D85A6A3A578' & @M_Offer_Type_ID@!'8338556C0FBF45249512DB343FEFD280' & @M_Offer_Type_ID@!'D1D193305A6443B09B299259493B272A' & 
+@M_Offer_Type_ID@!'BE5D42E554644B6AA262CCB097753951']]></DISPLAYLOGIC>
 <!--79DD2F85FF0A49A4B79E076566795E54-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--79DD2F85FF0A49A4B79E076566795E54-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--79DD2F85FF0A49A4B79E076566795E54-->  <SEQNO><![CDATA[90]]></SEQNO>
@@ -263185,6 +263323,33 @@
 <!--C37BA16A2D2F4917BAACFAFD32DF6BDC-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--C37BA16A2D2F4917BAACFAFD32DF6BDC--></AD_FIELD>
 
+<!--C384006BD6DC400585A2788E76C8A5E8--><AD_FIELD>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <AD_FIELD_ID><![CDATA[C384006BD6DC400585A2788E76C8A5E8]]></AD_FIELD_ID>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <NAME><![CDATA[Characteristic]]></NAME>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <HELP><![CDATA[Definition of a Product Characteristic]]></HELP>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <AD_TAB_ID><![CDATA[D28DF93499FC45D4B1DC4C0029FFA914]]></AD_TAB_ID>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <AD_COLUMN_ID><![CDATA[FCA68B79DB904650A60CD5BC389A1036]]></AD_COLUMN_ID>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--C384006BD6DC400585A2788E76C8A5E8--></AD_FIELD>
+
 <!--C3851545D3EC83AAE040007F01000897--><AD_FIELD>
 <!--C3851545D3EC83AAE040007F01000897-->  <AD_FIELD_ID><![CDATA[C3851545D3EC83AAE040007F01000897]]></AD_FIELD_ID>
 <!--C3851545D3EC83AAE040007F01000897-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -278654,6 +278819,36 @@
 <!--E2A219F80DF744D590A3953A5CFCBC63-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--E2A219F80DF744D590A3953A5CFCBC63--></AD_FIELD>
 
+<!--E2A3E81260FB48F3B0DD029D747CA5B1--><AD_FIELD>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <AD_FIELD_ID><![CDATA[E2A3E81260FB48F3B0DD029D747CA5B1]]></AD_FIELD_ID>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <NAME><![CDATA[Active]]></NAME>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <HELP><![CDATA[There are two methods of making records unavailable in the system: One is to delete the record, the other is to de-activate the record. A de-activated record is not available for selection, but available for reporting. There are two reasons for de-activating and not deleting records: 
+(1) The system requires the record for auditing purposes.
+(2) The record is referenced by other records. E.g., you cannot delete a Business Partner, if there are existing invoices for it. By de-activating the Business Partner you prevent it from being used in future transactions.]]></HELP>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <AD_TAB_ID><![CDATA[D28DF93499FC45D4B1DC4C0029FFA914]]></AD_TAB_ID>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <AD_COLUMN_ID><![CDATA[BAE18F6D77384FA0AFF85A092F7655C9]]></AD_COLUMN_ID>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1--></AD_FIELD>
+
 <!--E2BCC1ABBC3142A999E7AEFA1F757B1A--><AD_FIELD>
 <!--E2BCC1ABBC3142A999E7AEFA1F757B1A-->  <AD_FIELD_ID><![CDATA[E2BCC1ABBC3142A999E7AEFA1F757B1A]]></AD_FIELD_ID>
 <!--E2BCC1ABBC3142A999E7AEFA1F757B1A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -283334,6 +283529,34 @@
 <!--F3B4EB362BFD4277B79591C0AE3B7D9E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--F3B4EB362BFD4277B79591C0AE3B7D9E--></AD_FIELD>
 
+<!--F3CABB1B744B4E3E99D3F6C687534779--><AD_FIELD>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <AD_FIELD_ID><![CDATA[F3CABB1B744B4E3E99D3F6C687534779]]></AD_FIELD_ID>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <NAME><![CDATA[Promotion/Discount]]></NAME>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <AD_TAB_ID><![CDATA[D28DF93499FC45D4B1DC4C0029FFA914]]></AD_TAB_ID>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <AD_COLUMN_ID><![CDATA[01730FB593B944F7AE8DCF140C9B6C90]]></AD_COLUMN_ID>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--F3CABB1B744B4E3E99D3F6C687534779--></AD_FIELD>
+
 <!--F4048AFA184E446AA24D564F837A1185--><AD_FIELD>
 <!--F4048AFA184E446AA24D564F837A1185-->  <AD_FIELD_ID><![CDATA[F4048AFA184E446AA24D564F837A1185]]></AD_FIELD_ID>
 <!--F4048AFA184E446AA24D564F837A1185-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 09 13:08:31 2014 +0200
+++ b/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 10 13:50:06 2014 +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.24341]]></VERSION>
+<!--0-->  <VERSION><![CDATA[3.0.24417]]></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>
--- a/src-db/database/sourcedata/AD_REFERENCE.xml	Tue Sep 09 13:08:31 2014 +0200
+++ b/src-db/database/sourcedata/AD_REFERENCE.xml	Wed Sep 10 13:50:06 2014 +0200
@@ -5879,6 +5879,18 @@
 <!--AD93286C917A4A74BE5898FD0158100A-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
 <!--AD93286C917A4A74BE5898FD0158100A--></AD_REFERENCE>
 
+<!--ADE80203FF1D4143854E6B938CF3E8B9--><AD_REFERENCE>
+<!--ADE80203FF1D4143854E6B938CF3E8B9-->  <AD_REFERENCE_ID><![CDATA[ADE80203FF1D4143854E6B938CF3E8B9]]></AD_REFERENCE_ID>
+<!--ADE80203FF1D4143854E6B938CF3E8B9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ADE80203FF1D4143854E6B938CF3E8B9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ADE80203FF1D4143854E6B938CF3E8B9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ADE80203FF1D4143854E6B938CF3E8B9-->  <NAME><![CDATA[Characteristic Selector w/ filter]]></NAME>
+<!--ADE80203FF1D4143854E6B938CF3E8B9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ADE80203FF1D4143854E6B938CF3E8B9-->  <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
+<!--ADE80203FF1D4143854E6B938CF3E8B9-->  <PARENTREFERENCE_ID><![CDATA[8C57A4A2E05F4261A1FADF47C30398AD]]></PARENTREFERENCE_ID>
+<!--ADE80203FF1D4143854E6B938CF3E8B9-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
+<!--ADE80203FF1D4143854E6B938CF3E8B9--></AD_REFERENCE>
+
 <!--AE201981DDC0467FB59F64CA978C749F--><AD_REFERENCE>
 <!--AE201981DDC0467FB59F64CA978C749F-->  <AD_REFERENCE_ID><![CDATA[AE201981DDC0467FB59F64CA978C749F]]></AD_REFERENCE_ID>
 <!--AE201981DDC0467FB59F64CA978C749F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_REF_TREE.xml	Tue Sep 09 13:08:31 2014 +0200
+++ b/src-db/database/sourcedata/AD_REF_TREE.xml	Wed Sep 10 13:50:06 2014 +0200
@@ -14,4 +14,18 @@
 <!--95582A51651D415993D0FD3B64C8E861-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--95582A51651D415993D0FD3B64C8E861--></AD_REF_TREE>
 
+<!--FC3C572D3FF64B7AAC4C279C45235795--><AD_REF_TREE>
+<!--FC3C572D3FF64B7AAC4C279C45235795-->  <AD_REF_TREE_ID><![CDATA[FC3C572D3FF64B7AAC4C279C45235795]]></AD_REF_TREE_ID>
+<!--FC3C572D3FF64B7AAC4C279C45235795-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FC3C572D3FF64B7AAC4C279C45235795-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FC3C572D3FF64B7AAC4C279C45235795-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FC3C572D3FF64B7AAC4C279C45235795-->  <AD_REFERENCE_ID><![CDATA[ADE80203FF1D4143854E6B938CF3E8B9]]></AD_REFERENCE_ID>
+<!--FC3C572D3FF64B7AAC4C279C45235795-->  <AD_TABLE_ID><![CDATA[E913D17C9B3847CF92235082DBE2EC44]]></AD_TABLE_ID>
+<!--FC3C572D3FF64B7AAC4C279C45235795-->  <WHERECLAUSE><![CDATA[e.characteristic.id =@inpmCharacteristicId@]]></WHERECLAUSE>
+<!--FC3C572D3FF64B7AAC4C279C45235795-->  <VALUEFIELD_ID><![CDATA[ECE4447ED4F44F98A131EB1AA09F5817]]></VALUEFIELD_ID>
+<!--FC3C572D3FF64B7AAC4C279C45235795-->  <DISPLAYFIELD_ID><![CDATA[BB9B971B2D774C59B3B1AD0A76CC9294]]></DISPLAYFIELD_ID>
+<!--FC3C572D3FF64B7AAC4C279C45235795-->  <AD_TABLE_TREE_ID><![CDATA[B6C7204712CC4EDEB5705C93F706DF05]]></AD_TABLE_TREE_ID>
+<!--FC3C572D3FF64B7AAC4C279C45235795-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FC3C572D3FF64B7AAC4C279C45235795--></AD_REF_TREE>
+
 </data>
--- a/src-db/database/sourcedata/AD_REF_TREE_FIELD.xml	Tue Sep 09 13:08:31 2014 +0200
+++ b/src-db/database/sourcedata/AD_REF_TREE_FIELD.xml	Wed Sep 10 13:50:06 2014 +0200
@@ -36,4 +36,40 @@
 <!--7B82AF2B5C2C48CDB05C78BA3DC26989-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--7B82AF2B5C2C48CDB05C78BA3DC26989--></AD_REF_TREE_FIELD>
 
+<!--BB9B971B2D774C59B3B1AD0A76CC9294--><AD_REF_TREE_FIELD>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294-->  <AD_REF_TREE_FIELD_ID><![CDATA[BB9B971B2D774C59B3B1AD0A76CC9294]]></AD_REF_TREE_FIELD_ID>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294-->  <AD_REF_TREE_ID><![CDATA[FC3C572D3FF64B7AAC4C279C45235795]]></AD_REF_TREE_ID>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294-->  <NAME><![CDATA[name]]></NAME>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294-->  <PROPERTY><![CDATA[name]]></PROPERTY>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294-->  <SORT><![CDATA[N]]></SORT>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294-->  <SORTNO><![CDATA[0]]></SORTNO>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294-->  <SHOWINPICKLIST><![CDATA[Y]]></SHOWINPICKLIST>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294--></AD_REF_TREE_FIELD>
+
+<!--ECE4447ED4F44F98A131EB1AA09F5817--><AD_REF_TREE_FIELD>
+<!--ECE4447ED4F44F98A131EB1AA09F5817-->  <AD_REF_TREE_FIELD_ID><![CDATA[ECE4447ED4F44F98A131EB1AA09F5817]]></AD_REF_TREE_FIELD_ID>
+<!--ECE4447ED4F44F98A131EB1AA09F5817-->  <AD_REF_TREE_ID><![CDATA[FC3C572D3FF64B7AAC4C279C45235795]]></AD_REF_TREE_ID>
+<!--ECE4447ED4F44F98A131EB1AA09F5817-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ECE4447ED4F44F98A131EB1AA09F5817-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ECE4447ED4F44F98A131EB1AA09F5817-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ECE4447ED4F44F98A131EB1AA09F5817-->  <NAME><![CDATA[ID]]></NAME>
+<!--ECE4447ED4F44F98A131EB1AA09F5817-->  <PROPERTY><![CDATA[id]]></PROPERTY>
+<!--ECE4447ED4F44F98A131EB1AA09F5817-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--ECE4447ED4F44F98A131EB1AA09F5817-->  <SORT><![CDATA[N]]></SORT>
+<!--ECE4447ED4F44F98A131EB1AA09F5817-->  <FILTER><![CDATA[N]]></FILTER>
+<!--ECE4447ED4F44F98A131EB1AA09F5817-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
+<!--ECE4447ED4F44F98A131EB1AA09F5817-->  <SHOWINGRID><![CDATA[N]]></SHOWINGRID>
+<!--ECE4447ED4F44F98A131EB1AA09F5817-->  <SORTNO><![CDATA[0]]></SORTNO>
+<!--ECE4447ED4F44F98A131EB1AA09F5817-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ECE4447ED4F44F98A131EB1AA09F5817-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--ECE4447ED4F44F98A131EB1AA09F5817--></AD_REF_TREE_FIELD>
+
 </data>
--- a/src-db/database/sourcedata/AD_TAB.xml	Tue Sep 09 13:08:31 2014 +0200
+++ b/src-db/database/sourcedata/AD_TAB.xml	Wed Sep 10 13:50:06 2014 +0200
@@ -17878,6 +17878,37 @@
 <!--D173CDA24A0C431A94CEE845DC1E6290-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
 <!--D173CDA24A0C431A94CEE845DC1E6290--></AD_TAB>
 
+<!--D28DF93499FC45D4B1DC4C0029FFA914--><AD_TAB>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <AD_TAB_ID><![CDATA[D28DF93499FC45D4B1DC4C0029FFA914]]></AD_TAB_ID>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <NAME><![CDATA[Characteristics]]></NAME>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <DESCRIPTION><![CDATA[Add product characteristics in order to include or exclude them from a selected Promotion/Discount..]]></DESCRIPTION>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <HELP><![CDATA[Add product characteristics in order to include or exclude them from a selected Promotion/Discount..]]></HELP>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <AD_TABLE_ID><![CDATA[8FF90F99857D4F0F842FE3B2C356E9B4]]></AD_TABLE_ID>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <AD_WINDOW_ID><![CDATA[800028]]></AD_WINDOW_ID>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <TABLEVEL><![CDATA[1]]></TABLEVEL>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <ISSINGLEROW><![CDATA[N]]></ISSINGLEROW>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <ISINFOTAB><![CDATA[N]]></ISINFOTAB>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <ISTRANSLATIONTAB><![CDATA[N]]></ISTRANSLATIONTAB>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <HASTREE><![CDATA[N]]></HASTREE>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <PROCESSING><![CDATA[N]]></PROCESSING>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <IMPORTFIELDS><![CDATA[N]]></IMPORTFIELDS>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <ISREADONLYTREE><![CDATA[N]]></ISREADONLYTREE>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <ISSHOWTREENODEICONS><![CDATA[Y]]></ISSHOWTREENODEICONS>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
+<!--D28DF93499FC45D4B1DC4C0029FFA914--></AD_TAB>
+
 <!--D53F675ADB2745059623175D8870A721--><AD_TAB>
 <!--D53F675ADB2745059623175D8870A721-->  <AD_TAB_ID><![CDATA[D53F675ADB2745059623175D8870A721]]></AD_TAB_ID>
 <!--D53F675ADB2745059623175D8870A721-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_TABLE.xml	Tue Sep 09 13:08:31 2014 +0200
+++ b/src-db/database/sourcedata/AD_TABLE.xml	Wed Sep 10 13:50:06 2014 +0200
@@ -10857,6 +10857,31 @@
 <!--8FD3DEA921D74CAFB5D4296A0375E958-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--8FD3DEA921D74CAFB5D4296A0375E958--></AD_TABLE>
 
+<!--8FF90F99857D4F0F842FE3B2C356E9B4--><AD_TABLE>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <AD_TABLE_ID><![CDATA[8FF90F99857D4F0F842FE3B2C356E9B4]]></AD_TABLE_ID>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <NAME><![CDATA[PricingAdjustmentCharacteristic]]></NAME>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <DESCRIPTION><![CDATA[Characteristic configuration]]></DESCRIPTION>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <HELP><![CDATA[Used to select the product characteristics related to the Price Adjustment.]]></HELP>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <TABLENAME><![CDATA[M_Offer_Characteristic]]></TABLENAME>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <CLASSNAME><![CDATA[Characteristic]]></CLASSNAME>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <ISVIEW><![CDATA[N]]></ISVIEW>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <AD_WINDOW_ID><![CDATA[800028]]></AD_WINDOW_ID>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <ISSECURITYENABLED><![CDATA[N]]></ISSECURITYENABLED>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <ISDELETEABLE><![CDATA[Y]]></ISDELETEABLE>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <ISHIGHVOLUME><![CDATA[N]]></ISHIGHVOLUME>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <IMPORTTABLE><![CDATA[N]]></IMPORTTABLE>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <ISCHANGELOG><![CDATA[N]]></ISCHANGELOG>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <ISDEFAULTACCT><![CDATA[N]]></ISDEFAULTACCT>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <AD_PACKAGE_ID><![CDATA[5A3ED54AB1F54B84E040007F01006125]]></AD_PACKAGE_ID>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <ISTREE><![CDATA[N]]></ISTREE>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4--></AD_TABLE>
+
 <!--9072A1C049584DB69E4F42AE20B5CB66--><AD_TABLE>
 <!--9072A1C049584DB69E4F42AE20B5CB66-->  <AD_TABLE_ID><![CDATA[9072A1C049584DB69E4F42AE20B5CB66]]></AD_TABLE_ID>
 <!--9072A1C049584DB69E4F42AE20B5CB66-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Tue Sep 09 13:08:31 2014 +0200
+++ b/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Wed Sep 10 13:50:06 2014 +0200
@@ -233,6 +233,7 @@
 <!--6B8309393CF44CCD977219C72458D625-->  <OBUIAPP_PROCESS_ID><![CDATA[B5C942145F354ABEBC9F16235D80D776]]></OBUIAPP_PROCESS_ID>
 <!--6B8309393CF44CCD977219C72458D625-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--6B8309393CF44CCD977219C72458D625-->  <DISPLAYLOGIC><![CDATA[@Amount@=false & @Default_Conversion_Rate@=false]]></DISPLAYLOGIC>
+<!--6B8309393CF44CCD977219C72458D625-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--6B8309393CF44CCD977219C72458D625-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
 <!--6B8309393CF44CCD977219C72458D625--></OBUIAPP_PARAMETER>
 
@@ -326,6 +327,7 @@
 <!--BD2E03E3599741679722CF98D4DF0B8A-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
 <!--BD2E03E3599741679722CF98D4DF0B8A-->  <OBUIAPP_PROCESS_ID><![CDATA[B5C942145F354ABEBC9F16235D80D776]]></OBUIAPP_PROCESS_ID>
 <!--BD2E03E3599741679722CF98D4DF0B8A-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
+<!--BD2E03E3599741679722CF98D4DF0B8A-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--BD2E03E3599741679722CF98D4DF0B8A-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
 <!--BD2E03E3599741679722CF98D4DF0B8A--></OBUIAPP_PARAMETER>
 
@@ -372,6 +374,7 @@
 <!--C114239B5A004A45B27C7C6DA7D9EB14-->  <OBUIAPP_PROCESS_ID><![CDATA[B5C942145F354ABEBC9F16235D80D776]]></OBUIAPP_PROCESS_ID>
 <!--C114239B5A004A45B27C7C6DA7D9EB14-->  <STARTINNEWLINE><![CDATA[Y]]></STARTINNEWLINE>
 <!--C114239B5A004A45B27C7C6DA7D9EB14-->  <DISPLAYLOGIC><![CDATA[@Amount@=true]]></DISPLAYLOGIC>
+<!--C114239B5A004A45B27C7C6DA7D9EB14-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--C114239B5A004A45B27C7C6DA7D9EB14-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
 <!--C114239B5A004A45B27C7C6DA7D9EB14--></OBUIAPP_PARAMETER>
 
@@ -397,6 +400,7 @@
 <!--CBC804D8326C443985FB4A62D2EC7FD4-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
 <!--CBC804D8326C443985FB4A62D2EC7FD4-->  <OBUIAPP_PROCESS_ID><![CDATA[B5C942145F354ABEBC9F16235D80D776]]></OBUIAPP_PROCESS_ID>
 <!--CBC804D8326C443985FB4A62D2EC7FD4-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
+<!--CBC804D8326C443985FB4A62D2EC7FD4-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--CBC804D8326C443985FB4A62D2EC7FD4-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
 <!--CBC804D8326C443985FB4A62D2EC7FD4--></OBUIAPP_PARAMETER>
 
@@ -491,6 +495,7 @@
 <!--F693A2C4889646C8AFD301133F7B0C1F-->  <OBUIAPP_PROCESS_ID><![CDATA[B5C942145F354ABEBC9F16235D80D776]]></OBUIAPP_PROCESS_ID>
 <!--F693A2C4889646C8AFD301133F7B0C1F-->  <STARTINNEWLINE><![CDATA[Y]]></STARTINNEWLINE>
 <!--F693A2C4889646C8AFD301133F7B0C1F-->  <DISPLAYLOGIC><![CDATA[@Amount@=false]]></DISPLAYLOGIC>
+<!--F693A2C4889646C8AFD301133F7B0C1F-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--F693A2C4889646C8AFD301133F7B0C1F-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
 <!--F693A2C4889646C8AFD301133F7B0C1F--></OBUIAPP_PARAMETER>
 
--- a/src-wad/.classpath	Tue Sep 09 13:08:31 2014 +0200
+++ b/src-wad/.classpath	Wed Sep 10 13:50:06 2014 +0200
@@ -8,8 +8,8 @@
 	<classpathentry kind="lib" path="/openbravo/lib/runtime/ojdbc6.jar"/>
 	<classpathentry kind="lib" path="/openbravo/lib/runtime/postgresql-9.0-801.jdbc4.jar"/>
 	<classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-1.2.16.jar"/>
-	<classpathentry kind="lib" path="/openbravo/lib/runtime/ant-1.7.1.jar"/>
 	<classpathentry kind="lib" path="/openbravo/lib/runtime/commons-collections-3.2.1.jar"/>
 	<classpathentry kind="lib" path="/openbravo/lib/build/servlet-api.jar"/>
+	<classpathentry kind="lib" path="/openbravo/lib/runtime/ant-1.9.2.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment.html	Tue Sep 09 13:08:31 2014 +0200
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment.html	Wed Sep 10 13:50:06 2014 +0200
@@ -11,7 +11,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-2011 Openbravo SLU 
+ * All portions are Copyright (C) 2001-2014 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -32,6 +32,7 @@
   <script language="JavaScript" src="../../../../../web/js/jscalendar/calendar.js" type="text/javascript"></script>
   <script language="JavaScript" type="text/javascript" id="paramLanguage">defaultLang = "en_US";</script>
   <script language="JavaScript" src="../../../../../web/js/windowKeyboard.js" type="text/javascript"></script>
+  <script language="JavaScript" src="../../../../../web/js/appStatus.js" type="text/javascript"></script>
   <script language="JavaScript" src="../utility/DynamicJS.js" type="text/javascript"></script>
   <script language="JavaScript" src="../../../../../web/js/default/MessageBox.js" type="text/javascript"></script>
   <script language="JavaScript" src="../../../../../web/js/searchs.js" type="text/javascript"></script>
@@ -44,6 +45,8 @@
     }
 
     function submitThisPage(strCommand) {
+      disableButton('buttonOK');
+      disableButton('buttonCancel');
       if (validate(strCommand)) {
         var inp= document.frmMain.inpId;
         var total = document.frmMain.inpId.length;
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_ShipmentPO.html	Tue Sep 09 13:08:31 2014 +0200
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_ShipmentPO.html	Wed Sep 10 13:50:06 2014 +0200
@@ -11,7 +11,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-2013 Openbravo SLU 
+ * All portions are Copyright (C) 2001-2014 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -32,6 +32,7 @@
   <script language="JavaScript" src="../../../../../web/js/jscalendar/calendar.js" type="text/javascript"></script>
   <script language="JavaScript" type="text/javascript" id="paramLanguage">defaultLang = "en_US";</script>
   <script language="JavaScript" src="../../../../../web/js/windowKeyboard.js" type="text/javascript"></script>
+  <script language="JavaScript" src="../../../../../web/js/appStatus.js" type="text/javascript"></script>
   <script language="JavaScript" src="../utility/DynamicJS.js" type="text/javascript"></script>
   <script language="JavaScript" src="../../../../../web/js/default/MessageBox.js" type="text/javascript"></script>
   <script language="JavaScript" src="../../../../../web/js/searchs.js" type="text/javascript"></script>
@@ -44,6 +45,8 @@
     }
 
     function submitThisPage(strCommand) {
+      disableButton('buttonOK');
+      disableButton('buttonCancel');
       if (validate(strCommand)) {
         var inp= document.frmMain.inpId; 
         var total = document.frmMain.inpId.length;
--- a/src/org/openbravo/erpCommon/ad_forms/DocMatchInv.java	Tue Sep 09 13:08:31 2014 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/DocMatchInv.java	Wed Sep 10 13:50:06 2014 +0200
@@ -28,9 +28,9 @@
 import org.apache.log4j.Logger;
 import org.openbravo.base.secureApp.VariablesSecureApp;
 import org.openbravo.base.structure.BaseOBObject;
-import org.openbravo.costing.CostingAlgorithm.CostDimension;
 import org.openbravo.costing.CostingStatus;
 import org.openbravo.costing.CostingUtils;
+import org.openbravo.costing.CostingAlgorithm.CostDimension;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.data.FieldProvider;
@@ -66,8 +66,8 @@
     super(AD_Client_ID, AD_Org_ID, connectionProvider);
   }
 
-  public void loadObjectFieldProvider(ConnectionProvider conn, @SuppressWarnings("hiding")
-  String AD_Client_ID, String Id) throws ServletException {
+  public void loadObjectFieldProvider(ConnectionProvider conn,
+      @SuppressWarnings("hiding") String AD_Client_ID, String Id) throws ServletException {
     setObjectFieldProvider(DocMatchInvData.selectRegistro(conn, AD_Client_ID, Id));
   }
 
@@ -250,9 +250,8 @@
       // If the Product is not checked as book using PO Price, the Cost of the
       // Transaction will be used to create the FactAcct Line
       MaterialTransaction transaction = getTransaction(Record_ID);
-      Organization legalEntity = OBContext.getOBContext()
-          .getOrganizationStructureProvider(AD_Client_ID)
-          .getLegalEntity(inOutLine.getShipmentReceipt().getOrganization());
+      Organization legalEntity = OBContext.getOBContext().getOrganizationStructureProvider(
+          AD_Client_ID).getLegalEntity(inOutLine.getShipmentReceipt().getOrganization());
       HashMap<CostDimension, BaseOBObject> costDimensions = CostingUtils.getEmptyDimensions();
       if (inOutLine.getStorageBin() == null) {
         costDimensions.put(CostDimension.Warehouse, inOutLine.getShipmentReceipt().getWarehouse());
@@ -264,10 +263,8 @@
             .getShipmentReceipt().getAccountingDate(), costDimensions)) {
           Map<String, String> parameters = new HashMap<String, String>();
           parameters.put("Product", inOutLine.getProduct().getIdentifier());
-          parameters.put(
-              "Date",
-              (OBDateUtils.formatDate(OBDal.getInstance().get(ReceiptInvoiceMatch.class, Record_ID)
-                  .getTransactionDate())).toString());
+          parameters.put("Date", (OBDateUtils.formatDate(OBDal.getInstance().get(
+              ReceiptInvoiceMatch.class, Record_ID).getTransactionDate())).toString());
           setMessageResult(conn, STATUS_InvalidCost, "error", parameters);
           throw new IllegalStateException();
 
@@ -298,8 +295,8 @@
       bdCost = CostingStatus.getInstance().isMigrated() ? trxCost.divide(
           transaction == null ? new BigDecimal(data[0].getField("Qty")).abs() : transaction
               .getMovementQuantity().abs(), 10, RoundingMode.HALF_UP) : new BigDecimal(
-          DocMatchInvData.selectProductAverageCost(conn, data[0].getField("M_Product_Id"),
-              data[0].getField("orderAcctDate")));
+          DocMatchInvData.selectProductAverageCost(conn, data[0].getField("M_Product_Id"), data[0]
+              .getField("orderAcctDate")));
       Long scale = costCurrency.getStandardPrecision();
       BigDecimal bdQty = new BigDecimal(data[0].getField("Qty"));
       bdCost = bdCost.multiply(bdQty).setScale(scale.intValue(), RoundingMode.HALF_UP);
@@ -314,8 +311,8 @@
     String strRecordId = invoiceData[0].cInvoiceId;
     String strReceiptDate = data[0].getField("ORDERDATEACCT");
     BigDecimal bdExpenses = new BigDecimal(strExpenses);
-    if ((new BigDecimal(data[0].getField("QTYINVOICED")).signum() != (new BigDecimal(
-        data[0].getField("MOVEMENTQTY"))).signum())
+    if ((new BigDecimal(data[0].getField("QTYINVOICED")).signum() != (new BigDecimal(data[0]
+        .getField("MOVEMENTQTY"))).signum())
         && data[0].getField("InOutStatus").equals("VO")) {
       bdExpenses = bdExpenses.multiply(new BigDecimal(-1));
     }
@@ -370,18 +367,21 @@
     BigDecimal totalLines = BigDecimal.ZERO;
     for (int i = 0; i < p_lines.length; i++) {
       DocLine_Invoice line = (DocLine_Invoice) p_lines[i];
-      BigDecimal lineAmount = bdExpensesAcctCurrency.multiply(new BigDecimal(line.getAmount()))
-          .divide(
-              new BigDecimal(invoiceData[0].linenetamt),
-              OBDal.getInstance().get(Currency.class, strInvoiceCurrency).getStandardPrecision()
-                  .intValue(), BigDecimal.ROUND_HALF_UP);
-      if (i == p_lines.length - 1) {
-        lineAmount = bdExpensesAcctCurrency.subtract(totalLines);
+      BigDecimal lineAmount = BigDecimal.ZERO;
+      BigDecimal linenetamt = new BigDecimal(invoiceData[0].linenetamt);
+      if (!(linenetamt.compareTo(BigDecimal.ZERO) == 0)) {
+        lineAmount = bdExpensesAcctCurrency.multiply(new BigDecimal(line.getAmount())).divide(
+            linenetamt,
+            OBDal.getInstance().get(Currency.class, strInvoiceCurrency).getStandardPrecision()
+                .intValue(), BigDecimal.ROUND_HALF_UP);
+        if (i == p_lines.length - 1) {
+          lineAmount = bdExpensesAcctCurrency.subtract(totalLines);
+        }
+        cr = fact.createLine(line, p.getAccount(ProductInfo.ACCTTYPE_P_Expense, as, conn),
+            as.m_C_Currency_ID, "0", lineAmount.toString(), Fact_Acct_Group_ID, nextSeqNo(SeqNo),
+            DocumentType, conn);
+        totalLines = totalLines.add(lineAmount);
       }
-      cr = fact.createLine(line, p.getAccount(ProductInfo.ACCTTYPE_P_Expense, as, conn),
-          as.m_C_Currency_ID, "0", lineAmount.toString(), Fact_Acct_Group_ID, nextSeqNo(SeqNo),
-          DocumentType, conn);
-      totalLines = totalLines.add(lineAmount);
     }
     if (cr == null && ZERO.compareTo(bdExpenses) != 0) {
       log4j.warn("createFact - unable to calculate line with "
--- a/src/org/openbravo/erpCommon/ad_reports/OrderEdition_data.xsql	Tue Sep 09 13:08:31 2014 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/OrderEdition_data.xsql	Wed Sep 10 13:50:06 2014 +0200
@@ -12,7 +12,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-2014 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -43,7 +43,8 @@
 	  C_ORDERLINE.AD_CLIENT_ID AS TRANSCLIENTID, 	  
 	  C_ORDERLINE.AD_ORG_ID AS TRANSORGID 
       FROM C_ORDER left join C_PROJECT on C_ORDER.C_PROJECT_ID = C_PROJECT.C_PROJECT_ID
-                   left join C_LOCATION on C_PROJECT.C_LOCATION_ID = C_LOCATION.C_LOCATION_ID, 
+                   left join C_BPARTNER_LOCATION ON C_ORDER.C_BPARTNER_LOCATION_ID = C_BPARTNER_LOCATION.C_BPARTNER_LOCATION_ID
+                   left join C_LOCATION on C_BPARTNER_LOCATION.C_LOCATION_ID = C_LOCATION.C_LOCATION_ID, 
       C_ORDERLINE, C_BPARTNER, M_PRODUCT, C_UOM, C_DOCTYPE
       WHERE C_ORDER.C_BPARTNER_ID = C_BPARTNER.C_BPARTNER_ID
       AND C_ORDER.C_ORDER_ID = C_ORDERLINE.C_ORDER_ID
--- a/src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderJR.java	Tue Sep 09 13:08:31 2014 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderJR.java	Wed Sep 10 13:50:06 2014 +0200
@@ -213,8 +213,8 @@
       data = OrderEditionData.select(this, strCurrencyId,
           Utility.getContext(this, vars, "#AccessibleOrgTree", "SalesOrderFilterJR"),
           Utility.getContext(this, vars, "#User_Client", "SalesOrderFilterJR"), strdateFrom,
-          strdateTo, strmWarehouseId, strcProjectId, strcRegionId, strmProductCategoryId,
-          strcBpartnerId, strmProductId);
+          strdateTo, strmWarehouseId, strcProjectId, strcRegionId.equals("('')") ? "" : strcRegionId, 
+          strmProductCategoryId, strcBpartnerId, strmProductId);
     } catch (ServletException ex) {
       myMessage = Utility.translateError(this, vars, vars.getLanguage(), ex.getMessage());
     }
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html	Tue Sep 09 13:08:31 2014 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html	Wed Sep 10 13:50:06 2014 +0200
@@ -166,7 +166,7 @@
 
 function addRows(htmlText, id) {
   var jsonTable = eval(htmlText);
-  if (typeof jsonTable != undefined) {
+  if (typeof jsonTable != undefined && jsonTable.hasOwnProperty("rows")) {
   for (i=0; i<jsonTable.rows.length; i++) {
     var node=document.getElementById('funcEvenOddRow1'+id);
     var elem=document.createElement('TR');
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance_data.xsql	Tue Sep 09 13:08:31 2014 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance_data.xsql	Wed Sep 10 13:50:06 2014 +0200
@@ -514,6 +514,8 @@
         SELECT EV.C_ELEMENTVALUE_ID AS ID, EV.VALUE AS ACCOUNT_ID, EV.NAME AS NAME
           FROM C_VALIDCOMBINATION VC, C_ELEMENTVALUE EV
           WHERE VC.ACCOUNT_ID = EV.C_ELEMENTVALUE_ID
+          AND VC.ISACTIVE = 'Y'
+          AND EV.ISACTIVE = 'Y'
           AND VC.C_ACCTSCHEMA_ID = ?
           ORDER BY EV.VALUE
     ]]></Sql>
--- a/src/org/openbravo/erpCommon/businessUtility/PriceAdjustment.java	Tue Sep 09 13:08:31 2014 +0200
+++ b/src/org/openbravo/erpCommon/businessUtility/PriceAdjustment.java	Wed Sep 10 13:50:06 2014 +0200
@@ -229,6 +229,27 @@
     hql += "          and o.organization.id = :org )) ";
     hql += "    ) ";
 
+    // product characteristic
+    hql += "and ((includedCharacteristics='Y' ";
+    hql += "  and not exists (select 1 ";
+    hql += "         from Characteristic c ";
+    hql += "           join c.pricingAdjustmentCharacteristicList pac ";
+    hql += "           join c.productCharacteristicValueList pcv ";
+    hql += "         where  pcv.product = :product ";
+    hql += "          and pac.offer = p ";
+    hql += "          and m_isparent_ch_value(pcv.characteristicValue.id, pac.chValue.id, pac.characteristic.id) != -1 ";
+    hql += "          )) ";
+    hql += "   or (includedCharacteristics='N' ";
+    hql += "  and  exists (select 1 ";
+    hql += "         from Characteristic c ";
+    hql += "           join c.pricingAdjustmentCharacteristicList pac ";
+    hql += "           join c.productCharacteristicValueList pcv ";
+    hql += "         where  pcv.product = :product ";
+    hql += "          and pac.offer = p ";
+    hql += "          and m_isparent_ch_value(pcv.characteristicValue.id, pac.chValue.id, pac.characteristic.id) != -1 ";
+    hql += "          )) ";
+    hql += "    ) ";
+
     hql += " order by priority, id";
 
     OBQuery<org.openbravo.model.pricing.priceadjustment.PriceAdjustment> q = OBDal.getInstance()
--- a/src/org/openbravo/erpCommon/utility/SystemInfo.java	Tue Sep 09 13:08:31 2014 +0200
+++ b/src/org/openbravo/erpCommon/utility/SystemInfo.java	Wed Sep 10 13:50:06 2014 +0200
@@ -11,7 +11,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) 2008-2011 Openbravo SLU 
+ * All portions are Copyright (C) 2008-2014 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -299,9 +299,16 @@
     validateConnection(conn);
     String strSystemIdentifier = SystemInfoData.selectSystemIdentifier(conn);
     if (strSystemIdentifier == null || strSystemIdentifier.equals("")) {
-      strSystemIdentifier = UUID.randomUUID().toString();
+      if (systemIdentifier != null) {
+        // system identifier was previously calculated but it was not persisted in DB, let's update
+        // it again
+        strSystemIdentifier = systemIdentifier;
+      } else {
+        strSystemIdentifier = UUID.randomUUID().toString();
+      }
       SystemInfoData.updateSystemIdentifier(conn, strSystemIdentifier);
     }
+    systemIdentifier = strSystemIdentifier;
     return strSystemIdentifier;
   }
 
--- a/src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java	Tue Sep 09 13:08:31 2014 +0200
+++ b/src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java	Wed Sep 10 13:50:06 2014 +0200
@@ -28,8 +28,8 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Vector;
 import java.util.Map.Entry;
-import java.util.Vector;
 import java.util.regex.Matcher;
 
 import javax.servlet.ServletConfig;
@@ -61,11 +61,11 @@
 import org.openbravo.erpCommon.utility.poc.EmailType;
 import org.openbravo.erpCommon.utility.reporting.DocumentType;
 import org.openbravo.erpCommon.utility.reporting.Report;
-import org.openbravo.erpCommon.utility.reporting.Report.OutputTypeEnum;
 import org.openbravo.erpCommon.utility.reporting.ReportManager;
 import org.openbravo.erpCommon.utility.reporting.ReportingException;
 import org.openbravo.erpCommon.utility.reporting.TemplateData;
 import org.openbravo.erpCommon.utility.reporting.TemplateInfo;
+import org.openbravo.erpCommon.utility.reporting.Report.OutputTypeEnum;
 import org.openbravo.erpCommon.utility.reporting.TemplateInfo.EmailDefinition;
 import org.openbravo.exception.NoConnectionAvailableException;
 import org.openbravo.model.ad.system.Language;
@@ -361,8 +361,9 @@
             }
 
             if (report == null)
-              throw new ServletException(
-                  Utility.messageBD(this, "NoDataReport", vars.getLanguage()) + documentId);
+              throw new ServletException(Utility
+                  .messageBD(this, "NoDataReport", vars.getLanguage())
+                  + documentId);
             // Check if the document is not in status 'draft'
             if (!report.isDraft()) {
               // Check if the report is already attached
@@ -389,9 +390,8 @@
                   log4j.debug("Document is not attached.");
               }
               final String senderAddress = vars.getStringParameter("fromEmail");
-              sendDocumentEmail(report, vars,
-                  (Vector<Object>) request.getSession().getAttribute("files"), documentData,
-                  senderAddress, checks, documentType);
+              sendDocumentEmail(report, vars, (Vector<Object>) request.getSession().getAttribute(
+                  "files"), documentData, senderAddress, checks, documentType);
               nrOfEmailsSend++;
             }
           }
@@ -464,8 +464,8 @@
       // Catching the exception here instead of throwing it to HSAS because this is used in multi
       // part request making the mechanism to detect popup not to work.
       log4j.error("Error captured: ", e);
-      bdErrorGeneralPopUp(request, response, "Error",
-          Utility.translateError(this, vars, vars.getLanguage(), e.getMessage()).getMessage());
+      bdErrorGeneralPopUp(request, response, "Error", Utility.translateError(this, vars,
+          vars.getLanguage(), e.getMessage()).getMessage());
     }
   }
 
@@ -491,10 +491,21 @@
         response.setContentType("application/pdf");
         concatReport(reports.toArray(new Report[] {}), response);
       }
+      for (Iterator<Report> iterator = reports.iterator(); iterator.hasNext();) {
+        Report report = iterator.next();
+        switch (report.getDocumentType()) {
+        case SALESORDER:
+          PrintControllerData.updateOrderDatePrinted(this, report.getDocumentId());
+        default:
+          break;
+        }
+      }
     } catch (IOException e) {
       log4j.error(e.getMessage());
     } catch (JRException e) {
       e.printStackTrace();
+    } catch (Exception e) {
+      e.printStackTrace();
     } finally {
       try {
         os.close();
@@ -739,14 +750,14 @@
     emailSubject = emailSubject.replaceAll("@sal_nam@", Matcher.quoteReplacement(replyToName));
     emailSubject = emailSubject
         .replaceAll("@bp_nam@", Matcher.quoteReplacement(report.getBPName()));
-    emailSubject = emailSubject.replaceAll("@doc_date@",
-        Matcher.quoteReplacement(report.getDocDate()));
-    emailSubject = emailSubject.replaceAll("@doc_nextduedate@",
-        Matcher.quoteReplacement(report.getMinDueDate()));
-    emailSubject = emailSubject.replaceAll("@doc_lastduedate@",
-        Matcher.quoteReplacement(report.getMaxDueDate()));
-    emailSubject = emailSubject.replaceAll("@doc_desc@",
-        Matcher.quoteReplacement(report.getDocDescription()));
+    emailSubject = emailSubject.replaceAll("@doc_date@", Matcher.quoteReplacement(report
+        .getDocDate()));
+    emailSubject = emailSubject.replaceAll("@doc_nextduedate@", Matcher.quoteReplacement(report
+        .getMinDueDate()));
+    emailSubject = emailSubject.replaceAll("@doc_lastduedate@", Matcher.quoteReplacement(report
+        .getMaxDueDate()));
+    emailSubject = emailSubject.replaceAll("@doc_desc@", Matcher.quoteReplacement(report
+        .getDocDescription()));
 
     emailBody = emailBody.replaceAll("@cus_ref@", Matcher.quoteReplacement(cusReference));
     emailBody = emailBody.replaceAll("@our_ref@", Matcher.quoteReplacement(ourReference));
@@ -754,12 +765,12 @@
     emailBody = emailBody.replaceAll("@sal_nam@", Matcher.quoteReplacement(replyToName));
     emailBody = emailBody.replaceAll("@bp_nam@", Matcher.quoteReplacement(report.getBPName()));
     emailBody = emailBody.replaceAll("@doc_date@", Matcher.quoteReplacement(report.getDocDate()));
-    emailBody = emailBody.replaceAll("@doc_nextduedate@",
-        Matcher.quoteReplacement(report.getMinDueDate()));
-    emailBody = emailBody.replaceAll("@doc_lastduedate@",
-        Matcher.quoteReplacement(report.getMaxDueDate()));
-    emailBody = emailBody.replaceAll("@doc_desc@",
-        Matcher.quoteReplacement(report.getDocDescription()));
+    emailBody = emailBody.replaceAll("@doc_nextduedate@", Matcher.quoteReplacement(report
+        .getMinDueDate()));
+    emailBody = emailBody.replaceAll("@doc_lastduedate@", Matcher.quoteReplacement(report
+        .getMaxDueDate()));
+    emailBody = emailBody.replaceAll("@doc_desc@", Matcher.quoteReplacement(report
+        .getDocDescription()));
 
     String host = null;
     boolean auth = true;
@@ -834,12 +845,11 @@
       if (log4j.isDebugEnabled())
         log4j.debug("New email id: " + newEmailId);
 
-      EmailData.insertEmail(conn, this, newEmailId, vars.getClient(), report.getOrgId(),
-          vars.getUser(), EmailType.OUTGOING.getStringValue(), replyTo, recipientTO, recipientCC,
+      EmailData.insertEmail(conn, this, newEmailId, vars.getClient(), report.getOrgId(), vars
+          .getUser(), EmailType.OUTGOING.getStringValue(), replyTo, recipientTO, recipientCC,
           recipientBCC, Utility.formatDate(new Date(), "yyyyMMddHHmmss"), emailSubject, emailBody,
-          report.getBPartnerId(),
-          ToolsData.getTableId(this, report.getDocumentType().getTableName()),
-          documentData.documentId);
+          report.getBPartnerId(), ToolsData.getTableId(this, report.getDocumentType()
+              .getTableName()), documentData.documentId);
 
       releaseCommitConnection(conn);
     } catch (final NoConnectionAvailableException exception) {
--- a/src/org/openbravo/erpCommon/utility/reporting/printing/PrintController_data.xsql	Tue Sep 09 13:08:31 2014 +0200
+++ b/src/org/openbravo/erpCommon/utility/reporting/printing/PrintController_data.xsql	Wed Sep 10 13:50:06 2014 +0200
@@ -59,4 +59,15 @@
         </Sql>
         <Parameter name="Id" optional="true" type="replace" after="WHERE fin_payment_id IN (" text="'1'"/>
     </SqlMethod>
+
+    <SqlMethod name="updateOrderDatePrinted" type="preparedStatement" return="rowcount">
+    <SqlMethodComment></SqlMethodComment>
+    <Sql>
+      <![CDATA[
+        UPDATE C_Order
+        SET DATEPRINTED=now() WHERE C_Order_ID = ?
+      ]]>
+    </Sql>
+    <Parameter name="cOrderId"/>
+  </SqlMethod>
 </SqlClass>
\ No newline at end of file