Merge temporary head for 3.0PR17Q4.1
authorRM packaging bot <staff.rm@openbravo.com>
Tue, 20 Feb 2018 05:47:07 +0000
changeset 33488 688fcca7af57
parent 33334 98051e865a49 (diff)
parent 33487 4c5d205b6e8c (current diff)
child 33489 f1d8751dcbf9
child 33525 7d7e23523d73
Merge temporary head for 3.0PR17Q4.1
.hgsigs
.hgtags
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js
modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
src-db/database/model/tables/C_INVOICELINE.xml
src-db/database/model/tables/C_ORDER.xml
src-db/database/model/tables/M_COSTING.xml
src-db/database/model/tables/M_INOUT.xml
src-db/database/model/tables/M_MATCHPO.xml
src-db/database/model/views/M_RM_RECEIPT_PICK_EDIT.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_MODEL_OBJECT.xml
src-db/database/sourcedata/AD_MODEL_OBJECT_PARA.xml
src-db/database/sourcedata/AD_MODULE.xml
src-db/database/sourcedata/AD_TAB.xml
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
src-db/database/sourcedata/OBUISEL_SELECTOR.xml
src-trl/src/org/openbravo/translate/Translate.java
src/org/openbravo/erpCommon/ad_callouts/SE_Expense_BP_Project.java
src/org/openbravo/erpCommon/ad_callouts/SE_InOut_Organization.java
src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java
src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java
src/org/openbravo/erpCommon/ad_callouts/SE_Order_Organization.java
src/org/openbravo/erpCommon/ad_callouts/SE_Project_BPartner.java
src/org/openbravo/erpCommon/ad_callouts/SE_Trxtype_Transaction.java
src/org/openbravo/erpCommon/ad_callouts/SL_GlobalUse_Product.java
src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Product.java
src/org/openbravo/erpCommon/ad_callouts/SL_InOut_BPartner.java
src/org/openbravo/erpCommon/ad_callouts/SL_Internal_Consumption_Conversion.java
src/org/openbravo/erpCommon/ad_callouts/SL_Internal_Consumption_Product.java
src/org/openbravo/erpCommon/ad_callouts/SL_InvAmtUpd_ProductRefDate.java
src/org/openbravo/erpCommon/ad_callouts/SL_Inventory_Product.java
src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_DocType.java
src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Product.java
src/org/openbravo/erpCommon/ad_callouts/SL_Journal_MultiAcctSchema.java
src/org/openbravo/erpCommon/ad_callouts/SL_Movement_Product.java
src/org/openbravo/erpCommon/ad_callouts/SL_Order_DocType.java
src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product.java
src/org/openbravo/erpCommon/ad_callouts/SL_Production_Product.java
src/org/openbravo/erpCommon/ad_callouts/SL_RefreshSequenceAndLength.java
src/org/openbravo/erpCommon/ad_callouts/SL_RequisitionLine_Product.java
src/org/openbravo/erpCommon/ad_callouts/SL_SequenceProduct_Product.java
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesXLS.jrxml
src/org/openbravo/erpCommon/obps/ActivationKey.java
src/org/openbravo/erpCommon/security/SessionListener.java
--- a/.hgsigs	Thu Feb 15 12:47:07 2018 +0000
+++ b/.hgsigs	Tue Feb 20 05:47:07 2018 +0000
@@ -218,5 +218,10 @@
 0e959ce9b986f2770ac4ac02296a59adaafdc919 0 iEYEABECAAYFAllSJLwACgkQCX/oGf+2qkOkKACfWiWW37hMTW9d4fneU+4JJsG//LYAoLkOPDVyEZCTY/IpOEuXT0hHKE9e
 4bad64e9d7577310506e2e19cacba696ed703ad6 0 iEYEABECAAYFAlmKpMUACgkQCX/oGf+2qkNGywCgobMSxQWqAp5l5HsKqlQMPn8GkNsAoOBNizvazzb9wRiYA1/57ntgR253
 9e6056c0e38e4355acf8d72a8efab6575c7f9733 0 iEYEABECAAYFAlm40qMACgkQCX/oGf+2qkPKxgCgndqN2CnOSnbnZEsQntY+mUaqZZEAoK6Xl9Q4HbgHep6JG/owLOzyehRK
+391e9626024899e664de6a55c88ee72e3e2d9710 0 iEYEABECAAYFAln77A4ACgkQCX/oGf+2qkOfGACgyr/EcAt6vsNW/zbB1YQ01t3UVtEAoNJJf5xPqkNN1SbNHwLySptoRaDN
 ff7be0e0ba8762069ad86523828a57139b396d39 0 iEYEABECAAYFAlm/UPkACgkQCX/oGf+2qkM8UQCdGDxGviT6mh8nKnu2HP1qzZzX0cYAoJaBd9WSUNj2Dlh2yjJT+7zYxKcC
+54cdd8284122f787eac4b4ab67b4ab4584ddcccb 0 iEYEABECAAYFAln8YP0ACgkQCX/oGf+2qkNbKACgxFsQqRE0goPX4VewSccTQcGZRVEAnitoyHAuUroUJpFUFLztc6pzkUL2
+bbeae307872835b1e84136c537adec44b7a0b3c1 0 iEYEABECAAYFAlpDLAIACgkQCX/oGf+2qkNiugCgj1TTu2BeYoAqAqD08Gci3lHJvogAnAvmNL987nIAckknQ1CosIUDmA+K
+2e43174aba46ec6956a0e703bbb9bee5292c871a 0 iEYEABECAAYFAlpuyUwACgkQCX/oGf+2qkPuJgCePIRg5ennwj6kgpOnyxZCPUV54Y0Ani30NnQNuNkXNkBMyykw2JfW21Vs
+43d95f7cb67084eb978752359847ab28b9aa14f6 0 iEYEABECAAYFAlpEpSMACgkQCX/oGf+2qkNdMACdGNGo6rpHht3lNH3FmwtsNcIe65sAn1sM9rBx/Sm3ytwcL2C5irUyD05J
 2ed90e80323f7bf5245be3946e2f60ea68d30f6e 0 iEYEABECAAYFAlqFgUsACgkQCX/oGf+2qkMGWwCg9AesP/a8fHuHrGVkUZcGk0x8CSgAniD73vR4fZ3uaU1eqtQr9HYlwpCQ
--- a/.hgtags	Thu Feb 15 12:47:07 2018 +0000
+++ b/.hgtags	Tue Feb 20 05:47:07 2018 +0000
@@ -229,5 +229,10 @@
 c37991aee21566d0ed397369377abdaeaf1a6f52 3.0PR17Q2.1
 632ba9b2ee8c8133be5b483482d3d99a83b4138f 3.0PR17Q2.2
 7fafd2a9f24bd0d5889253005412101631cc1efe 3.0PR17Q2.3
+688697b19d3692d75972558eaf9fc5eccd145a61 3.0PR17Q2.4
 a8925ad2d61f4625aa62c1ee31babecaa73b787f 3.0PR17Q3
+452e6c576f1db52e686cf3138099790e242e7927 3.0PR17Q3.1
+f500d43a59bb69265a7aa704a9fd20bffd68c8a9 3.0PR17Q3.2
+dd65065492e55421c107be4c87894a508bb1244d 3.0PR17Q3.3
+a8b6912d30a34e4a7d0873fc0fe53df228417b49 3.0PR17Q4
 82be2c7d9d11d77238355e65724408b6c5aa2ffb 3.0PR17Q4.1
--- a/README	Thu Feb 15 12:47:07 2018 +0000
+++ b/README	Tue Feb 20 05:47:07 2018 +0000
@@ -36,3 +36,4 @@
 * Contact
 
 IRC: #openbravo in freenode
+
--- a/build.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/build.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -98,6 +98,19 @@
  
   <available file=".hg" property="is.hg" />
 
+  <condition property="jdk9">
+    <not>
+      <or>
+        <equals arg1="${ant.java.version}" arg2="1.7"/>
+        <equals arg1="${ant.java.version}" arg2="1.8"/>
+      </or>
+    </not>
+  </condition>
+
+  <condition property="j9.module.args" value="--add-modules=java.se.ee" else="">
+    <isset property="jdk9"/>
+  </condition>
+
   <condition property="calculate.core.rev">
    <istrue value="${calculate.core.revision}"/>
   </condition>
@@ -522,6 +535,11 @@
   </target>
 
   <target name="generate.java.doc">
+    <antcall target="generate.java.doc.jdk7"/>
+    <antcall target="generate.java.doc.jdk9"/>
+  </target>
+
+  <target name="generate.java.doc.jdk7" unless="jdk9">
     <javadoc Windowtitle="${title}" access="protected" Header="${header}" Footer="${footer}" destdir="${build.docs}" maxmemory="1024M" failonerror="yes">
       <sourcepath>
         <pathelement path="${base.src}" />
@@ -548,6 +566,35 @@
     </javadoc>
   </target>
 
+  <target name="generate.java.doc.jdk9" if="jdk9">
+    <javadoc Windowtitle="${title}" access="protected" Header="${header}" Footer="${footer}" destdir="${build.docs}" maxmemory="1024M" failonerror="yes">
+      <sourcepath>
+        <pathelement path="${base.src}" />
+        <pathelement path="${base.src.test}/src" />
+        <pathelement path="${build.AD}" />
+        <pathelement path="${base.src.core}/src" />
+        <pathelement path="${base.src.gen}" />
+        <pathelement path="build/javasqlc/src" />
+        <pathelement path="build/javasqlc/srcAD" />
+        <dirset dir="${base.modules}">
+          <include name="*/src" />
+          <include name="*/src-test" />
+        </dirset>
+      </sourcepath>
+      <excludepackage name="org.openbravo.erpWindows.*"/>
+      <classpath>
+        <path refid="project.class.path"/>
+        <pathelement path="lib/build/js.jar" />
+        <fileset dir="${base.modules}">
+          <include name="*/lib/test/*.jar" />
+        </fileset>
+      </classpath>
+      <link href="http://docs.oracle.com/javase/9/docs/api/"/>
+      <arg value="${j9.module.args}"/>
+      <arg value="-Xdoclint:none"/>
+    </javadoc>
+  </target>
+
   <target name="generate.entities">
     <ant dir="${base.src}" target="generate.entities" inheritAll="true" inheritRefs="true" />
   </target>
--- a/legal/Licensing.txt	Thu Feb 15 12:47:07 2018 +0000
+++ b/legal/Licensing.txt	Tue Feb 20 05:47:07 2018 +0000
@@ -52,6 +52,10 @@
 under the Compiere Public license 1.1 and are located in the /database/
 folder. For more information, see CompiereAddendum.txt in the /legal/ folder
 
+# src/org/openbravo/erpCommon/ad_callouts/ISO_4217.xml
+Currency XML from Swiss Association for Standardisation
+https://www.iso.org/iso-4217-currency-codes.html
+
 # calculator.js (at web/js)
 Under Tigra Calculator license (license available at http://www.softcomplex.com/)
 Copyright © 2003-2004 Softcomplex Inc. 
@@ -113,7 +117,7 @@
 # commons-pool-1.5.6.jar
 # fop-1.1.jar
 # jakarta-oro-2.0.8.jar
-# jettison-1.3.jar
+# jettison-1.3-patched.jar
 # log4j-1.2.16.jar
 # quartz-1.6.2.jar
 # servlet-api.jar 
@@ -181,7 +185,7 @@
 Under MPL/GPL License (available at https://developer.mozilla.org/en/Rhino_License)
 ob-rhino-1.6R7.jar is the same code as js.jar repackaged to be available under org.openbravo
 
-# javassist-3.14.0-GA.jar
+# javassist-3.20.0-GA.jar
 Under MPL License (included as MPL-1.1.txt in this folder)
 
 # slf4j-api-1.6.1.jar
--- a/lib/README	Thu Feb 15 12:47:07 2018 +0000
+++ b/lib/README	Tue Feb 20 05:47:07 2018 +0000
@@ -1,3 +1,4 @@
 When adding or removing libraries to Openbravo ERP please update this page
 with your changes:
 http://wiki.openbravo.com/wiki/Openbravo_Libraries
+
Binary file lib/runtime/hibernate3-patched.jar has changed
Binary file lib/runtime/javassist-3.14.0-GA.jar has changed
Binary file lib/runtime/javassist-3.20.0-GA.jar has changed
Binary file lib/runtime/jettison-1.3-patched.jar has changed
Binary file lib/runtime/jettison-1.3.jar has changed
Binary file lib/runtime/renderFoRmi.jar has changed
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.33164]]></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>
@@ -25,7 +25,7 @@
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <UPDATEINFO><![CDATA[Fixed issue with document sequence numbers reset in case of applying dataset second time.
 Fixed issue 15305.]]></UPDATEINFO>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <REFERENCEDATAINFO><![CDATA[Document types and default algorithm for bank statement auto matching]]></REFERENCEDATAINFO>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION_LABEL><![CDATA[PR17Q4.1]]></VERSION_LABEL>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--A918E3331C404B889D69AA9BFAFB23AC--></AD_MODULE>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.33164]]></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.32880]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.33164]]></STARTVERSION>
 <!--B97FC854C6DD41E692161585645A900F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java	Tue Feb 20 05:47:07 2018 +0000
@@ -382,28 +382,30 @@
               businessPartner.getCurrency().getISOCode()));
         }
         BigDecimal usedCreditAmt = selectedCreditPaymentAmounts.get(creditPayment.getId());
-        if (strDifferenceAction.equals("refund")) {
-          if (remainingRefundAmt.compareTo(usedCreditAmt) > 0) {
-            remainingRefundAmt = remainingRefundAmt.subtract(usedCreditAmt);
-            usedCreditAmt = BigDecimal.ZERO;
-          } else {
-            usedCreditAmt = usedCreditAmt.subtract(remainingRefundAmt);
-            remainingRefundAmt = BigDecimal.ZERO;
-          }
+
+        // Reset usedCredit by traversing through each credit payment
+        if (remainingRefundAmt.compareTo(usedCreditAmt) > 0) {
+          remainingRefundAmt = remainingRefundAmt.subtract(usedCreditAmt);
+          usedCreditAmt = BigDecimal.ZERO;
+        } else {
+          usedCreditAmt = usedCreditAmt.subtract(remainingRefundAmt);
+          remainingRefundAmt = BigDecimal.ZERO;
         }
-        final StringBuffer description = new StringBuffer();
-        if (creditPayment.getDescription() != null && !creditPayment.getDescription().equals("")) {
-          description.append(creditPayment.getDescription()).append("\n");
-        }
-        description.append(String.format(OBMessageUtils.messageBD("APRM_CreditUsedPayment"),
-            payment.getDocumentNo()));
-        String truncateDescription = (description.length() > 255) ? description.substring(0, 251)
-            .concat("...").toString() : description.toString();
-        creditPayment.setDescription(truncateDescription);
+
         // Set Used Credit = Amount + Previous used credit introduced by the user
         creditPayment.setUsedCredit(usedCreditAmt.add(creditPayment.getUsedCredit()));
 
         if (usedCreditAmt.compareTo(BigDecimal.ZERO) > 0) {
+          // Set Credit description only when it is actually used
+          final StringBuffer description = new StringBuffer();
+          if (creditPayment.getDescription() != null && !creditPayment.getDescription().equals("")) {
+            description.append(creditPayment.getDescription()).append("\n");
+          }
+          description.append(String.format(OBMessageUtils.messageBD("APRM_CreditUsedPayment"),
+              payment.getDocumentNo()));
+          String truncateDescription = (description.length() > 255) ? description.substring(0, 251)
+              .concat("...").toString() : description.toString();
+          creditPayment.setDescription(truncateDescription);
           FIN_PaymentProcess.linkCreditPayment(payment, usedCreditAmt, creditPayment);
         }
         OBDal.getInstance().save(creditPayment);
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentOnProcessActionHandler.java	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentOnProcessActionHandler.java	Tue Feb 20 05:47:07 2018 +0000
@@ -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) 2014-2016 Openbravo SLU
+ * All portions are Copyright (C) 2014-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -72,15 +72,26 @@
         String currencyId = jsonData.getString("currencyId");
         boolean usesCredit = jsonData.getBoolean("usesCredit");
         boolean generatesCredit = jsonData.getBoolean("generatesCredit");
-        if ((usesCredit || generatesCredit)
-            && !StringUtils.equals(currencyId, businessPartner.getCurrency().getId())) {
-          String message = String.format(OBMessageUtils.messageBD("APRM_CreditCurrency"),
-              businessPartner.getCurrency().getISOCode());
+
+        if (businessPartner.getCurrency() == null) {
+          String message = String.format(OBMessageUtils.messageBD("InitBPCurrencyLnk", false),
+              businessPartner.getId(), businessPartner.getName());
           errorMessage.put("severity", "error");
           errorMessage.put("title", "Error");
           errorMessage.put("text", message);
           result.put("message", errorMessage);
           return result;
+        } else {
+          if ((usesCredit || generatesCredit)
+              && !StringUtils.equals(currencyId, businessPartner.getCurrency().getId())) {
+            String message = String.format(OBMessageUtils.messageBD("APRM_CreditCurrency"),
+                businessPartner.getCurrency().getISOCode());
+            errorMessage.put("severity", "error");
+            errorMessage.put("title", "Error");
+            errorMessage.put("text", message);
+            result.put("message", errorMessage);
+            return result;
+          }
         }
 
       } else {
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddTransactionActionHandler.java	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddTransactionActionHandler.java	Tue Feb 20 05:47:07 2018 +0000
@@ -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) 2014-2016 Openbravo SLU
+ * All portions are Copyright (C) 2014-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -171,8 +171,9 @@
         paymentAmt = FIN_Utility.getPaymentAmount(payment.isReceipt(),
             payment.getFinancialTransactionAmount());
         isReceipt = payment.isReceipt();
-        description = StringUtils.isNotBlank(payment.getDescription()) ? payment.getDescription()
-            .replace("\n", ". ") : "";
+        String paymentDescription = StringUtils.isNotBlank(payment.getDescription()) ? payment
+            .getDescription().replace("\n", ". ") : "";
+        description = StringUtils.isNotBlank(strDescription) ? strDescription : paymentDescription;
         paymentCurrency = payment.getCurrency();
         convertRate = payment.getFinancialTransactionConvertRate();
         sourceAmount = payment.getAmount();
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.java	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.java	Tue Feb 20 05:47:07 2018 +0000
@@ -197,7 +197,7 @@
           recon.getEndingDate()));
       List<FIN_Reconciliation> afterReconciliations = MatchTransactionDao
           .getReconciliationListAfterDate(recon);
-      if (afterReconciliations.size() > 0) {
+      if (!afterReconciliations.isEmpty()) {
         obcTrans.add(Restrictions.or(
             Restrictions.isNull(FIN_FinaccTransaction.PROPERTY_RECONCILIATION),
             Restrictions.in(FIN_FinaccTransaction.PROPERTY_RECONCILIATION, afterReconciliations)));
@@ -209,10 +209,9 @@
       projections.add(Projections.sum(FIN_FinaccTransaction.PROPERTY_PAYMENTAMOUNT));
       projections.add(Projections.sum(FIN_FinaccTransaction.PROPERTY_DEPOSITAMOUNT));
       obcTrans.setProjection(projections);
-
-      if (obcTrans.list() != null && obcTrans.list().size() > 0) {
-        @SuppressWarnings("rawtypes")
-        List o = obcTrans.list();
+      @SuppressWarnings("rawtypes")
+      List o = obcTrans.list();
+      if (o != null && !o.isEmpty()) {
         Object[] resultSet = (Object[]) o.get(0);
         BigDecimal paymentAmt = (resultSet[0] != null) ? (BigDecimal) resultSet[0]
             : BigDecimal.ZERO;
@@ -255,7 +254,7 @@
           recon.getEndingDate()));
       List<FIN_Reconciliation> afterReconciliations = MatchTransactionDao
           .getReconciliationListAfterDate(recon);
-      if (afterReconciliations.size() > 0) {
+      if (!afterReconciliations.isEmpty()) {
         obcBsl.add(Restrictions.or(Restrictions
             .isNull(FIN_BankStatementLine.PROPERTY_FINANCIALACCOUNTTRANSACTION), Restrictions.in(
             "tr." + FIN_FinaccTransaction.PROPERTY_RECONCILIATION, afterReconciliations)));
@@ -269,9 +268,9 @@
       projections.add(Projections.sum(FIN_BankStatementLine.PROPERTY_DRAMOUNT));
       obcBsl.setProjection(projections);
 
-      if (obcBsl.list() != null && obcBsl.list().size() > 0) {
-        @SuppressWarnings("rawtypes")
-        List o = obcBsl.list();
+      @SuppressWarnings("rawtypes")
+      List o = obcBsl.list();
+      if (o != null && !o.isEmpty()) {
         Object[] resultSet = (Object[]) o.get(0);
         BigDecimal credit = (resultSet[0] != null) ? (BigDecimal) resultSet[0] : BigDecimal.ZERO;
         BigDecimal debit = (resultSet[1] != null) ? (BigDecimal) resultSet[1] : BigDecimal.ZERO;
@@ -309,9 +308,9 @@
       projections.add(Projections.sum(FIN_FinaccTransaction.PROPERTY_DEPOSITAMOUNT));
       obcTrans.setProjection(projections);
 
-      if (obcTrans.list() != null && obcTrans.list().size() > 0) {
-        @SuppressWarnings("rawtypes")
-        List o = obcTrans.list();
+      @SuppressWarnings("rawtypes")
+      List o = obcTrans.list();
+      if (o != null && !o.isEmpty()) {
         Object[] resultSet = (Object[]) o.get(0);
         BigDecimal paymentAmt = (resultSet[0] != null) ? (BigDecimal) resultSet[0]
             : BigDecimal.ZERO;
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java	Tue Feb 20 05:47:07 2018 +0000
@@ -259,7 +259,7 @@
       whereClause.append(" and (oinfo is null or oinfo.active = true)");
 
       // remove selected payments
-      if (selectedScheduledPaymentDetails != null && selectedScheduledPaymentDetails.size() > 0) {
+      if (selectedScheduledPaymentDetails != null && !selectedScheduledPaymentDetails.isEmpty()) {
         String strSelectedPaymentDetails = Utility.getInStrList(selectedScheduledPaymentDetails);
         whereClause.append(" and psd not in (");
         whereClause.append(strSelectedPaymentDetails);
@@ -270,9 +270,10 @@
       final OBCriteria<FIN_PaymentPropDetail> obc = OBDal.getInstance().createCriteria(
           FIN_PaymentPropDetail.class);
       obc.add(Restrictions.isNotNull(FIN_PaymentPropDetail.PROPERTY_FINPAYMENTSCHEDULEDETAIL));
-      if (obc.list() != null && obc.list().size() > 0) {
+      List<FIN_PaymentPropDetail> paymentPropDetailList = obc.list();
+      if (paymentPropDetailList != null && !paymentPropDetailList.isEmpty()) {
         List<FIN_PaymentScheduleDetail> aux = new ArrayList<FIN_PaymentScheduleDetail>();
-        for (FIN_PaymentPropDetail ppd : obc.list()) {
+        for (FIN_PaymentPropDetail ppd : paymentPropDetailList) {
           aux.add(ppd.getFINPaymentScheduledetail());
         }
         whereClause.append(" and psd.id not in (" + Utility.getInStrList(aux) + ")");
@@ -1153,7 +1154,7 @@
           FIN_FinaccTransaction.class, whereClause.toString());
       obqFATrx.setFirstResult(offset);
       obqFATrx.setMaxResult(maxrowspergridpage);
-      return obqFATrx.list().size();
+      return obqFATrx.count();
 
     } finally {
       OBContext.restorePreviousMode();
@@ -1545,28 +1546,34 @@
     }
     obc.addOrder(org.hibernate.criterion.Order.asc("pm." + FIN_PaymentMethod.PROPERTY_NAME));
     obc.setFilterOnReadableOrganization(false);
-    List<FinAccPaymentMethod> defaults = obc.list();
-    if (defaults.size() > 0) {
-      return obc.list().get(0).getPaymentMethod().getId();
+    obc.setMaxResults(1);
+    FinAccPaymentMethod paymentMethod = (FinAccPaymentMethod) obc.uniqueResult();
+    if (paymentMethod != null) {
+      return paymentMethod.getPaymentMethod().getId();
     } else {
       return "";
     }
   }
 
+  /**
+   * This method adds a filter to the Query to filter by Payment Methods Id's. However, since the
+   * list can be bigger than 1000 records, it is necessary to split it to create several
+   * "paymentMethod.id in ('')" clauses that have less than 1000 records.
+   */
   private void addPaymentMethodList(OBCriteria<FIN_PaymentMethod> obc, List<String> paymentMethods) {
-    List<String> paymentMethodsToRemove;
     Criterion compoundExp = null;
-    while (paymentMethods.size() > 999) {
-      paymentMethodsToRemove = new ArrayList<String>(paymentMethods.subList(0, 999));
+    int paymentMethodsSize = paymentMethods.size();
+    while (paymentMethodsSize > 999) {
+      List<String> paymentMethodsToRemove = paymentMethods.subList(0, 999);
       if (compoundExp == null) {
-        compoundExp = Restrictions.in("id", paymentMethods.subList(0, 999));
+        compoundExp = Restrictions.in("id", paymentMethodsToRemove);
       } else {
-        compoundExp = Restrictions.or(compoundExp,
-            Restrictions.in("id", paymentMethods.subList(0, 999)));
+        compoundExp = Restrictions.or(compoundExp, Restrictions.in("id", paymentMethodsToRemove));
       }
       paymentMethods.removeAll(paymentMethodsToRemove);
+      paymentMethodsSize = paymentMethodsSize - 999;
     }
-    if (paymentMethods.size() > 0) {
+    if (paymentMethodsSize > 0) {
       if (compoundExp == null) {
         compoundExp = Restrictions.in("id", paymentMethods);
       } else {
@@ -1676,14 +1683,14 @@
     }
 
     public Criterion getCriterion() {
-      if (finAccs.size() > 0) {
+      if (!finAccs.isEmpty()) {
         refresh();
       }
       return compoundexp;
     }
 
     private void refresh() {
-      // finAccs.size() must be > 0
+      // finAccs size must be > 0
       if (compoundexp == null) {
         compoundexp = Restrictions.in("id", finAccs);
       } else {
@@ -1879,9 +1886,10 @@
     OBCriteria<APRMPendingPaymentFromInvoice> ppfiCriteria = OBDal.getInstance().createCriteria(
         APRMPendingPaymentFromInvoice.class);
     ppfiCriteria.add(Restrictions.eq(APRMPendingPaymentFromInvoice.PROPERTY_PAYMENT, payment));
-    List<APRMPendingPaymentFromInvoice> pendingPayments = ppfiCriteria.list();
-    if (pendingPayments != null && pendingPayments.size() > 0) {
-      APRMPendingPaymentFromInvoice pendingPayment = pendingPayments.get(0);
+    ppfiCriteria.setMaxResults(1);
+    APRMPendingPaymentFromInvoice pendingPayment = (APRMPendingPaymentFromInvoice) ppfiCriteria
+        .uniqueResult();
+    if (pendingPayment != null) {
       pendingPayment.setProcessNow(executing);
       OBDal.getInstance().flush();
       OBDal.getInstance().save(pendingPayment);
@@ -1892,11 +1900,14 @@
     OBCriteria<APRMPendingPaymentFromInvoice> ppfiCriteria = OBDal.getInstance().createCriteria(
         APRMPendingPaymentFromInvoice.class);
     ppfiCriteria.add(Restrictions.eq(APRMPendingPaymentFromInvoice.PROPERTY_PAYMENT, payment));
-    List<APRMPendingPaymentFromInvoice> pendingPayments = ppfiCriteria.list();
-    if (pendingPayments != null && pendingPayments.size() > 0) {
-      return pendingPayments.get(0).isProcessNow();
-    } else
+    ppfiCriteria.setMaxResults(1);
+    APRMPendingPaymentFromInvoice pendingPayment = (APRMPendingPaymentFromInvoice) ppfiCriteria
+        .uniqueResult();
+    if (pendingPayment != null) {
+      return pendingPayment.isProcessNow();
+    } else {
       return false;
+    }
 
   }
 
@@ -2047,15 +2058,9 @@
     obc.add(Restrictions.in("organization.id", OBContext.getOBContext()
         .getOrganizationStructureProvider().getNaturalTree(strOrgId)));
     obc.setFilterOnReadableOrganization(false);
-
     obc.add(Restrictions.eq(FIN_FinancialAccount.PROPERTY_DEFAULT, true));
-
-    final List<FIN_FinancialAccount> defaultAccounts = obc.list();
-    if (defaultAccounts.size() > 0) {
-      return defaultAccounts.get(0);
-    } else {
-      return null;
-    }
+    obc.setMaxResults(1);
+    return (FIN_FinancialAccount) obc.uniqueResult();
   }
 
   public boolean existsAPRMReadyPreference() {
@@ -2111,13 +2116,7 @@
           .getOrganizationStructureProvider().getNaturalTree(organization.getId())));
       obcFinPayment.addOrderBy(FIN_Payment.PROPERTY_PAYMENTDATE, true);
       obcFinPayment.setMaxResults(1);
-
-      final List<FIN_Payment> finPayments = obcFinPayment.list();
-      if (finPayments.size() > 0) {
-        return finPayments.get(0);
-      } else {
-        return null;
-      }
+      return (FIN_Payment) obcFinPayment.uniqueResult();
     } finally {
       OBContext.restorePreviousMode();
     }
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java	Tue Feb 20 05:47:07 2018 +0000
@@ -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) 2010-2016 Openbravo SLU
+ * All portions are Copyright (C) 2010-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -40,12 +40,12 @@
 import org.openbravo.data.FieldProvider;
 import org.openbravo.database.ConnectionProvider;
 import org.openbravo.erpCommon.ad_forms.AcctServer;
+import org.openbravo.erpCommon.utility.AccDefUtility;
 import org.openbravo.erpCommon.utility.FieldProviderFactory;
 import org.openbravo.erpCommon.utility.OBObjectFieldProvider;
 import org.openbravo.model.ad.datamodel.Table;
 import org.openbravo.model.ad.ui.Tab;
 import org.openbravo.model.financialmgmt.accounting.AccountingFact;
-import org.openbravo.model.financialmgmt.calendar.Period;
 import org.openbravo.model.financialmgmt.payment.FIN_FinaccTransaction;
 import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount;
 import org.openbravo.model.financialmgmt.payment.FIN_Payment;
@@ -82,10 +82,8 @@
       final OBQuery<FIN_FinaccTransaction> obQuery = OBDal.getInstance().createQuery(
           FIN_FinaccTransaction.class, whereClause.toString());
       obQuery.setParameters(parameters);
-      OBObjectFieldProvider[] objectFieldProvider = null;
-      if (obQuery != null && obQuery.list().size() > 0) {
-        objectFieldProvider = OBObjectFieldProvider.createOBObjectFieldProvider(obQuery.list());
-      }
+      OBObjectFieldProvider[] objectFieldProvider = OBObjectFieldProvider
+          .createOBObjectFieldProvider(obQuery.list());
       return objectFieldProvider;
     } finally {
       OBContext.restorePreviousMode();
@@ -216,10 +214,7 @@
       obc.addOrderBy(FIN_Reconciliation.PROPERTY_ENDINGDATE, false);
       obc.addOrderBy(FIN_Reconciliation.PROPERTY_CREATIONDATE, false);
       obc.setMaxResults(1);
-      final List<FIN_Reconciliation> rec = obc.list();
-      if (rec.size() == 0)
-        return null;
-      return rec.get(0);
+      return (FIN_Reconciliation) obc.uniqueResult();
     } finally {
       OBContext.restorePreviousMode();
     }
@@ -240,7 +235,7 @@
           .append(" is null ");
       final OBQuery<FIN_FinaccTransaction> obqFATrx = OBDal.getInstance().createQuery(
           FIN_FinaccTransaction.class, whereClause.toString());
-      return obqFATrx.list().size();
+      return obqFATrx.count();
 
     } finally {
       OBContext.restorePreviousMode();
@@ -256,22 +251,12 @@
     for (AccountingFact aFact : obcAF.list()) {
       aFact.setAccountingDate(transaction.getTransactionDate());
       aFact.setTransactionDate(transaction.getTransactionDate());
-      aFact.setPeriod(getPeriod(transaction.getTransactionDate()));
+      aFact.setPeriod((AccDefUtility.getCurrentPeriod(transaction.getTransactionDate(),
+          AccDefUtility.getCalendar(transaction.getOrganization()))));
     }
     return;
   }
 
-  public static Period getPeriod(Date date) {
-    Period period = null;
-    OBCriteria<Period> obcPe = OBDal.getInstance().createCriteria(Period.class);
-    obcPe.add(Restrictions.le(Period.PROPERTY_ENDINGDATE, date));
-    obcPe.add(Restrictions.ge(Period.PROPERTY_STARTINGDATE, date));
-    if (obcPe.list() != null && obcPe.list().size() > 0) {
-      period = obcPe.list().get(0);
-    }
-    return period;
-  }
-
   public static List<FIN_FinaccTransaction> getTransactionsToReconciled(
       FIN_FinancialAccount account, Date statementDate, boolean hideAfterDate) {
 
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java	Tue Feb 20 05:47:07 2018 +0000
@@ -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) 2010-2015 Openbravo SLU
+ * All portions are Copyright (C) 2010-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -26,6 +26,7 @@
 import java.util.HashMap;
 import java.util.List;
 
+import org.apache.commons.lang.StringUtils;
 import org.hibernate.ScrollMode;
 import org.hibernate.ScrollableResults;
 import org.hibernate.criterion.Projections;
@@ -202,7 +203,8 @@
     }
     obc.add(Restrictions.eq(FIN_PaymentSchedInvV.PROPERTY_INVOICE, invoice));
     obc.setProjection(Projections.max(FIN_PaymentSchedInvV.PROPERTY_LASTPAYMENT));
-    Object o = obc.list().get(0);
+    obc.setMaxResults(1);
+    Object o = obc.uniqueResult();
     if (o != null) {
       return ((Date) o);
     } else {
@@ -307,7 +309,8 @@
     obc.add(Restrictions.eq(FIN_PaymentSchedule.PROPERTY_INVOICE, invoice));
     obc.add(Restrictions.ne(FIN_PaymentSchedule.PROPERTY_OUTSTANDINGAMOUNT, BigDecimal.ZERO));
     obc.setProjection(Projections.min(FIN_PaymentSchedule.PROPERTY_DUEDATE));
-    Object o = obc.list().get(0);
+    obc.setMaxResults(1);
+    Object o = obc.uniqueResult();
     if (o != null) {
       return (FIN_Utility.getDaysToDue((Date) o));
     } else {
@@ -331,19 +334,25 @@
     obcNotSel.add(Restrictions.eq(Preference.PROPERTY_PROPERTY, property));
     obcNotSel.setFilterOnReadableClients(false);
     obcNotSel.setFilterOnReadableOrganization(false);
+    obcNotSel.setMaxResults(1);
 
     final OBCriteria<Preference> obcSel = OBDal.getInstance().createCriteria(Preference.class);
     obcSel.add(Restrictions.eq(Preference.PROPERTY_PROPERTY, property));
     obcSel.add(Restrictions.eq(Preference.PROPERTY_SELECTED, true));
     obcSel.setFilterOnReadableClients(false);
     obcSel.setFilterOnReadableOrganization(false);
+    obcSel.setMaxResults(1);
 
-    if (obcNotSel.list() != null && obcNotSel.list().size() == 1) {
-      return obcNotSel.list().get(0).getModule().getId().equals(moduleId);
-    } else if (obcSel.list() != null && obcSel.list().size() == 1) {
-      return obcSel.list().get(0).getModule().getId().equals(moduleId);
+    Preference preference = (Preference) obcNotSel.uniqueResult();
+    if (preference != null) {
+      return StringUtils.equals(preference.getModule().getId(), moduleId);
     } else {
-      return false;
+      preference = (Preference) obcSel.uniqueResult();
+      if (preference != null) {
+        return StringUtils.equals(preference.getModule().getId(), moduleId);
+      } else {
+        return false;
+      }
     }
   }
 
--- a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js	Tue Feb 20 05:47:07 2018 +0000
@@ -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) 2014-2018 Openbravo SLU
+ * All portions are Copyright (C) 2014-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -1024,13 +1024,6 @@
   thisform = form;
   thisview = view;
   params.context = form.paramWindow.getContextInfo();
-  // Before sending the context, the grids with the information about orders and invoices, 
-  // gl items and credit used are removed from it. 
-  // This data is not used for calculating the display or read only logic of the rest of the parameters 
-  // and sending the grid can have an impact in the performance of this process.
-  delete params.context.order_invoice;
-  delete params.context.credit_to_use;
-  delete params.context.glitem;
   if (form.paramWindow.parentWindow && form.paramWindow.parentWindow.windowId) {
     params.context.inpwindowId = form.paramWindow.parentWindow.windowId;
   }
--- a/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -6,7 +6,7 @@
 <!--8A098711BB324335A19833286BDB093D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--8A098711BB324335A19833286BDB093D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8A098711BB324335A19833286BDB093D-->  <NAME><![CDATA[Apache External Connection Pool]]></NAME>
-<!--8A098711BB324335A19833286BDB093D-->  <VERSION><![CDATA[1.0.32880]]></VERSION>
+<!--8A098711BB324335A19833286BDB093D-->  <VERSION><![CDATA[1.0.33164]]></VERSION>
 <!--8A098711BB324335A19833286BDB093D-->  <DESCRIPTION><![CDATA[Apache External Connection Pool]]></DESCRIPTION>
 <!--8A098711BB324335A19833286BDB093D-->  <HELP><![CDATA[This module implements the Apache JDBC Connection Pool (http://wiki.openbravo.com/wiki/Modules:Apache_JDBC_Connection_Pool).]]></HELP>
 <!--8A098711BB324335A19833286BDB093D-->  <TYPE><![CDATA[M]]></TYPE>
@@ -20,7 +20,7 @@
 <!--8A098711BB324335A19833286BDB093D-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--8A098711BB324335A19833286BDB093D-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--8A098711BB324335A19833286BDB093D-->  <UPDATEINFO><![CDATA[fixed issue #26663: configuration is read from servlet context]]></UPDATEINFO>
-<!--8A098711BB324335A19833286BDB093D-->  <VERSION_LABEL><![CDATA[PR17Q4.1]]></VERSION_LABEL>
+<!--8A098711BB324335A19833286BDB093D-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--8A098711BB324335A19833286BDB093D-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--8A098711BB324335A19833286BDB093D-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--8A098711BB324335A19833286BDB093D--></AD_MODULE>
--- a/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -7,7 +7,7 @@
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <AD_MODULE_ID><![CDATA[8A098711BB324335A19833286BDB093D]]></AD_MODULE_ID>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--1467C397BC5F4999A5606F39CD6FF8A4-->  <STARTVERSION><![CDATA[2.1.32880]]></STARTVERSION>
+<!--1467C397BC5F4999A5606F39CD6FF8A4-->  <STARTVERSION><![CDATA[2.1.33164]]></STARTVERSION>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.33164]]></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>
@@ -22,7 +22,7 @@
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <UPDATEINFO><![CDATA[Bug fixing.]]></UPDATEINFO>
-<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION_LABEL><![CDATA[PR17Q4.1]]></VERSION_LABEL>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--C70732EA90A14EC0916078B85CC33D2D--></AD_MODULE>
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.33164]]></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/model/triggers/OBUIAPP_UIPERS_MOD_TRG.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/model/triggers/OBUIAPP_UIPERS_MOD_TRG.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  currentID  VARCHAR2(32);
   currentModuleID  VARCHAR2(32);
   vAux NUMBER;
 BEGIN
@@ -50,10 +49,8 @@
      AND Type = 'T';
      
   IF (UPDATING OR INSERTING) THEN
-    currentID := :new.OBUIAPP_UIPERSONALIZATION_ID;
     currentModuleID := :new.AD_Module_ID;
   ELSE
-    currentID := :old.OBUIAPP_UIPERSONALIZATION_ID;
     currentModuleID := :old.AD_Module_ID;
   END IF;
   
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -336,6 +336,18 @@
 <!--16EF30EF95D94CB2A93129015A363315-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--16EF30EF95D94CB2A93129015A363315--></AD_MESSAGE>
 
+<!--1A0108DBD48D4F3496569E662C7475CE--><AD_MESSAGE>
+<!--1A0108DBD48D4F3496569E662C7475CE-->  <AD_MESSAGE_ID><![CDATA[1A0108DBD48D4F3496569E662C7475CE]]></AD_MESSAGE_ID>
+<!--1A0108DBD48D4F3496569E662C7475CE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1A0108DBD48D4F3496569E662C7475CE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1A0108DBD48D4F3496569E662C7475CE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1A0108DBD48D4F3496569E662C7475CE-->  <VALUE><![CDATA[OBUIAPP_TooManyResults]]></VALUE>
+<!--1A0108DBD48D4F3496569E662C7475CE-->  <MSGTEXT><![CDATA[Your search returned too many results. Please refine your search terms.]]></MSGTEXT>
+<!--1A0108DBD48D4F3496569E662C7475CE-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--1A0108DBD48D4F3496569E662C7475CE-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--1A0108DBD48D4F3496569E662C7475CE-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--1A0108DBD48D4F3496569E662C7475CE--></AD_MESSAGE>
+
 <!--1B783EC678E644E385778D2D7D25A97B--><AD_MESSAGE>
 <!--1B783EC678E644E385778D2D7D25A97B-->  <AD_MESSAGE_ID><![CDATA[1B783EC678E644E385778D2D7D25A97B]]></AD_MESSAGE_ID>
 <!--1B783EC678E644E385778D2D7D25A97B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -5008,7 +5020,7 @@
 <!--FF80818132D550210132D55C83410044-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF80818132D550210132D55C83410044-->  <VALUE><![CDATA[OBUIAPP_Image_Error_WRONGFORMAT]]></VALUE>
 <!--FF80818132D550210132D55C83410044-->  <MSGTEXT><![CDATA[Unsupported file format.
-Supported file formats are JPG, PNG, GIF and BMP.]]></MSGTEXT>
+Supported file formats are JPG, PNG, GIF, BMP and SVG.]]></MSGTEXT>
 <!--FF80818132D550210132D55C83410044-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
 <!--FF80818132D550210132D55C83410044-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--FF80818132D550210132D55C83410044-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.33164]]></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>
@@ -22,7 +22,7 @@
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <UPDATEINFO><![CDATA[Styling bugfixing]]></UPDATEINFO>
-<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION_LABEL><![CDATA[PR17Q4.1]]></VERSION_LABEL>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--9BA0836A3CD74EE4AB48753A47211BCC--></AD_MODULE>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.33164]]></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.32880]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.33164]]></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.32880]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.33164]]></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.32880]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.33164]]></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-test/org/openbravo/client/application/test/DynamicExpressionParserTest.java	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/DynamicExpressionParserTest.java	Tue Feb 20 05:47:07 2018 +0000
@@ -11,14 +11,15 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2014 Openbravo SLU
+ * All portions are Copyright (C) 2010-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
  */
 package org.openbravo.client.application.test;
 
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertThat;
 
 import org.junit.Test;
 import org.openbravo.base.weld.test.WeldBaseTest;
@@ -26,24 +27,67 @@
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.model.ad.ui.Tab;
 
+/** Tests parsing of dynamic expression */
 public class DynamicExpressionParserTest extends WeldBaseTest {
+  private static final String SALES_INVOICE_LINE_TAB = "270";
 
   @Test
-  public void testRegularExpression() {
-    setSystemAdministratorContext();
-    String displayLogic = "((@Financial_Invoice_Line@='N'))";
-    String expectedResult = "((OB.Utilities.getValue(currentValues,'financialInvoiceLine') === false))";
-    Tab tab = OBDal.getInstance().get(Tab.class, "270");
-
-    DynamicExpressionParser parser = new DynamicExpressionParser(displayLogic, tab);
-    assertTrue(expectedResult.equals(parser.getJSExpression()));
-
-    displayLogic = "@Financial_Invoice_Line@='Y'";
-    expectedResult = "OB.Utilities.getValue(currentValues,'financialInvoiceLine') === true";
-
-    parser = new DynamicExpressionParser(displayLogic, tab);
-    assertTrue(expectedResult.equals(parser.getJSExpression()));
-
+  public void eqFalseExpression() {
+    assertExpression("((@Financial_Invoice_Line@='N'))",
+        "((OB.Utilities.getValue(currentValues,'financialInvoiceLine') === false))");
   }
 
+  @Test
+  public void eqTrueExpression() {
+    assertExpression("@Financial_Invoice_Line@='Y'",
+        "OB.Utilities.getValue(currentValues,'financialInvoiceLine') === true");
+  }
+
+  @Test
+  public void ltExpression() {
+    assertExpression("@lineNetAmt@ < -5",
+        "OB.Utilities.getValue(currentValues,'lineNetAmount')  <  -5");
+  }
+
+  @Test
+  public void leExpression() {
+    assertExpression("@lineNetAmt@ <= 5",
+        "OB.Utilities.getValue(currentValues,'lineNetAmount')  <=  5");
+  }
+
+  @Test
+  public void gtExpression() {
+    assertExpression("@lineNetAmt@ > 100",
+        "OB.Utilities.getValue(currentValues,'lineNetAmount')  >  100");
+  }
+
+  @Test
+  public void geExpression() {
+    assertExpression("@lineNetAmt@ >= 100",
+        "OB.Utilities.getValue(currentValues,'lineNetAmount')  >=  100");
+  }
+
+  @Test
+  public void orExpression() {
+    assertExpression(
+        "@Financial_Invoice_Line@='N' | @lineNetAmt@ > 100",
+        "OB.Utilities.getValue(currentValues,'financialInvoiceLine') === false || OB.Utilities.getValue(currentValues,'lineNetAmount')  >  100");
+  }
+
+  @Test
+  public void andExpression() {
+    assertExpression(
+        "@Financial_Invoice_Line@='N' & @lineNetAmt@ > 100",
+        "OB.Utilities.getValue(currentValues,'financialInvoiceLine') === false && OB.Utilities.getValue(currentValues,'lineNetAmount')  >  100");
+  }
+
+  private void assertExpression(String originalExpression, String expectedExpression) {
+    setSystemAdministratorContext();
+    Tab tab = OBDal.getInstance().get(Tab.class, SALES_INVOICE_LINE_TAB);
+    DynamicExpressionParser parser = new DynamicExpressionParser(originalExpression, tab);
+
+    String parsedExpression = parser.getJSExpression();
+    assertThat("Parsed dynamic expresion [" + originalExpression + "]", parsedExpression,
+        equalTo(expectedExpression));
+  }
 }
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ADAlertDatasourceService.java	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ADAlertDatasourceService.java	Tue Feb 20 05:47:07 2018 +0000
@@ -11,20 +11,23 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2015-2016 Openbravo SLU
+ * All portions are Copyright (C) 2015-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
  */
 package org.openbravo.client.application;
 
+import static org.openbravo.erpCommon.utility.StringCollectionUtils.commaSeparated;
+
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import javax.servlet.ServletException;
 
-import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.hibernate.SQLQuery;
 import org.hibernate.exception.SQLGrammarException;
@@ -34,11 +37,7 @@
 import org.openbravo.client.kernel.RequestContext;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
-import org.openbravo.dal.service.OBQuery;
 import org.openbravo.erpCommon.utility.UsedByLink;
-import org.openbravo.model.ad.alert.Alert;
-import org.openbravo.model.ad.alert.AlertRecipient;
-import org.openbravo.model.ad.alert.AlertRule;
 import org.openbravo.service.datasource.DefaultDataSourceService;
 import org.openbravo.service.json.JsonConstants;
 import org.slf4j.Logger;
@@ -51,6 +50,8 @@
   private static final String AD_TABLE_ID = "594";
   private static final String ALERT_STATUS = "_alertStatus";
   private static final String ALERT_RULE_TAB = "alertRule.tab.id";
+  private static final int ALERT_RULE_ID = 0;
+  private static final int ALERT_RULE_FILTERCLAUSE = 1;
   private static final Logger log = LoggerFactory.getLogger(ADAlertDatasourceService.class);
 
   @Override
@@ -70,9 +71,6 @@
       alertStatus = parameters.get(ALERT_STATUS);
       alertStatus = StringUtils.isEmpty(alertStatus) ? "" : alertStatus.toUpperCase();
 
-      String whereClause = getWhereAndFilterClause(parameters);
-      parameters.put(JsonConstants.WHERE_AND_FILTER_CLAUSE, whereClause);
-
       if (parameters.get(JsonConstants.DISTINCT_PARAMETER) == null) {
         // Also return the tab id of the alert rule, just when loading the grid from the server.
         // This is used in the Alert Management window to navigate to the record related to an alert
@@ -95,68 +93,79 @@
     // Alerts. Alerts are filtered based on each user/role.
   }
 
-  private List<String> getAlertIds() {
+  private List<String> getAlertIds(String alertStatus) {
     // Get alert rules visible for context's the role/user.
-    try {
-      OBContext.setAdminMode(false);
-      StringBuffer whereClause = new StringBuffer();
-      whereClause.append(" as ar ");
-      whereClause.append("\nwhere exists (select 1 from ar."
-          + AlertRule.PROPERTY_ADALERTRECIPIENTLIST + " as arr");
-      whereClause.append("\n    where arr." + AlertRecipient.PROPERTY_USERCONTACT + ".id = :user");
-      whereClause.append("\n      or (");
-      whereClause.append("arr." + AlertRecipient.PROPERTY_USERCONTACT + " is null");
-      whereClause.append("\n          and arr." + AlertRecipient.PROPERTY_ROLE + ".id = :role))");
+    final String sql = "SELECT ad_alertrule_id, filterclause"
+        + "  FROM ad_alertrule arule" //
+        + " WHERE EXISTS (SELECT 1" //
+        + "                 FROM ad_alertrecipient arecipient"
+        + "                WHERE arule.ad_alertrule_id = arecipient.ad_alertrule_id"
+        + "                  AND (ad_user_id = :userId"
+        + "                       OR (ad_user_id is null AND ad_role_id = :roleId)))"
+        + "  AND ad_client_id " + OBDal.getInstance().getReadableClientsInClause()
+        + "  AND ad_org_id " + OBDal.getInstance().getReadableOrganizationsInClause()
+        + "  AND isactive='Y'";
 
-      OBQuery<AlertRule> alertRulesQuery = OBDal.getInstance().createQuery(AlertRule.class,
-          whereClause.toString());
-      alertRulesQuery.setNamedParameter("user", OBContext.getOBContext().getUser().getId());
-      alertRulesQuery.setNamedParameter("role", OBContext.getOBContext().getRole().getId());
-
-      return getAlertIdsFromAlertRules(alertRulesQuery.list());
-    } finally {
-      OBContext.restorePreviousMode();
-    }
+    final SQLQuery alertRules = OBDal.getInstance().getSession().createSQLQuery(sql);
+    alertRules.setParameter("userId", OBContext.getOBContext().getUser().getId());
+    alertRules.setParameter("roleId", OBContext.getOBContext().getRole().getId());
+    return getAlertIdsFromAlertRules(getAlertRulesGroupedByFilterClause(alertRules), alertStatus);
   }
 
-  private List<String> getAlertIdsFromAlertRules(List<AlertRule> alertRules) {
+  /**
+   * The method groups the AlertRule IDS by taking into account when they have the same filter
+   * clause.
+   */
+  private Map<String, List<String>> getAlertRulesGroupedByFilterClause(SQLQuery alertRules) {
+    Map<String, List<String>> alertRulesIdGroupByFilterClauses = new HashMap<>();
+    try {
+      for (Object resultObject : alertRules.list()) {
+        final Object[] resultAlertRules = (Object[]) resultObject;
+        String alertRuleId = resultAlertRules[ALERT_RULE_ID].toString();
+        String alertRuleFilterClause = resultAlertRules[ALERT_RULE_FILTERCLAUSE] == null ? ""
+            : resultAlertRules[ALERT_RULE_FILTERCLAUSE].toString();
+
+        List<String> ids = alertRulesIdGroupByFilterClauses.get(alertRuleFilterClause);
+        if (ids == null) {
+          ids = new ArrayList<>();
+          alertRulesIdGroupByFilterClauses.put(alertRuleFilterClause, ids);
+        }
+        ids.add(alertRuleId);
+      }
+    } catch (SQLGrammarException e) {
+      log.error("An error has ocurred when trying to process the alert rules: " + e.getMessage(), e);
+    }
+    return alertRulesIdGroupByFilterClauses;
+  }
+
+  private List<String> getAlertIdsFromAlertRules(
+      Map<String, List<String>> alertRulesGroupByFilterClause, String alertStatus) {
     List<String> alertIds = new ArrayList<String>();
-    for (AlertRule alertRule : alertRules) {
-      // Adding alert rule if it has not filter clause. In case it has, it will be added only in
-      // case it returns data after applying the filter clause.
-      if (alertRule.getFilterClause() == null) {
-        for (Alert alert : alertRule.getADAlertList()) {
-          alertIds.add(alert.getId());
+    for (Entry<String, List<String>> alertRuleList : alertRulesGroupByFilterClause.entrySet()) {
+      String filterClause;
+      try {
+        filterClause = new UsedByLink().getWhereClause(
+            RequestContext.get().getVariablesSecureApp(), "", alertRuleList.getKey());
+      } catch (ServletException e) {
+        throw new IllegalStateException(e);
+      }
+      final String sql = "SELECT ad_alert_id FROM ad_alert WHERE isactive='Y'"
+          + " AND ad_client_id " + OBDal.getInstance().getReadableClientsInClause()
+          + " AND ad_org_id " + OBDal.getInstance().getReadableOrganizationsInClause()
+          + " AND ad_alertrule_id IN (" + commaSeparated(alertRuleList.getValue()) + ")"
+          + filterClause + " AND coalesce(to_char(status), 'NEW') = :status";
+      final SQLQuery sqlQuery = OBDal.getInstance().getSession().createSQLQuery(sql);
+      sqlQuery.setParameter("status", alertStatus);
+      try {
+        @SuppressWarnings("unchecked")
+        List<String> alertsFound = sqlQuery.list();
+        if (log.isDebugEnabled()) {
+          log.debug("Alert rule IDs: " + alertRuleList.getValue() + ") - SQL:'" + sql
+              + "' - Rows: " + alertsFound.size());
         }
-      }
-
-      String filterClause = null;
-      if (alertRule.getFilterClause() != null) {
-        try {
-          filterClause = new UsedByLink().getWhereClause(RequestContext.get()
-              .getVariablesSecureApp(), "", alertRule.getFilterClause());
-        } catch (ServletException e) {
-          throw new IllegalStateException(e);
-        }
-        final String sql = "select * from AD_ALERT where ISACTIVE='Y'" + " AND AD_CLIENT_ID "
-            + OBDal.getInstance().getReadableClientsInClause() + " AND AD_ORG_ID "
-            + OBDal.getInstance().getReadableOrganizationsInClause() + " AND AD_ALERTRULE_ID = ? "
-            + (filterClause == null ? "" : filterClause);
-        final SQLQuery sqlQuery = OBDal.getInstance().getSession().createSQLQuery(sql)
-            .addEntity(Alert.ENTITY_NAME);
-        sqlQuery.setParameter(0, alertRule.getId());
-
-        try {
-          @SuppressWarnings("unchecked")
-          List<Alert> alertsWithFilterClause = sqlQuery.list();
-          log.debug("Alert " + alertRule.getName() + " (" + alertRule.getId() + ") - SQL:'" + sql
-              + "' - Rows: " + alertsWithFilterClause.size());
-          for (Alert alert : alertsWithFilterClause) {
-            alertIds.add(alert.getId());
-          }
-        } catch (SQLGrammarException e) {
-          log.error("An error has ocurred when trying to process the alerts: " + e.getMessage(), e);
-        }
+        alertIds.addAll(alertsFound);
+      } catch (SQLGrammarException e) {
+        log.error("An error has ocurred when trying to process the alerts: " + e.getMessage(), e);
       }
     }
     return alertIds;
@@ -168,11 +177,9 @@
     alertStatus = parameters.get(ALERT_STATUS);
     alertStatus = StringUtils.isEmpty(alertStatus) ? "" : alertStatus.toUpperCase();
 
-    List<String> alertList = getAlertIds();
+    List<String> alertList = getAlertIds(alertStatus);
     int chunkSize = 1000;
-    String filterClause;
-    String whereClause = "coalesce(to_char(status), 'NEW') = '"
-        + StringEscapeUtils.escapeSql(alertStatus) + "'";
+    String whereClause = "";
     ArrayList<String> alertListToRemove;
 
     if (alertList.size() == 0) {
@@ -180,40 +187,26 @@
     }
 
     if (alertList.size() <= chunkSize) {
-      whereClause += " and e.id in (" + toStringList(alertList) + ")";
-      return whereClause;
+      return "e.id in (" + commaSeparated(alertList) + ")";
     }
 
     // There are more than 1000 alerts to include in the where clause, Oracle doesn't
     // support it, so let's split them in chunks with <=1000 elements each
     alertListToRemove = new ArrayList<String>();
-    filterClause = "";
     while (alertList.size() > chunkSize) {
       alertListToRemove = new ArrayList<String>(alertList.subList(0, chunkSize - 1));
-      if (StringUtils.isEmpty(filterClause)) {
-        filterClause = " and (e.id in (" + toStringList(alertListToRemove) + ")";
+      if (StringUtils.isEmpty(whereClause)) {
+        whereClause = "(e.id in (" + commaSeparated(alertListToRemove) + ")";
       } else {
-        filterClause += " or e.id in (" + toStringList(alertListToRemove) + ")";
+        whereClause += " or e.id in (" + commaSeparated(alertListToRemove) + ")";
       }
       alertList.removeAll(alertListToRemove);
     }
     if (!alertList.isEmpty()) {
-      filterClause += " or e.id in (" + toStringList(alertList) + "))";
+      whereClause += " or e.id in (" + commaSeparated(alertList) + "))";
     } else {
-      filterClause += ")";
+      whereClause += ")";
     }
-    whereClause += filterClause;
     return whereClause;
   }
-
-  private String toStringList(List<String> list) {
-    String result = "";
-    for (String s : list) {
-      if (!StringUtils.isEmpty(result)) {
-        result += ", ";
-      }
-      result += "'" + s + "'";
-    }
-    return result;
-  }
 }
\ No newline at end of file
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java	Tue Feb 20 05:47:07 2018 +0000
@@ -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) 2011-2016 Openbravo SLU
+ * All portions are Copyright (C) 2011-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -52,8 +52,21 @@
  */
 public class DynamicExpressionParser {
 
-  private static final String[][] COMPARATIONS = { { "==", " === " }, { "=", " === " },
-      { "!", " !== " }, { "^", " !== " }, { "-", " !== " } };
+  private static final String[][] COMPARATIONS = { //
+
+  { "==", " === " }, //
+      { "=", " === " }, //
+
+      { "!", " !== " }, //
+      { "^", " !== " }, //
+      { "-", " !== " }, //
+
+      { "<=", " <= " }, //
+      { "<", " < " }, //
+
+      { ">=", " >= " }, //
+      { ">", " > " }, //
+  };
 
   private static final String[][] UNIONS = { { "|", " || " }, { "&", " && " } };
 
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java	Tue Feb 20 05:47:07 2018 +0000
@@ -118,7 +118,8 @@
   private void linkForms() {
     final String formsHql = "select fa.specialForm.id " + //
         " from ADFormAccess fa " + //
-        "where fa.role.id=:roleId";
+        "where fa.role.id=:roleId" + //
+        "  and fa.active = true";
 
     final Query formsQry = OBDal.getInstance().getSession().createQuery(formsHql);
     formsQry.setParameter("roleId", OBContext.getOBContext().getRole().getId());
@@ -138,7 +139,8 @@
   private void linkProcesses() {
     final String allowedProcessHql = "select pa.process.id " + //
         " from ADProcessAccess pa " + //
-        "where pa.role = :role";
+        "where pa.role = :role" + //
+        "  and pa.active = true";
 
     final Query allowedProcessQry = OBDal.getInstance().getSession().createQuery(allowedProcessHql);
     allowedProcessQry.setParameter("role", OBContext.getOBContext().getRole());
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/TreeTablesEventHandler.java	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/TreeTablesEventHandler.java	Tue Feb 20 05:47:07 2018 +0000
@@ -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) 2013-2016 Openbravo SLU
+ * All portions are Copyright (C) 2013-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -48,7 +48,7 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * This event handler listen to events that are fired in all the tables with the flag isTree
+ * This event handler listens to events that are fired in all the tables with the flag isTree
  * checked. When a record is created or deleted in one of these tables, the add or remove method of
  * the corresponding datasource is executed.
  * 
@@ -114,7 +114,7 @@
   }
 
   private DataSourceService getDataSource(String tableId) {
-    Table table = OBDal.getInstance().get(Table.class, tableId);
+    Table table = OBDal.getInstance().getProxy(Table.class, tableId);
     OBCriteria<TableTree> obq = OBDal.getInstance().createCriteria(TableTree.class);
     obq.add(Restrictions.eq(TableTree.PROPERTY_TABLE, table));
     obq.add(Restrictions.eq(TableTree.PROPERTY_ISMAINTREE, true));
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java	Tue Feb 20 05:47:07 2018 +0000
@@ -32,6 +32,7 @@
 import org.openbravo.client.application.ProcessAccess;
 import org.openbravo.client.kernel.BaseActionHandler;
 import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.security.EntityAccessChecker;
 import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.database.SessionInfo;
@@ -170,6 +171,13 @@
    * 
    */
   public static boolean hasAccess(Process processDefinition, Map<String, Object> parameters) {
+    // Check Process Definition Access Level
+    String userLevel = OBContext.getOBContext().getUserLevel();
+    int accessLevel = Integer.parseInt(processDefinition.getDataAccessLevel());
+    if (!EntityAccessChecker.hasCorrectAccessLevel(userLevel, accessLevel)) {
+      return false;
+    }
+    // Check Process Definition Permission
     String windowId = (String) parameters.get("windowId");
     if (windowId != null && !"null".equals(windowId)) {
       Window window = OBDal.getInstance().get(Window.class, windowId);
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/report/BaseReportActionHandler.java	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/report/BaseReportActionHandler.java	Tue Feb 20 05:47:07 2018 +0000
@@ -54,6 +54,7 @@
 import org.openbravo.base.structure.BaseOBObject;
 import org.openbravo.client.application.ApplicationConstants;
 import org.openbravo.client.application.Parameter;
+import org.openbravo.client.application.Process;
 import org.openbravo.client.application.ReportDefinition;
 import org.openbravo.client.application.process.BaseProcessActionHandler;
 import org.openbravo.client.application.process.ResponseActionsBuilder.MessageType;
@@ -63,6 +64,7 @@
 import org.openbravo.client.kernel.reference.UIDefinition;
 import org.openbravo.client.kernel.reference.UIDefinitionController;
 import org.openbravo.dal.core.DalContextListener;
+import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.database.ConnectionProvider;
 import org.openbravo.database.SessionInfo;
@@ -342,7 +344,7 @@
 
     final JSONObject reportAction = new JSONObject();
     if (expType.equals(ExportType.HTML)) {
-      recordInfo.put("tabTitle", report.getProcessDefintion().getName());
+      recordInfo.put("tabTitle", getResultTabTitle(report));
       reportAction.put("OBUIAPP_browseReport", recordInfo);
     } else {
       reportAction.put("OBUIAPP_downloadReport", recordInfo);
@@ -360,6 +362,12 @@
     return ExportType.getExportType(action);
   }
 
+  private String getResultTabTitle(ReportDefinition report) {
+    Process processDefinition = report.getProcessDefintion();
+    return (String) processDefinition.get(Process.PROPERTY_NAME, OBContext.getOBContext()
+        .getLanguage());
+  }
+
   /**
    * Override this method to add validations to the report before it is generated.
    * 
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportingUtils.java	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportingUtils.java	Tue Feb 20 05:47:07 2018 +0000
@@ -112,8 +112,8 @@
    */
   public static final String PDF_JAVASCRIPT = "PDF Javascript";
 
-  private static final double TEXT_CHAR_HEIGHT = 10;
-  private static final double TEXT_CHAR_WIDTH = 10;
+  private static final float TEXT_CHAR_HEIGHT = 10;
+  private static final float TEXT_CHAR_WIDTH = 10;
   private static final Logger log = LoggerFactory.getLogger(ReportingUtils.class);
 
   /**
@@ -752,8 +752,8 @@
     textExporter.setConfiguration(textExporterConfiguration);
     // Default item text configuration that can be overridden in the .jrxml template itself
     SimpleTextReportConfiguration textReportConfiguration = new SimpleTextReportConfiguration();
-    textReportConfiguration.setCharHeight(new Float(TEXT_CHAR_HEIGHT));
-    textReportConfiguration.setCharWidth(new Float(TEXT_CHAR_WIDTH));
+    textReportConfiguration.setCharHeight(TEXT_CHAR_HEIGHT);
+    textReportConfiguration.setCharWidth(TEXT_CHAR_WIDTH);
     textReportConfiguration.setOverrideHints(false);
     textExporter.setConfiguration(textReportConfiguration);
 
@@ -785,8 +785,8 @@
     textExporter.setConfiguration(textExporterConfiguration);
     // Default item text configuration that can be overridden in the .jrxml template itself
     SimpleTextReportConfiguration textReportConfiguration = new SimpleTextReportConfiguration();
-    textReportConfiguration.setCharHeight(new Float(TEXT_CHAR_HEIGHT));
-    textReportConfiguration.setCharWidth(new Float(TEXT_CHAR_WIDTH));
+    textReportConfiguration.setCharHeight(TEXT_CHAR_HEIGHT);
+    textReportConfiguration.setCharWidth(TEXT_CHAR_WIDTH);
     textReportConfiguration.setOverrideHints(false);
     textExporter.setConfiguration(textReportConfiguration);
 
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java	Tue Feb 20 05:47:07 2018 +0000
@@ -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) 2010-2016 Openbravo SLU
+ * All portions are Copyright (C) 2010-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -409,11 +409,12 @@
   }
 
   /**
-   * Returns true if the grid allows adding summary functions. If the tab is based on an HQL table,
-   * this method is returning false because grid summaries are not allowed for this kind of tables.
+   * Returns true if the grid allows adding summary functions. If the tab is based on an HQL table
+   * or Datasource table, this method is returning false because grid summaries are not allowed for
+   * these kind of tables.
    */
   public boolean getAllowSummaryFunctions() {
-    if (isHqlBasedTable(tab.getTable())) {
+    if (isHqlBasedTable(tab.getTable()) || isDatasourceBasedTable(tab.getTable())) {
       return false;
     }
     return isConfigurationPropertyEnabled(GCTab.PROPERTY_ALLOWSUMMARYFUNCTIONS,
@@ -471,4 +472,8 @@
   private boolean isHqlBasedTable(Table table) {
     return ApplicationConstants.HQLBASEDTABLE.equals(table.getDataOriginType());
   }
+
+  private boolean isDatasourceBasedTable(Table table) {
+    return ApplicationConstants.DATASOURCEBASEDTABLE.equals(table.getDataOriginType());
+  }
 }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js	Tue Feb 20 05:47:07 2018 +0000
@@ -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) 2011-2015 Openbravo SLU
+ * All portions are Copyright (C) 2011-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -126,8 +126,6 @@
       items: []
     });
 
-    OB.Datasource.get('DB9F062472294F12A0291A7BD203F922', this, null, true);
-
     this.Super('initWidget', arguments);
   },
 
@@ -136,6 +134,10 @@
       this.contextMenu.destroy();
       this.contextMenu = null;
     }
+    if (this.dataSource) {
+      this.dataSource.destroy();
+      this.dataSource = null;
+    }
     this.Super('destroy', arguments);
   },
 
@@ -177,25 +179,24 @@
   },
 
   getGridTotalRows: function () {
+    OB.AlertManagement.setTotalRows(this.getTotalRows(), this.alertStatus);
+  },
+
+  getTotalRowsForAlert: function () {
     var criteria = this.getCriteria() || {},
         requestProperties = {};
 
-    if (!OB.AlertManagement.sections[this.alertStatus].expanded) {
-      // fetch to the datasource with an empty criteria to get all the rows
-      requestProperties.params = requestProperties.params || {};
-      requestProperties.params._alertStatus = this.alertStatus;
-      requestProperties.params._startRow = 0;
-      requestProperties.params._endRow = this.dataPageSize;
-      requestProperties.clientContext = {
-        alertStatus: this.alertStatus
-      };
-      this.dataSource.fetchData(criteria, function (dsResponse, data, dsRequest) {
-        OB.AlertManagement.setTotalRows(dsResponse.totalRows, dsResponse.clientContext.alertStatus);
-      }, requestProperties);
-
-    } else {
-      OB.AlertManagement.setTotalRows(this.getTotalRows(), this.alertStatus);
-    }
+    // fetch to the datasource with an empty criteria to get all the rows
+    requestProperties.params = requestProperties.params || {};
+    requestProperties.params._alertStatus = this.alertStatus;
+    requestProperties.params._startRow = 0;
+    requestProperties.params._endRow = this.dataPageSize;
+    requestProperties.clientContext = {
+      alertStatus: this.alertStatus
+    };
+    this.dataSource.fetchData(criteria, function (dsResponse, data, dsRequest) {
+      OB.AlertManagement.setTotalRows(dsResponse.totalRows, dsResponse.clientContext.alertStatus);
+    }, requestProperties);
   },
 
   getFetchRequestParams: function (params) {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js	Tue Feb 20 05:47:07 2018 +0000
@@ -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) 2011-2015 Openbravo SLU
+ * All portions are Copyright (C) 2011-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -29,6 +29,45 @@
     return result;
   },
 
+  createAlertDataSource: function () {
+    return OB.Datasource.create({
+      createClassName: '',
+      ID: 'DB9F062472294F12A0291A7BD203F922' + '_' + new Date().getTime(),
+      potentiallyShared: true,
+      dataURL: OB.Utilities.applicationUrl('org.openbravo.service.datasource/DB9F062472294F12A0291A7BD203F922'),
+      requestProperties: {
+        params: {
+          _contextUrl: OB.Utilities.getLocationUrlWithoutFragment(),
+          _skinVersion: 'Default',
+          Constants_IDENTIFIER: OB.Constants.IDENTIFIER,
+          Constants_FIELDSEPARATOR: OB.Constants.FIELDSEPARATOR,
+          _new: 'true',
+          _create: 'true'
+        }
+      },
+      fields: [{
+        name: 'id',
+        type: '_id_13',
+        primaryKey: true
+      }, {
+        name: 'creationDate',
+        type: '_id_16'
+      }, {
+        name: 'description',
+        type: '_id_14'
+      }, {
+        name: 'alertRule',
+        type: '_id_19'
+      }, {
+        name: 'comments',
+        type: '_id_14'
+      }, {
+        name: 'recordID',
+        type: '_id_10'
+      }]
+    });
+  },
+
   translatedStatus: {
     New: '',
     Acknowledged: '',
@@ -110,6 +149,7 @@
     this.grids.New = isc.OBAlertGrid.create({
       alertStatus: 'New'
     });
+
     this.NewAcknowledged = isc.OBAlertSectionStackControl.create({
       currentStatus: 'New',
       newStatus: 'Acknowledged',
@@ -183,6 +223,11 @@
       items: [this.grids.Solved]
     };
     this.sectionStack.addSection(this.sections.Solved);
+
+    this.grids.New.setDataSource(this.createAlertDataSource());
+    this.grids.Acknowledged.setDataSource(this.createAlertDataSource());
+    this.grids.Suppressed.setDataSource(this.createAlertDataSource());
+    this.grids.Solved.setDataSource(this.createAlertDataSource());
   },
 
   destroy: function () {
@@ -264,11 +309,13 @@
   },
 
   refresh: function () {
-    var i, alertStatus = ['New', 'Acknowledged', 'Suppressed', 'Solved'];
+    var i, section, alertStatus = ['New', 'Acknowledged', 'Suppressed', 'Solved'];
     for (i = 0; i < 4; i++) {
       OB.AlertManagement.grids[alertStatus[i]].invalidateCache();
-      if (!OB.AlertManagement.sections[alertStatus[i]].expanded) {
-        OB.AlertManagement.grids[alertStatus[i]].getGridTotalRows();
+      section = OB.AlertManagement.sections[alertStatus[i]];
+      // force to refresh collapsed grids
+      if (!section.getSectionHeader().expanded) {
+        OB.AlertManagement.grids[alertStatus[i]].getTotalRowsForAlert();
       }
       if (OB.AlertManagement.grids[alertStatus[i]].isDrawn()) {
         OB.AlertManagement.grids[alertStatus[i]].isRefreshing = true;
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js	Tue Feb 20 05:47:07 2018 +0000
@@ -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) 2011-2014 Openbravo SLU
+ * All portions are Copyright (C) 2011-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -45,14 +45,18 @@
     OB.RemoteCallManager.call('org.openbravo.client.application.window.ImagesActionHandler', {}, d, function (response, data, request) {
       var pageHeight = isc.Page.getHeight() - 100;
       var pageWidth = isc.Page.getWidth() - 100;
-      var height;
-      var width;
-      var ratio = data.width / data.height;
+      var height = data.height;
+      var width = data.width;
+      if (!width && !height) {
+        width = pageWidth;
+        height = pageHeight;
+      }
+      var ratio = width / height;
       if (ratio > pageWidth / pageHeight) {
-        width = data.width > pageWidth ? pageWidth : data.width;
+        width = width > pageWidth ? pageWidth : width;
         height = width / ratio;
       } else {
-        height = data.height > pageHeight ? pageHeight : data.height;
+        height = height > pageHeight ? pageHeight : height;
         width = height * ratio;
       }
       var imagePopup = isc.OBPopup.create({
@@ -241,39 +245,50 @@
     if (!newValue || newValue === '') {
       this.canvas.setImage('');
     } else {
-      this.canvas.setImage("../utility/ShowImage?id=" + newValue + '&nocache=' + Math.random());
-      var d = {
-        inpimageId: newValue,
-        command: 'GETSIZE'
-      };
-      var image = this.canvas.image;
-      var imageLayout = this.canvas.imageLayout;
-      OB.RemoteCallManager.call('org.openbravo.client.application.window.ImagesActionHandler', {}, d, function (response, data, request) {
-        var maxHeight = imageLayout.getHeight() - 12;
-        var maxWidth = imageLayout.getWidth() - 12;
-        var maxRatio = maxWidth / maxHeight;
+      if (this.isLoadedCurrentImage(newValue)) {
+        this.canvas.setImage(this.canvas.image.src);
+      } else {
+        this.canvas.setImage("../utility/ShowImage?id=" + newValue + '&nocache=' + Math.random());
+        var d = {
+          inpimageId: newValue,
+          command: 'GETSIZE'
+        };
+        var image = this.canvas.image;
+        var imageLayout = this.canvas.imageLayout;
+        OB.RemoteCallManager.call('org.openbravo.client.application.window.ImagesActionHandler', {}, d, function (response, data, request) {
+          var maxHeight = imageLayout.getHeight() - 12;
+          var maxWidth = imageLayout.getWidth() - 12;
+          var maxRatio = maxWidth / maxHeight;
 
-        var imgHeight = data.height;
-        var imgWidth = data.width;
-        var imgRatio = imgWidth / imgHeight;
+          var imgHeight = data.height;
+          var imgWidth = data.width;
+          if (!imgWidth && !imgHeight) {
+            imgWidth = maxWidth;
+            imgHeight = maxHeight;
+          }
+          var imgRatio = imgWidth / imgHeight;
 
-        if (imgHeight < maxHeight && imgWidth < maxWidth) {
-          image.setHeight(imgHeight);
-          image.setWidth(imgWidth);
-        } else if (imgRatio < maxRatio) {
-          image.setHeight(maxHeight);
-          image.setWidth(maxHeight * imgRatio);
-        } else {
-          image.setHeight(maxWidth / imgRatio);
-          image.setWidth(maxWidth);
-        }
-      });
+          if (imgHeight < maxHeight && imgWidth < maxWidth) {
+            image.setHeight(imgHeight);
+            image.setWidth(imgWidth);
+          } else if (imgRatio < maxRatio) {
+            image.setHeight(maxHeight);
+            image.setWidth(maxHeight * imgRatio);
+          } else {
+            image.setHeight(maxWidth / imgRatio);
+            image.setWidth(maxWidth);
+          }
+        });
+      }
     }
     //Buttons will not be shown if the form is readonly
     this.canvas.deleteButton.updateState(newValue && (this.form && !this.form.readOnly) && !this.disabled);
     this.canvas.selectorButton.updateState((this.form && !this.form.readOnly) && !this.disabled);
     return this.Super('setValue', arguments);
   },
+  isLoadedCurrentImage: function (imageId) {
+    return this.canvas.image && this.canvas.image.src && this.canvas.image.src.contains('ShowImage?id=' + imageId);
+  },
   refreshImage: function (imageId) {
     //If creating/replacing an image, the form is marked as modified
     //and the image id is set as the value of the item
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js	Tue Feb 20 05:47:07 2018 +0000
@@ -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) 2011-2016 Openbravo SLU
+ * All portions are Copyright (C) 2011-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -667,6 +667,18 @@
     return this.Super('setElementValue', arguments);
   },
 
+  compareValues: function (value1, value2) {
+    if (this.isTargetRecordBeingOpened() && value1 === '' && value2 === undefined) {
+      // prevent extra DS requests when opening a record directly by ignoring false updates in the item value
+      return true;
+    }
+    return (0 === isc.Date.compareLogicalDates(value1, value2));
+  },
+
+  isTargetRecordBeingOpened: function () {
+    return this.grid && this.grid.parentElement && this.grid.parentElement.targetRecordId;
+  },
+
   mapDisplayToValue: function (display) {
     return display;
   },
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree.js	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree.js	Tue Feb 20 05:47:07 2018 +0000
@@ -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) 2013-2016 Openbravo SLU
+ * All portions are Copyright (C) 2013-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -112,8 +112,7 @@
   },
 
   openTreeWindow: function () {
-    var selectedValue = this.getValue(),
-        criteria, innerCriteria;
+    var selectedValue = this.getValue();
     if (this.treeWindow.treeGrid) {
       //If there is a record selected in the item, use it to filter the tree
       // check if the value is present in the value map to ensure it is the id of the selected item
@@ -166,8 +165,7 @@
 
   setValueFromRecord: function (record) {
     var currentValue = this.getValue(),
-        identifierFieldName = this.name + OB.Constants.FIELDSEPARATOR + OB.Constants.IDENTIFIER,
-        i;
+        identifierFieldName = this.name + OB.Constants.FIELDSEPARATOR + OB.Constants.IDENTIFIER;
     if (!record) {
       this.storeValue(null);
       this.form.setValue(this.name + OB.Constants.FIELDSEPARATOR + this.displayField, null);
@@ -228,6 +226,7 @@
   init: function () {
     OB.Datasource.get(this.treeItem.dataSourceId, this, null, true);
     this.Super('init', arguments);
+    this.originalEmptyMessage = this.emptyMessage;
   },
 
   dataArrived: function () {
@@ -244,17 +243,29 @@
         me.scrollRecordIntoView(rowNum, true);
       }, 100);
     }
+    // Restore the empty message of the tree grid
+    // It may have been changed with the showErrorMessageInPicker() function in previous DS requests
+    this.emptyMessage = this.originalEmptyMessage;
   },
 
   show: function (explicitCriteria) {
     this.updatePosition();
+    this.emptyMessage = this.originalEmptyMessage;
     this.fetchData(explicitCriteria);
     this._pageClickID = this.ns.Page.setEvent('mouseDown', this, null, 'clickOutsideTree');
     return this.Super('show', arguments);
   },
 
+  showErrorMessageInPicker: function (message) {
+    if (!this.isVisible()) {
+      return;
+    }
+    this.emptyMessage = '<span class="' + this.errorMessageStyle + '">' + message + '</span>';
+    this.body.markForRedraw();
+  },
+
   clickOutsideTree: function () {
-    var target, event, eventInfo;
+    var target, eventInfo;
     if (!this.isVisible()) {
       return;
     }
@@ -271,8 +282,7 @@
   },
 
   updatePosition: function () {
-    var me = this,
-        interval, treeItemWidth;
+    var treeItemWidth;
     if (this.treeItem) {
       treeItemWidth = this.treeItem.getVisibleWidth();
       if (treeItemWidth && treeItemWidth > this.getWidth()) {
@@ -337,8 +347,6 @@
 
   //Select the record
   rowDoubleClick: function (record, recordNum, fieldNum) {
-    var id = record[OB.Constants.ID],
-        identifier = record[OB.Constants.IDENTIFIER];
     if (!this.treeItem.parentSelectionAllowed && this.data.hasChildren(record)) {
       return;
     }
@@ -478,8 +486,7 @@
       },
 
       dataArrived: function () {
-        var record, rowNum, i, selectedRecords = [],
-            ds, ids, me = this;
+        var record, rowNum, me = this;
         this.Super('dataArrived', arguments);
         if (this.treeItem.targetRecordId) {
           record = this.data.find(OB.Constants.ID, this.treeItem.targetRecordId);
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-grid.js	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-grid.js	Tue Feb 20 05:47:07 2018 +0000
@@ -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) 2013-2014 Openbravo SLU
+ * All portions are Copyright (C) 2013-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -130,8 +130,9 @@
   },
 
   handleFilterEditorSubmit: function (criteria, context, callback) {
-    if (isc.isA.Tree(this.data)) {
-      // Only reset the open state if the tree already has data
+    var gridCriteria = isc.isA.Function(this.convertCriteria) ? this.convertCriteria(criteria) : criteria;
+    if (isc.isA.Tree(this.data) && this.willFetchData(gridCriteria)) {
+      // Only reset the open state if the tree already has data and if the filter criteria has changed
       this.setOpenState('[]');
     }
     this.Super('handleFilterEditorSubmit', arguments);
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js	Tue Feb 20 05:47:07 2018 +0000
@@ -126,16 +126,25 @@
     };
 
     ds.handleError = function (response, request) {
-      if (response && response.error && response.error.type === 'tooManyNodes') {
-        me.view.messageBar.setMessage('error', null, OB.I18N.getLabel('OBUIAPP_TooManyNodes'));
+      var errorMessage;
+      if (!response || !response.error) {
+        return;
       }
+      if (response.error.type === 'tooManyNodes') {
+        errorMessage = 'OBUIAPP_TooManyNodes';
+      } else if (response.error.type === 'user' && response.error.message) {
+        errorMessage = response.error.message;
+      }
+      me.view.messageBar.setMessage('error', null, OB.I18N.getLabel(errorMessage));
     };
 
     ds.updateData = function (updatedRecord, callback, requestProperties) {
       // the new callback checks if the node movement has to be reverted
       var newCallback = function (dsResponse, data, dsRequest) {
           var i, node, parentNode;
-          if (dsRequest.newParentNode && dsRequest.dragTree && dsRequest.newParentNode.nodeId === dsRequest.dragTree.rootValue) {
+          if (dsResponse.error) {
+            ds.handleError(dsResponse, dsRequest);
+          } else if (dsRequest.newParentNode && dsRequest.dragTree && dsRequest.newParentNode.nodeId === dsRequest.dragTree.rootValue) {
             // if the node is being moved to the root, reload the grid to force
             // displaying properly the node in its new position. see issue https://issues.openbravo.com/view.php?id=26898
             dsRequest.dragTree.invalidateCache();
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Tue Feb 20 05:47:07 2018 +0000
@@ -1761,7 +1761,7 @@
     } else if (this.targetRecordId || this.selectedRecordId) {
       // direct link from other tab to a specific record
       this.delayedHandleTargetRecord(startRow, endRow);
-    } else if (this.view.shouldOpenDefaultEditMode()) {
+    } else if (this.view.shouldOpenDefaultEditMode() && !Array.isLoading(this.getRecord(startRow))) {
       // ui-pattern: single record/edit mode
       this.view.openDefaultEditView(this.getRecord(startRow));
     } else if (this.data && this.data.getLength() === 1) {
@@ -3085,7 +3085,7 @@
 
   editFailed: function (rowNum, colNum, newValues, oldValues, editCompletionEvent, dsResponse, dsRequest) {
     var record = this.getRecord(rowNum),
-        editRow, editSession, view = this.view,
+        view = this.view,
         form, isNewRecord;
 
     // set the default error message,
@@ -3107,9 +3107,14 @@
       isc.warn(OB.I18N.getLabel('OBUIAPP_AutoSaveError', [this.view.tabTitle]));
     }
 
-    // show an error message in the toolbar if the event that triggered the action was an autosave, to mimic the way client side validation errors are handled
+    form = this.getEditForm();
     if (view.standardWindow.isAutoSaving) {
+      // show an error message in the toolbar if the event that triggered the action was an autosave, to mimic the way client side validation errors are handled
       view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null, OB.I18N.getLabel('OBUIAPP_ErrorInFieldsGrid', [view.ID]));
+      if (form) {
+        // return the focus to the edit form of the record that failed to be edited
+        form.setFocusInForm();
+      }
     }
     view.standardWindow.cleanUpAutoSaveProperties();
     view.updateTabTitle();
@@ -3120,7 +3125,6 @@
       this.selectRecord(record);
     }
 
-    form = this.getEditForm();
     isNewRecord = (form === null) ? false : form.isNew;
     if (isNewRecord) {
       delete this.view._savingNewRecord;
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Tue Feb 20 05:47:07 2018 +0000
@@ -1249,6 +1249,12 @@
     if (keepSelection) {
       callback = function () {
         var length, i, recordIndex;
+
+        if (me.viewGrid.gridHasValidationErrors()) {
+          // there are unsaved records with errors: discard the changes in order to show the refreshed data
+          me.viewGrid.discardAllEdits();
+        }
+
         length = me.viewGrid.recordsSelectedBeforeRefresh.length;
         for (i = 0; i < length; i++) {
           recordIndex = me.viewGrid.getRecordIndex(me.viewGrid.recordsSelectedBeforeRefresh[i]);
@@ -1656,6 +1662,10 @@
     }
 
     if (this.parentView) {
+      if (this.parentView.defaultEditMode && this.parentView.viewGrid) {
+        // mark the parent grid to open the parent record in edit mode once its data has arrived
+        this.parentView.viewGrid.isOpenDirectModeLeaf = true;
+      }
       this.parentView.openDirectTabView(false);
     }
   },
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js	Tue Feb 20 05:47:07 2018 +0000
@@ -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) 2010-2016 Openbravo SLU
+ * All portions are Copyright (C) 2010-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -276,8 +276,7 @@
     var parts = this.getPrototype().Class.split('_'),
         len = parts.length,
         className = '_',
-        tabSet = OB.MainView.TabSet,
-        vStack, manualJS, originalClassName, processClass, processOwnerView, runningProcess;
+        originalClassName, processClass, processOwnerView, runningProcess;
 
     if (params.paramWindow) {
       className = className + params.processId;
@@ -315,7 +314,7 @@
   },
 
   openProcess: function (params) {
-    var processOwnerView, selectedState, processToBeOpened;
+    var processOwnerView, processToBeOpened;
     if (params.uiPattern === 'M') { // Manual UI Pattern
       try {
         if (isc.isA.Function(params.actionHandler)) {
@@ -328,7 +327,7 @@
     } else {
       processToBeOpened = this.buildProcess(params);
       if (processToBeOpened) {
-        processOwnerView = this.getProcessOwnerView(params.processId);
+        processOwnerView = params.processOwnerView || this.getProcessOwnerView(params.processId);
         this.runningProcess = processToBeOpened;
         this.selectedState = processOwnerView.viewGrid && processOwnerView.viewGrid.getSelectedState();
         this.openPopupInTab(this.runningProcess, params.windowTitle, (this.runningProcess.popupWidth ? this.runningProcess.popupWidth : '90%'), (this.runningProcess.popupHeight ? this.runningProcess.popupHeight : '90%'), (this.runningProcess.showMinimizeButton ? this.runningProcess.showMinimizeButton : false), (this.runningProcess.showMaximizeButton ? this.runningProcess.showMaximizeButton : false), true, true);
@@ -399,7 +398,7 @@
 
   // set window specific user settings, purposely set on class level
   setWindowSettings: function (data) {
-    var i, j, defaultView, persDefaultValue, views, length, t, tab, view, field, button, buttonParent, //
+    var i, j, length, t, tab, view, field, button, buttonParent, //
     st, stView, stBtns, stBtn, disabledFields, personalization, notAccessibleProcesses, extraCallback, //
     callbackFunc, alwaysReadOnly = function (view, record, context) {
         return true;
@@ -554,7 +553,7 @@
 
   setPersonalization: function (personalization) {
     var i, defaultView, persDefaultValue, views, currentView = this.activeView || this.view,
-        length, me = this;
+        length;
 
     // only personalize if there is a professional license
     if (!OB.Utilities.checkProfessionalLicense(null, true)) {
@@ -672,7 +671,7 @@
   },
 
   clearLastViewPersonalization: function () {
-    var p, length, personalization = this.getClass().personalization;
+    var p, personalization = this.getClass().personalization;
     delete this.lastViewApplied;
     if (personalization.forms) {
       for (p in personalization.forms) {
@@ -1178,13 +1177,11 @@
   },
 
   draw: function () {
-    var standardWindow = this,
-        targetEntity, ret = this.Super('draw', arguments),
+    var ret = this.Super('draw', arguments),
         i, length = this.views.length;
     if (this.targetTabId) {
       for (i = 0; i < length; i++) {
         if (this.views[i].tabId === this.targetTabId) {
-          targetEntity = this.views[i].entity;
           this.views[i].viewGrid.targetRecordId = this.targetRecordId;
           this.targetTabGrid = this.views[i].viewGrid;
           this.views[i].openDirectTabView(true);
@@ -1308,7 +1305,7 @@
   },
 
   getProcessOwnerView: function (processId) {
-    var ownerView, i, j, nActionButtons, nViews = this.views.length;
+    var i, j, nActionButtons, nViews = this.views.length;
     for (i = 0; i < nViews; i++) {
       nActionButtons = this.views[i].actionToolbarButtons.length;
       for (j = 0; j < nActionButtons; j++) {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js	Tue Feb 20 05:47:07 2018 +0000
@@ -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) 2010-2014 Openbravo SLU
+ * All portions are Copyright (C) 2010-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -699,13 +699,26 @@
       if (pane.members[0]) {
         pane.members[0].show();
       }
-      if (pane.members[1]) {
+      if (pane.members[1] && !this.allTabsHidden(pane.members[1])) {
         pane.members[1].show();
       }
-      //      this.selectTab(tab);
     }
   },
 
+  allTabsHidden: function (tabSet) {
+    var i, tabViewPane;
+    if (!isc.isA.Array(tabSet.tabs)) {
+      return false;
+    }
+    for (i = 0; i < tabSet.tabs.length; i++) {
+      tabViewPane = tabSet.tabs[i].pane;
+      if (!tabViewPane.hidden) {
+        return false;
+      }
+    }
+    return true;
+  },
+
   tabSelected: function (tabNum, tabPane, ID, tab) {
     var event = isc.EventHandler.getLastEvent(),
         tabSet = tabPane.getParentCanvas().getParentCanvas();
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-quick-launch.js	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-quick-launch.js	Tue Feb 20 05:47:07 2018 +0000
@@ -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) 2011-2018 Openbravo SLU
+ * All portions are Copyright (C) 2011-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -197,7 +197,7 @@
         // fixes issue https://issues.openbravo.com/view.php?id=15105
         pickListCellHeight: OB.Styles.OBFormField.DefaultComboBox.quickRunPickListCellHeight,
         recentPropertyName: this.recentPropertyName,
-        displayField: OB.Constants.TITLE,
+        displayField: OB.Constants.IDENTIFIER,
         entries: [],
 
         getControlTableCSS: function () {
@@ -236,9 +236,9 @@
         autoSizePickList: false,
 
         getPickListFilterCriteria: function () {
-          // only filter on identifier, ignoring accents
+          // only filter on identifier
           var criteria = {};
-          criteria[OB.Constants.IDENTIFIER] = OB.Utilities.removeAccents(this.getDisplayValue());
+          criteria[OB.Constants.IDENTIFIER] = this.getDisplayValue();
           return criteria;
         },
 
@@ -254,7 +254,7 @@
           }
         }, {
           name: OB.Constants.IDENTIFIER,
-          displayField: OB.Constants.TITLE,
+          displayField: OB.Constants.IDENTIFIER,
           valueField: OB.Constants.ID
         }],
         autoFetchData: true,
@@ -281,7 +281,7 @@
             isc.OBQuickRun.currentQuickRun.doHide();
             var openObject = isc.addProperties({}, record);
             if (record.optionType && record.optionType === 'tab') {
-              openObject = OB.Utilities.openView(record.windowId, viewValue, record[OB.Constants.TITLE], null, this.command, record.icon, record.readOnly, record.singleRecord, null, record.editOrDeleteOnly);
+              openObject = OB.Utilities.openView(record.windowId, viewValue, record[OB.Constants.IDENTIFIER], null, this.command, record.icon, record.readOnly, record.singleRecord, null, record.editOrDeleteOnly);
               if (openObject) {
                 OB.RecentUtilities.addRecent(this.recentPropertyName, openObject);
               }
@@ -291,7 +291,7 @@
                 viewId: 'OBExternalPage',
                 id: viewValue,
                 contentsURL: viewValue,
-                tabTitle: record[OB.Constants.TITLE]
+                tabTitle: record[OB.Constants.IDENTIFIER]
               };
             } else if (record.optionType && record.optionType === 'process') {
               var viewName = record.modal ? 'OBClassicPopupModal' : 'OBPopupClassicWindow';
@@ -302,7 +302,7 @@
                 obManualURL: viewValue,
                 popup: true,
                 command: 'BUTTON' + record.processId,
-                tabTitle: record[OB.Constants.TITLE]
+                tabTitle: record[OB.Constants.IDENTIFIER]
               };
             } else if (record.optionType && record.optionType === 'processManual') {
               openObject = {
@@ -311,12 +311,12 @@
                 id: record.processId,
                 obManualURL: viewValue,
                 command: 'DEFAULT',
-                tabTitle: record[OB.Constants.TITLE]
+                tabTitle: record[OB.Constants.IDENTIFIER]
               };
             } else if (record.optionType && record.optionType === 'processDefinition') {
               openObject = {
                 viewId: 'processDefinition_' + record.processId,
-                tabTitle: record[OB.Constants.TITLE]
+                tabTitle: record[OB.Constants.IDENTIFIER]
               };
             } else if (record.viewId) {
               openObject = record;
@@ -327,7 +327,7 @@
                 id: viewValue,
                 obManualURL: viewValue,
                 command: this.command,
-                tabTitle: record[OB.Constants.TITLE]
+                tabTitle: record[OB.Constants.IDENTIFIER]
               };
             } else {
               openObject = {
@@ -335,7 +335,7 @@
                 id: viewValue,
                 obManualURL: viewValue,
                 command: this.command,
-                tabTitle: record[OB.Constants.TITLE]
+                tabTitle: record[OB.Constants.IDENTIFIER]
               };
             }
             openObject.singleRecord = record.singleRecord;
@@ -396,7 +396,7 @@
         this.getQuickMenuItems(menuItem.submenu, quickMenu);
       } else if (this.isValidMenuItem(menuItem)) {
         validMenuItem = isc.clone(menuItem);
-        validMenuItem._identifier = OB.Utilities.removeAccents(validMenuItem.title);
+        validMenuItem._identifier = validMenuItem.title;
         validMenuItem.icon = this.getMenuItemIcon(validMenuItem);
         quickMenu.add(validMenuItem);
       }
@@ -450,7 +450,7 @@
 
     for (i = 0; i < menuEntries.length; i++) {
       menuEntry = menuEntries[i];
-      valueMap[menuEntry.id] = menuEntry.title;
+      valueMap[menuEntry.id] = menuEntry._identifier;
     }
     quickMenuCombo.preventPickListRequest = true; // preventing 1st request triggered by setValueMap
     quickMenuCombo.setValueMap(valueMap);
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-base-parameter-window-view.js	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-base-parameter-window-view.js	Tue Feb 20 05:47:07 2018 +0000
@@ -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) 2015-2016 Openbravo SLU
+ * All portions are Copyright (C) 2015-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -230,7 +230,11 @@
 
     params.windowId = this.windowId;
     OB.RemoteCallManager.call(this.defaultsActionHandler, context, params, function (rpcResponse, data, rpcRequest) {
-      view.handleDefaults(data);
+      if (data && data.message && data.message.severity === isc.OBMessageBar.TYPE_ERROR) {
+        view.handleErrorState(data.message);
+      } else {
+        view.handleDefaults(data);
+      }
     });
   },
 
@@ -269,7 +273,6 @@
   },
 
   showProcessing: function (processing) {
-    var i;
     if (processing) {
       if (this.theForm) {
         this.theForm.hide();
@@ -277,15 +280,7 @@
       if (this.popupButtons) {
         this.popupButtons.hide();
       }
-
-      if (this.toolBarLayout) {
-        for (i = 0; i < this.toolBarLayout.children.length; i++) {
-          if (this.toolBarLayout.children[i].hide) {
-            this.toolBarLayout.children[i].hide();
-          }
-        }
-      }
-
+      this.hideToolBarLayoutChildren();
       this.loading.show();
     } else {
       if (this.theForm) {
@@ -296,6 +291,17 @@
     }
   },
 
+  hideToolBarLayoutChildren: function () {
+    var i;
+    if (this.toolBarLayout) {
+      for (i = 0; i < this.toolBarLayout.children.length; i++) {
+        if (this.toolBarLayout.children[i].hide) {
+          this.toolBarLayout.children[i].hide();
+        }
+      }
+    }
+  },
+
   // Checks params with readonly logic enabling or disabling them based on it
   handleReadOnlyLogic: function () {
     var form, fields, i, field, parentContext;
@@ -334,6 +340,28 @@
     }
   },
 
+  handleErrorState: function (message) {
+    // Disable the parameter view elements
+    this.disableFormItems();
+    if (this.theForm) {
+      this.theForm.disable();
+    }
+    // Hide the buttons (if any)
+    this.hideToolBarLayoutChildren();
+    if (this.popupButtons && this.popupButtons.hide) {
+      this.popupButtons.hide();
+    }
+    if (!message) {
+      return;
+    }
+    // Show the error message
+    if (message.title) {
+      this.messageBar.setMessage(message.severity, message.title, message.text);
+    } else {
+      this.messageBar.setMessage(message.severity, OB.I18N.getLabel('OBUIAPP_Error'), message.text);
+    }
+  },
+
   handleDefaults: function (result) {
     var i, field, def, defaults = result.defaults,
         filterExpressions = result.filterExpressions,
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js	Tue Feb 20 05:47:07 2018 +0000
@@ -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) 2011-2017 Openbravo SLU
+ * All portions are Copyright (C) 2011-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -242,6 +242,8 @@
     record = grid.getSelectedRecord();
   }
   if (item.pickList.getSelection()[0].id !== item.getValue()) {
+    grid.setEditValue(item.grid.getEditRow(), 'movementQuantity', record.pendingQtyInAUM);
+    record.movementQuantity = record.pendingQtyInAUM;
     var pending = record.pending;
     grid.setEditValue(item.grid.getEditRow(), 'pending', record.pendingQtyInAUM);
     record.pending = record.pendingQtyInAUM;
@@ -250,7 +252,7 @@
     grid.setEditValue(item.grid.getEditRow(), 'availableQty', record.availableQtyInAUM);
     record.availableQty = record.availableQtyInAUM;
     record.availableQtyInAUM = availableQty;
-    grid.setEditValue(item.grid.getEditRow(), 'returnedUOM', item.pickList.getSelection()[0].id);
+    grid.setEditValue(item.grid.getEditRow(), 'returnedUOM', record.pendingQtyInAUM);
     record.returnedUOM = item.pickList.getSelection()[0].id;
   }
 };
@@ -260,15 +262,13 @@
  */
 OB.RM.RMReceiptQtyValuesChange = function (item, view, form, grid) {
   var record = grid.getSelectionObject().lastSelectionItem;
-  if (typeof record === 'undefined') {
-    record = grid.getSelectedRecord();
-  }
   if (item.pickList.getSelection()[0].id !== item.getValue()) {
+    grid.setEditValue(item.grid.getEditRow(), 'receiving', record.pendingQtyInAUM);
+    record.receiving = record.pendingQtyInAUM;
     var pending = record.pending;
     grid.setEditValue(item.grid.getEditRow(), 'pending', record.pendingQtyInAUM);
     record.pending = record.pendingQtyInAUM;
     record.pendingQtyInAUM = pending;
-    grid.setEditValue(item.grid.getEditRow(), 'returnedUOM', item.pickList.getSelection()[0].id);
     record.returnedUOM = item.pickList.getSelection()[0].id;
   }
 };
\ No newline at end of file
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js	Tue Feb 20 05:47:07 2018 +0000
@@ -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) 2011-2015 Openbravo SLU
+ * All portions are Copyright (C) 2011-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -98,7 +98,8 @@
         windowTitle: me.windowTitle || me.realTitle,
         actionHandler: me.command,
         button: me,
-        uiPattern: me.uiPattern
+        uiPattern: me.uiPattern,
+        processOwnerView: theView
       };
       if (me.uiPattern === 'M') {
         parameters.buttons = me.labelValue;
@@ -159,8 +160,6 @@
         afterRefresh, isAfterRefreshAlreadyExecuted, parsePathPart, parts;
 
     afterRefresh = function () {
-      var autosaveDone = false,
-          currentRecordId, recordsAfterRefresh;
 
       if (isAfterRefreshAlreadyExecuted) {
         // To avoid multiple calls to this function when
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js	Tue Feb 20 05:47:07 2018 +0000
@@ -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) 2010-2016 Openbravo SLU
+ * All portions are Copyright (C) 2010-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):   Sreedhar Sirigiri (TDS), Mallikarjun M (TDS)
  ************************************************************************
@@ -519,6 +519,9 @@
         if (view.isShowingForm && form.isNew) {
           disabled = true;
         }
+        if (view.isEditingGrid && grid.getEditForm().isNew) {
+          disabled = true;
+        }
         /*
          * Fixes Issue 0023270. The Business partner print button provides statistics about the
          * business partner transactions in a pop up and so handling multiple records are not allowed.
@@ -546,6 +549,9 @@
         if (view.isShowingForm && form.isNew) {
           disabled = true;
         }
+        if (view.isEditingGrid && grid.getEditForm().isNew) {
+          disabled = true;
+        }
         this.setDisabled(disabled);
       },
       keyboardShortcutId: 'ToolBar_Email'
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-action-def.js	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-action-def.js	Tue Feb 20 05:47:07 2018 +0000
@@ -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) 2012-2016 Openbravo SLU
+ * All portions are Copyright (C) 2012-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -192,8 +192,7 @@
 //* {{{tmpfileName}}}: Name of the temporary file.
 //* {{{fileName}}}: The name to be used in the file to download.
 OB.Utilities.Action.set('OBUIAPP_browseReport', function (paramObj) {
-  var processParameters = paramObj.processParameters,
-      params = isc.clone(processParameters);
+  var processParameters = paramObj.processParameters;
   OB.Layout.ViewManager.openView('OBClassicWindow', {
     tabTitle: paramObj.tabTitle,
     addToRecents: false,
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js	Tue Feb 20 05:47:07 2018 +0000
@@ -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) 2011-2018 Openbravo SLU
+ * All portions are Copyright (C) 2011-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -1284,22 +1284,4 @@
 // Returns a temporary id that starts with _
 OB.Utilities.getTemporaryId = function () {
   return '_' + new Date().getTime();
-};
-
-//** {{{ OB.Utilities.removeAccents }}} **
-//
-// Returns the string without accents
-// Parameters:
-//  * {{{value}}} The string value to be cleaned of accents
-OB.Utilities.removeAccents = function (value) {
-  if (value && typeof value === 'string') {
-    value = value.replace(/á|à|ä|â/g, 'a').replace(/Á|À|Ä|Â/g, 'A');
-    value = value.replace(/é|è|ë|ê/g, 'e').replace(/É|È|Ë|Ê/g, 'E');
-    value = value.replace(/í|ì|ï|î/g, 'i').replace(/Í|Ì|Ï|Î/g, 'I');
-    value = value.replace(/ó|ò|ö|ô/g, 'o').replace(/Ó|Ò|Ö|Ô/g, 'O');
-    value = value.replace(/ú|ù|ü|û/g, 'u').replace(/Ú|Ù|Ü|Û/g, 'U');
-    value = value.replace(/ç/g, 'c').replace(/Ç/g, 'C');
-    value = value.replace(/ñ/g, 'n').replace(/Ñ/g, 'N');
-  }
-  return value;
 };
\ No newline at end of file
--- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-grid-styles.css	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-grid-styles.css	Tue Feb 20 05:47:07 2018 +0000
@@ -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) 2010-2013 Openbravo SLU
+ * All portions are Copyright (C) 2010-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -343,14 +343,23 @@
   text-decoration: underline;
 }
 
-.OBGridNotificationText {
+.OBGridNotificationText,
+.OBGridNotificationTextError {
   font-family: 'lucida sans', sans-serif;
   font-size: 12px;
   vertical-align: middle;
   background: transparent;
+}
+
+.OBGridNotificationText {
   padding: 5px 0px 5px 0px;
 }
 
+.OBGridNotificationTextError {
+  color: #CC6600;
+  padding: 5px 10px 5px 10px;
+}
+
 .OBGridNotificationTextLink,
 .OBGridNotificationTextLinkOver,
 .OBGridNotificationTextLinkDown,
--- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-grid-styles.js	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-grid-styles.js	Tue Feb 20 05:47:07 2018 +0000
@@ -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) 2010-2013 Openbravo SLU
+ * All portions are Copyright (C) 2010-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -33,6 +33,7 @@
   headerTitleStyle: 'OBGridHeaderCellTitle',
   emptyMessageStyle: 'OBGridNotificationText',
   emptyMessageLinkStyle: 'OBGridNotificationTextLink',
+  errorMessageStyle: 'OBGridNotificationTextError',
   cellPadding: 0,
   /* Set in the CSS */
   cellAlign: 'center',
--- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-tree-grid-styles.js	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-tree-grid-styles.js	Tue Feb 20 05:47:07 2018 +0000
@@ -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) 2014 Openbravo SLU
+ * All portions are Copyright (C) 2014-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -33,6 +33,7 @@
   headerTitleStyle: 'OBGridHeaderCellTitle',
   emptyMessageStyle: 'OBGridNotificationText',
   emptyMessageLinkStyle: 'OBGridNotificationTextLink',
+  errorMessageStyle: 'OBGridNotificationTextError',
   cellPadding: 0,
   /* Set in the CSS */
   cellAlign: 'center',
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.33164]]></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>
@@ -21,7 +21,7 @@
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION_LABEL><![CDATA[PR17Q4.1]]></VERSION_LABEL>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--D393BE6F22BB44B7B728259B34FC795A--></AD_MODULE>
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.33164]]></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	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.33164]]></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>
@@ -22,7 +22,7 @@
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <UPDATEINFO><![CDATA[Bug fix for issue 15289]]></UPDATEINFO>
-<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION_LABEL><![CDATA[PR17Q4.1]]></VERSION_LABEL>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--4B828F4D03264080AA1D2057B13F613C--></AD_MODULE>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.33164]]></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.32880]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.33164]]></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.32880]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.33164]]></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/I18NComponent.java	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/I18NComponent.java	Tue Feb 20 05:47:07 2018 +0000
@@ -18,18 +18,14 @@
  */
 package org.openbravo.client.kernel;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.dal.service.OBQuery;
-import org.openbravo.model.ad.module.Module;
 import org.openbravo.model.ad.ui.Message;
 import org.openbravo.model.ad.ui.MessageTrl;
 
@@ -72,35 +68,24 @@
    * @return a collection of labels.
    */
   public Collection<Label> getLabels() {
-    final Map<String, Label> labels = new HashMap<String, Label>();
+    final Map<String, Label> labels = new HashMap<>();
     OBContext.setAdminMode();
     try {
-      final OBQuery<Module> moduleQuery = OBDal.getInstance()
-          .createQuery(Module.class, "id != '0'");
-      final List<String> modules = new ArrayList<String>();
-      for (Module module : moduleQuery.list()) {
-        modules.add(module.getId());
-      }
-
-      if (modules.isEmpty()) {
-        return Collections.emptyList();
-      }
-
       // first read the labels from the base table
       final OBQuery<Message> messages = OBDal.getInstance().createQuery(Message.class,
-          "module.id in (:modules) or includeInI18N='Y'");
-      messages.setNamedParameter("modules", modules);
+          "module.id!='0' or includeInI18N='Y'");
       for (Message message : messages.list()) {
         final Label label = new Label();
         label.setKey(message.getSearchKey());
         label.setValue(message.getMessageText());
         labels.put(message.getSearchKey(), label);
       }
+
       final OBQuery<MessageTrl> messagesTrl = OBDal
           .getInstance()
-          .createQuery(MessageTrl.class,
-              "(message.module.id in (:modules) or message.includeInI18N='Y') and language.id=:languageId");
-      messagesTrl.setNamedParameter("modules", modules);
+          .createQuery(
+              MessageTrl.class,
+              "(message.module.id!='0' or message.includeInI18N='Y') and message.active = true and language.id=:languageId");
       messagesTrl.setNamedParameter("languageId", OBContext.getOBContext().getLanguage().getId());
       for (MessageTrl message : messagesTrl.list()) {
         final Label label = new Label();
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelComponentProvider.java	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelComponentProvider.java	Tue Feb 20 05:47:07 2018 +0000
@@ -73,6 +73,7 @@
 
   // in case of the application component also make it role/org dependent, this
   // also covers client dependency
+  @Override
   public String getVersionParameters(String resource) {
     final String versionParam = super.getVersionParameters(resource);
     if (resource.contains(KernelConstants.APPLICATION_COMPONENT_ID)
@@ -88,7 +89,7 @@
     if (globalResources != null) {
       return globalResources;
     }
-    globalResources = new ArrayList<ComponentResource>();
+    globalResources = new ArrayList<>();
 
     globalResources.add(createStaticResource("org.openbravo.client.kernel/"
         + KernelConstants.KERNEL_COMPONENT_TYPE + "/" + KernelConstants.APPLICATION_COMPONENT_ID,
@@ -98,6 +99,9 @@
         + KernelConstants.KERNEL_COMPONENT_TYPE + "/"
         + KernelConstants.SESSION_DYNAMIC_COMPONENT_ID));
 
+    globalResources
+        .add(createStaticResource("web/org.openbravo.client.kernel/js/ob-i18n.js", true));
+
     globalResources.add(createStaticResource(
         "web/org.openbravo.client.kernel/js/ob-kernel-utilities.js", true));
 
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java	Tue Feb 20 05:47:07 2018 +0000
@@ -56,7 +56,7 @@
 
     // custom override
     if (field.getColumn().getDBColumnName().compareToIgnoreCase("documentno") == 0) {
-      length = new Long(20);
+      length = 20L;
     }
     return ", length:" + length + ", displaylength:" + displaylength
         + super.getGridFieldProperties(field);
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/LinkUIDefinition.java	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/LinkUIDefinition.java	Tue Feb 20 05:47:07 2018 +0000
@@ -51,7 +51,7 @@
     }
     // custom override
     if (field.getColumn().getDBColumnName().compareToIgnoreCase("documentno") == 0) {
-      length = new Long(20);
+      length = 20L;
     }
     return ", length: " + length + ", displaylength:" + displaylength
         + super.getGridFieldProperties(field);
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/RichTextUIDefinition.java	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/RichTextUIDefinition.java	Tue Feb 20 05:47:07 2018 +0000
@@ -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) 2010-2011 Openbravo SLU
+ * All portions are Copyright (C) 2010-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -50,8 +50,7 @@
       rowSpan = 2L;
 
     return super.getGridFieldProperties(field)
-        + ",  escapeHTML: false , canEdit: false , rowSpan : " + rowSpan + " , colSpan : "
-        + colSpan;
+        + ",  escapeHTML: true , canEdit: false , rowSpan : " + rowSpan + " , colSpan : " + colSpan;
   }
 
 }
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/StringUIDefinition.java	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/StringUIDefinition.java	Tue Feb 20 05:47:07 2018 +0000
@@ -77,7 +77,7 @@
 
     // custom override in case the length of a document number column is 0
     if (field.getColumn().getDBColumnName().compareToIgnoreCase("documentno") == 0 && length == 0) {
-      length = new Long(20);
+      length = 20L;
     }
     return (length != null ? ", length:" + length : "") + ", displaylength:" + displaylength
         + super.getGridFieldProperties(field);
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java	Tue Feb 20 05:47:07 2018 +0000
@@ -64,7 +64,8 @@
  */
 public abstract class UIDefinition {
   private static final String TYPE_NAME_PREFIX = "_id_";
-  private static final String LIST_REF_ID = "17";
+  private static final String LIST_REFERENCE_ID = "17";
+  private static final String DATETIME_REFERENCE_ID = "16";
 
   private Reference reference;
   private DomainType domainType;
@@ -333,25 +334,22 @@
   }
 
   private String setNOWDefault() {
-    JSONObject jsnobject = new JSONObject();
+    JSONObject jsonObject = new JSONObject();
     try {
       UIDefinition uiDef = this;
       if (!(this instanceof DateUIDefinition)) {
-        for (UIDefinition def : UIDefinitionController.getInstance().getAllUIDefinitions()) {
-          if (def instanceof DateUIDefinition) {
-            uiDef = def;
-            break;
-          }
-        }
+        Reference datetimeReference = OBDal.getInstance().getProxy(Reference.class,
+            DATETIME_REFERENCE_ID);
+        uiDef = UIDefinitionController.getInstance().getUIDefinition(datetimeReference);
       }
       String columnValue = uiDef.convertToClassicString(new Date());
-      jsnobject.put("value", uiDef.createFromClassicString(columnValue));
-      jsnobject.put("classicValue", columnValue);
-      jsnobject.put("hasDateDefault", true);
+      jsonObject.put("value", uiDef.createFromClassicString(columnValue));
+      jsonObject.put("classicValue", columnValue);
+      jsonObject.put("hasDateDefault", true);
     } catch (JSONException e) {
       log.error("Couldn't get field property value");
     }
-    return jsnobject.toString();
+    return jsonObject.toString();
   }
 
   /**
@@ -600,7 +598,7 @@
       String columnValue, boolean onlyFirstRecord) {
     try {
       String ref = field.getColumn().getReference().getId();
-      boolean isListReference = LIST_REF_ID.equals(ref);
+      boolean isListReference = LIST_REFERENCE_ID.equals(ref);
       if (!isListReference && !field.getColumn().isMandatory() && StringUtils.isEmpty(columnValue)) {
         // non mandatory without value nor default, should only return empty value, prevent
         // everything else
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl	Tue Feb 20 05:47:07 2018 +0000
@@ -54,7 +54,6 @@
         WINTITLE : 'Openbravo',
         IDENTIFIER : '_identifier',
         ID : 'id',
-        TITLE : 'title',
         FIELDSEPARATOR : '$',
         WHERE_PARAMETER : '_where',
         SQL_WHERE_PARAMETER : '_sqlWhere',
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/i18n.ftl	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/i18n.ftl	Tue Feb 20 05:47:07 2018 +0000
@@ -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) 2010-2012 Openbravo SLU 
+ * All portions are Copyright (C) 2010-2017 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -20,82 +20,8 @@
 -->
 // jslint
 
-OB = window.OB || {};
-OB.I18N = window.OB.I18N || {};
-
 OB.I18N.labels = {
 <#list data.labels as label>
 '${label.key?js_string}':  '${label.value?js_string}'<#if label_has_next>,</#if>
 </#list>
-};
-
-<#--
-// key is the message key
-// params is used for parameter substitution
-// if object and property are set then the label is set directly in
-// the object
-// Note: property may also be a function expecting the label as a string
-// if the label is not defined and object and property are set
-// then a call to the server is done to request the label.
--->
-OB.I18N.getLabel = function(key, params, object, property) {
-  var label, i;
-
-  if (!OB.I18N.labels[key]) {
-    if (object && property) {
-      OB.I18N.getLabelFromServer(key, params, object, property);
-    }
-    return 'UNDEFINED ' + key;
-  }
-
-  label = OB.I18N.labels[key];
-
-  if (params && params.length && params.length > 0) {
-      for (i = 0; i < params.length; i++) {
-          label = label.replace("%" + i, params[i]);
-      }
-  }
-  if (object && property) {
-    if (Object.prototype.toString.call(object[property]) === '[object Function]') {
-      object[property](label);
-    } else {
-      object[property] = label;
-    }
-  }
-  return label;
-};
-
-OB.I18N.getLabelFromServer = function(key, params, object, property) {
-  var requestParameters, rpcRequest;
-
-  if (!isc) {
-    return 'UNDEFINED ' + key;
-  }
-
-  requestParameters = {};
-  requestParameters._action = 'org.openbravo.client.kernel.GetLabelActionHandler';
-  requestParameters.key = key;
-
-  rpcRequest = {};
-  rpcRequest.actionURL = OB.Application.contextUrl + 'org.openbravo.client.kernel';
-  rpcRequest.callback = function (response, data, request) {
-    var clientContext = response.clientContext;
-    if (data.label) {
-      OB.I18N.labels[clientContext.key] = data.label;
-      OB.I18N.getLabel(clientContext.key, clientContext.params, clientContext.object, clientContext.property);
-    } else {
-      if (isc.isA.Function(clientContext.object[clientContext.property])) {
-        clientContext.object[clientContext.property]('LABEL NOT FOUND ' + clientContext.key);
-      } else {
-        clientContext.object[clientContext.property] = 'LABEL NOT FOUND ' + clientContext.key;
-      }
-    }
-  };
-  rpcRequest.httpMethod = 'GET';
-  rpcRequest.contentType = 'application/json;charset=UTF-8';
-  rpcRequest.useSimpleHttp = true;
-  rpcRequest.evalResult = true;
-  rpcRequest.params = requestParameters;
-  rpcRequest.clientContext = {'key' : key, 'object': object, 'params': params, 'property': property};
-  isc.RPCManager.sendRequest(rpcRequest);
 };
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.client.kernel/web/org.openbravo.client.kernel/js/ob-i18n.js	Tue Feb 20 05:47:07 2018 +0000
@@ -0,0 +1,100 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.0  (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) 2017 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+ */
+
+//** {{{ OB.I18N.getLabel }}} **
+// Retrieves a label
+// key is the message key
+// params is used for parameter substitution
+// if object and property are set then the label is set directly in
+// the object
+// Note: property may also be a function expecting the label as a string
+// if the label is not defined and object and property are set
+// then a call to the server is done to request the label.
+OB.I18N.getLabel = function (key, params, object, property) {
+  var label, i;
+
+  if (!OB.I18N.labels[key]) {
+    if (object && property) {
+      OB.I18N.getLabelFromServer(key, params, object, property);
+    }
+    return 'UNDEFINED ' + key;
+  }
+
+  label = OB.I18N.labels[key];
+
+  if (params && params.length && params.length > 0) {
+    for (i = 0; i < params.length; i++) {
+      label = label.replace("%" + i, params[i]);
+    }
+  }
+  if (object && property) {
+    if (Object.prototype.toString.call(object[property]) === '[object Function]') {
+      object[property](label);
+    } else {
+      object[property] = label;
+    }
+  }
+  return label;
+};
+
+//** {{{ OB.I18N.getLabelFromServer }}} **
+// Retrieves a label from the server
+// key is the message key
+// params is used for parameter substitution
+// if object and property are set then the label is set directly in
+// the object
+OB.I18N.getLabelFromServer = function (key, params, object, property) {
+  var requestParameters, rpcRequest;
+
+  if (!isc) {
+    return 'UNDEFINED ' + key;
+  }
+
+  requestParameters = {};
+  requestParameters._action = 'org.openbravo.client.kernel.GetLabelActionHandler';
+  requestParameters.key = key;
+
+  rpcRequest = {};
+  rpcRequest.actionURL = OB.Application.contextUrl + 'org.openbravo.client.kernel';
+  rpcRequest.callback = function (response, data, request) {
+    var clientContext = response.clientContext;
+    if (data.label) {
+      OB.I18N.labels[clientContext.key] = data.label;
+      OB.I18N.getLabel(clientContext.key, clientContext.params, clientContext.object, clientContext.property);
+    } else {
+      if (isc.isA.Function(clientContext.object[clientContext.property])) {
+        clientContext.object[clientContext.property]('LABEL NOT FOUND ' + clientContext.key);
+      } else {
+        clientContext.object[clientContext.property] = 'LABEL NOT FOUND ' + clientContext.key;
+      }
+    }
+  };
+  rpcRequest.httpMethod = 'GET';
+  rpcRequest.contentType = 'application/json;charset=UTF-8';
+  rpcRequest.useSimpleHttp = true;
+  rpcRequest.evalResult = true;
+  rpcRequest.params = requestParameters;
+  rpcRequest.clientContext = {
+    'key': key,
+    'object': object,
+    'params': params,
+    'property': property
+  };
+  isc.RPCManager.sendRequest(rpcRequest);
+};
\ No newline at end of file
--- a/modules/org.openbravo.client.myob/src-db/database/model/triggers/OBKMO_WIDGET_REFERENCE_MOD_TRG.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.myob/src-db/database/model/triggers/OBKMO_WIDGET_REFERENCE_MOD_TRG.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  currentID  VARCHAR2(32);
   currentModuleID  VARCHAR2(32);
     
 BEGIN
@@ -37,10 +36,8 @@
      AND Type = 'T';
      
   IF (UPDATING OR INSERTING) THEN
-    currentID := :new.AD_Reference_ID;
     currentModuleID := :NEW.AD_Reference_ID;
   ELSE
-    currentID := :old.AD_Reference_ID;
     currentModuleID := :old.AD_Reference_ID;
   END IF;
   
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.33164]]></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>
@@ -23,7 +23,7 @@
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <UPDATEINFO><![CDATA[Styling bugfixing]]></UPDATEINFO>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <REFERENCEDATAINFO><![CDATA[Provides the infrastructure of workspace tab]]></REFERENCEDATAINFO>
-<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION_LABEL><![CDATA[PR17Q4.1]]></VERSION_LABEL>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--2758CD25B2704AF6BBAD10365FC82C06--></AD_MODULE>
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.33164]]></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.32880]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.33164]]></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	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.33164]]></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>
@@ -21,7 +21,7 @@
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION_LABEL><![CDATA[PR17Q4.1]]></VERSION_LABEL>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC--></AD_MODULE>
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.33164]]></STARTVERSION>
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.33164]]></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>
@@ -22,7 +22,7 @@
 <!--FF8080812D842086012D844F3CC0003E-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--FF8080812D842086012D844F3CC0003E-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--FF8080812D842086012D844F3CC0003E-->  <UPDATEINFO><![CDATA[Added Currency Converter. Added Google Docs]]></UPDATEINFO>
-<!--FF8080812D842086012D844F3CC0003E-->  <VERSION_LABEL><![CDATA[PR17Q4.1]]></VERSION_LABEL>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--FF8080812D842086012D844F3CC0003E-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--FF8080812D842086012D844F3CC0003E-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--FF8080812D842086012D844F3CC0003E--></AD_MODULE>
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.33164]]></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	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.33164]]></VERSION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <DESCRIPTION><![CDATA[Payment Report]]></DESCRIPTION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <URL><![CDATA[http://forge.openbravo.com/projects/paymentreport]]></URL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <TYPE><![CDATA[M]]></TYPE>
@@ -22,7 +22,7 @@
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION_LABEL><![CDATA[PR17Q4.1]]></VERSION_LABEL>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--2A5EE903D7974AC298C0504FBC4501A7--></AD_MODULE>
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.33164]]></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	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.33164]]></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>
@@ -19,7 +19,7 @@
 <!--3A3A943684D64DEF9EC39F588A656848-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION_LABEL><![CDATA[PR17Q4.1]]></VERSION_LABEL>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--3A3A943684D64DEF9EC39F588A656848--></AD_MODULE>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.33164]]></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	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></VERSION>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.33164]]></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>
@@ -22,7 +22,7 @@
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0]]></UPDATEINFO>
-<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION_LABEL><![CDATA[PR17Q4.1]]></VERSION_LABEL>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4--></AD_MODULE>
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></STARTVERSION>
+<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.33164]]></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.32880]]></STARTVERSION>
+<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.33164]]></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.32880]]></STARTVERSION>
+<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.33164]]></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.32880]]></STARTVERSION>
+<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.33164]]></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.32880]]></STARTVERSION>
+<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.33164]]></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.datasource/src/org/openbravo/service/datasource/ADTreeDatasourceService.java	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ADTreeDatasourceService.java	Tue Feb 20 05:47:07 2018 +0000
@@ -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) 2013-2016 Openbravo SLU
+ * All portions are Copyright (C) 2013-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -68,6 +68,10 @@
   private static final Logger logger = LoggerFactory.getLogger(ADTreeDatasourceService.class);
   private static final String AD_MENU_TABLE_ID = "116";
   private static final String AD_ORG_TABLE_ID = "155";
+  private static final int PARENT_ID = 1;
+  private static final int SEQNO = 2;
+  private static final int NODE_ID = 3;
+  private static final int ENTITY = 4;
 
   @Override
   /**
@@ -86,10 +90,10 @@
       if (tableTree.isHandleNodesManually()) {
         return;
       }
-      Tree adTree = getTree(table, bobProperties);
+      Tree adTree = getTree(table);
       if (adTree == null) {
         // The adTree does not exists, create it
-        adTree = createTree(table, bobProperties);
+        adTree = createTree(table);
       }
       // Adds the node to the adTree
       TreeNode adTreeNode = OBProvider.getInstance().get(TreeNode.class);
@@ -120,7 +124,7 @@
       if (tableTree.isHandleNodesManually()) {
         return;
       }
-      Tree tree = getTree(table, bobProperties);
+      Tree tree = getTree(table);
       OBCriteria<TreeNode> adTreeNodeCriteria = OBDal.getInstance().createCriteria(TreeNode.class);
       adTreeNodeCriteria.setFilterOnActive(false);
       adTreeNodeCriteria.add(Restrictions.eq(TreeNode.PROPERTY_TREE, tree));
@@ -128,7 +132,7 @@
       TreeNode treeNode = (TreeNode) adTreeNodeCriteria.uniqueResult();
       int nChildrenMoved = reparentChildrenOfDeletedNode(tree, treeNode.getReportSet(),
           treeNode.getNode());
-      logger.info(nChildrenMoved + " children have been moved to another parent");
+      logger.info("{} children have been moved to another parent", nChildrenMoved);
       OBDal.getInstance().remove(treeNode);
     } catch (Exception e) {
       logger.error("Error while deleting tree node: ", e);
@@ -213,55 +217,8 @@
         DataToJsonConverter.class);
     toJsonConverter.setAdditionalProperties(JsonUtils.getAdditionalProperties(parameters));
 
-    // Joins the ADTreeNode with the referenced table
-    StringBuilder joinClause = new StringBuilder();
-    joinClause.append(" as tn ");
-    joinClause.append(" , " + entity.getName() + " as e ");
-    joinClause.append(" where tn.node = e.id ");
-    if (hqlWhereClause != null) {
-      joinClause.append(" and (" + hqlWhereClause + ")");
-    }
-    joinClause.append(" and tn.tree.id = '" + tree.getId() + "' ");
-    if (hqlWhereClauseRootNodes == null && tab != null && tab.getTabLevel() > 0) {
-      // Add the criteria to filter only the records that belong to the record selected in the
-      // parent tab
-      Tab parentTab = KernelUtils.getInstance().getParentTab(tab);
-      String parentPropertyName = ApplicationUtils.getParentProperty(tab, parentTab);
-      if (parentPropertyName != null) {
-        JSONArray criteria = (JSONArray) JsonUtils.buildCriteria(parameters).get("criteria");
-        String parentRecordId = getParentRecordIdFromCriteria(criteria, parentPropertyName);
-        if (parentRecordId != null) {
-          joinClause.append(" and e." + parentPropertyName + ".id = '" + parentRecordId + "' ");
-        }
-      }
-    }
-    if (hqlWhereClauseRootNodes != null) {
-      joinClause.append(" and (" + hqlWhereClauseRootNodes + ") ");
-    } else {
-      if (ROOT_NODE_CLIENT.equals(parentId)) {
-        if (AD_ORG_TABLE_ID.equals(tree.getTable().getId())) {
-          // The ad_org table needs a special treatment, since is the only table tree that has an
-          // actual node ('*' organization) with node_id = ROOT_NODE_DB
-          // In this table the root nodes have the parent_id property set to null
-          joinClause.append(" and tn.reportSet is null");
-        } else {
-          // Other ad_tree nodes can have either ROOT_NODE_DB or null as parent_id
-          joinClause.append(" and (tn.reportSet = '" + ROOT_NODE_DB + "' or tn.reportSet is null)");
-        }
-      } else {
-        joinClause.append(" and tn.reportSet = '" + parentId + "' ");
-      }
-    }
-    joinClause.append(" order by tn.sequenceNumber ");
-
-    // Selects the relevant properties from ADTreeNode and all the properties from the referenced
-    // table
-    String selectClause = " tn.id as treeNodeId, tn.reportSet as parentId, tn.sequenceNumber as seqNo, tn.node as nodeId, e as entity";
-    OBQuery<BaseOBObject> obq = OBDal.getInstance()
-        .createQuery("ADTreeNode", joinClause.toString());
-    obq.setFilterOnActive(false);
-    obq.setSelectClause(selectClause);
-    obq.setFilterOnReadableOrganization(false);
+    OBQuery<BaseOBObject> obq = getNodeChildrenQuery(parameters, parentId, hqlWhereClause,
+        hqlWhereClauseRootNodes, tab, tree, entity);
     int nResults = obq.count();
 
     OBContext context = OBContext.getOBContext();
@@ -278,11 +235,6 @@
     }
 
     boolean fetchRoot = ROOT_NODE_CLIENT.equals(parentId);
-
-    int PARENT_ID = 1;
-    int SEQNO = 2;
-    int NODE_ID = 3;
-    int ENTITY = 4;
     int cont = 0;
     ScrollableResults scrollNodes = obq.createQuery().scroll(ScrollMode.FORWARD_ONLY);
     try {
@@ -319,6 +271,65 @@
     return responseData;
   }
 
+  private OBQuery<BaseOBObject> getNodeChildrenQuery(Map<String, String> parameters,
+      String parentId, String hqlWhereClause, String hqlWhereClauseRootNodes, Tab tab, Tree tree,
+      Entity entity) throws JSONException {
+    // Joins the ADTreeNode with the referenced table
+    StringBuilder joinClause = new StringBuilder();
+    joinClause.append(" as tn ");
+    joinClause.append(" , " + entity.getName() + " as e ");
+    joinClause.append(" where tn.node = e.id ");
+    if (hqlWhereClause != null) {
+      joinClause.append(" and (" + hqlWhereClause + ")");
+    }
+    joinClause.append(" and tn.tree.id = '" + tree.getId() + "' ");
+    if (!AD_ORG_TABLE_ID.equals(tree.getTable().getId())) {
+      joinClause.append(" and e.organization.id "
+          + OBDal.getInstance().getReadableOrganizationsInClause());
+    }
+    if (hqlWhereClauseRootNodes != null) {
+      joinClause.append(" and (" + hqlWhereClauseRootNodes + ") ");
+    } else {
+      if (tab != null && tab.getTabLevel() > 0) {
+        // Add the criteria to filter only the records that belong to the record selected in the
+        // parent tab
+        Tab parentTab = KernelUtils.getInstance().getParentTab(tab);
+        String parentPropertyName = ApplicationUtils.getParentProperty(tab, parentTab);
+        if (parentPropertyName != null) {
+          JSONArray criteria = (JSONArray) JsonUtils.buildCriteria(parameters).get("criteria");
+          String parentRecordId = getParentRecordIdFromCriteria(criteria, parentPropertyName);
+          if (parentRecordId != null) {
+            joinClause.append(" and e." + parentPropertyName + ".id = '" + parentRecordId + "' ");
+          }
+        }
+      }
+      if (ROOT_NODE_CLIENT.equals(parentId)) {
+        if (AD_ORG_TABLE_ID.equals(tree.getTable().getId())) {
+          // The ad_org table needs a special treatment, since is the only table tree that has an
+          // actual node ('*' organization) with node_id = ROOT_NODE_DB
+          // In this table the root nodes have the parent_id property set to null
+          joinClause.append(" and tn.reportSet is null");
+        } else {
+          // Other ad_tree nodes can have either ROOT_NODE_DB or null as parent_id
+          joinClause.append(" and (tn.reportSet = '" + ROOT_NODE_DB + "' or tn.reportSet is null)");
+        }
+      } else {
+        joinClause.append(" and tn.reportSet = '" + parentId + "' ");
+      }
+    }
+    joinClause.append(" order by tn.sequenceNumber ");
+
+    // Selects the relevant properties from ADTreeNode and all the properties from the referenced
+    // table
+    String selectClause = " tn.id as treeNodeId, tn.reportSet as parentId, tn.sequenceNumber as seqNo, tn.node as nodeId, e as entity";
+    OBQuery<BaseOBObject> obq = OBDal.getInstance().createQuery(TreeNode.ENTITY_NAME,
+        joinClause.toString());
+    obq.setFilterOnActive(false);
+    obq.setSelectClause(selectClause);
+    obq.setFilterOnReadableOrganization(false);
+    return obq;
+  }
+
   @Override
   /**
    * Check if a node has children
@@ -344,7 +355,7 @@
         .createQuery("ADTreeNode", joinClause.toString());
     obq.setFilterOnActive(false);
     obq.setFilterOnReadableOrganization(entity.getMappingClass() != Organization.class);
-    final List<Object> parameters = new ArrayList<Object>();
+    final List<Object> parameters = new ArrayList<>();
     parameters.add(nodeId);
     obq.setParameters(parameters);
     return obq.count() > 0;
@@ -435,7 +446,7 @@
         st.setLong(nParam++, seqNoOfFirstModNotInDev);
       }
       int nUpdated = st.executeUpdate();
-      logger.debug("Recomputing sequence numbers: " + nUpdated + " nodes updated");
+      logger.debug("Recomputing sequence numbers: {} nodes updated", nUpdated);
     } catch (Exception e) {
       logger.error("Exception while recomputing sequence numbers: ", e);
     } finally {
@@ -515,11 +526,10 @@
   }
 
   /**
-   * Returns a Tree given the referencedTableId and a jsonobject that contains the node properties
-   * This is called from the EventHandler, because the parentRecordId is not avaiable in the
-   * parameters
+   * Returns a Tree given the referenced table. This is called from the EventHandler, because the
+   * parentRecordId is not available in the parameters.
    */
-  private Tree getTree(Table table, JSONObject bobProperties) {
+  private Tree getTree(Table table) {
     Tree tree = null;
     OBCriteria<Tree> adTreeCriteria = OBDal.getInstance().createCriteria(Tree.class);
     adTreeCriteria.setFilterOnActive(false);
@@ -532,7 +542,7 @@
    * Creates a new tree (record in ADTree)
    * 
    */
-  private Tree createTree(Table table, JSONObject bobProperties) {
+  private Tree createTree(Table table) {
     Client client = OBContext.getOBContext().getCurrentClient();
     Organization org = OBContext.getOBContext().getCurrentOrganization();
 
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java	Tue Feb 20 05:47:07 2018 +0000
@@ -81,6 +81,7 @@
 import org.openbravo.erpCommon.utility.OBMessageUtils;
 import org.openbravo.erpCommon.utility.PropertyException;
 import org.openbravo.erpCommon.utility.PropertyNotFoundException;
+import org.openbravo.erpCommon.utility.StringCollectionUtils;
 import org.openbravo.erpCommon.utility.Utility;
 import org.openbravo.model.ad.datamodel.Column;
 import org.openbravo.model.ad.domain.Reference;
@@ -262,6 +263,10 @@
                 request, parameters));
             // when exporting a OB grid, the isActive filter should not be set
             parameters.put(JsonConstants.NO_ACTIVE_FILTER, "true");
+
+            // set selected properties those that will finally be exported
+            parameters.put(JsonConstants.SELECTEDPROPERTIES_PARAMETER,
+                StringCollectionUtils.commaSeparated(writer.fieldProperties, false));
             ((DefaultDataSourceService) getDataSource(request)).fetch(parameters, writer);
           } else {
             String result = getDataSource(request).fetch(parameters);
@@ -641,7 +646,7 @@
                 keyValue = keyValue
                     .toString()
                     .replace(
-                        new Character(format.getDecimalFormatSymbols().getDecimalSeparator())
+                        Character.valueOf(format.getDecimalFormatSymbols().getDecimalSeparator())
                             .toString(),
                         prefDecimalSeparator);
               }
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/TreeDatasourceService.java	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/TreeDatasourceService.java	Tue Feb 20 05:47:07 2018 +0000
@@ -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) 2013-2016 Openbravo SLU
+ * All portions are Copyright (C) 2013-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -863,6 +863,7 @@
       }
     } catch (Exception e) {
       log.error("Error while moving tree node", e);
+      return JsonUtils.convertExceptionToJson(e);
     } finally {
       OBContext.restorePreviousMode();
     }
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></VERSION>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.33164]]></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.
@@ -19,7 +19,7 @@
 <!--FF8080813129ADA401312CA1222A0005-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--FF8080813129ADA401312CA1222A0005-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--FF8080813129ADA401312CA1222A0005-->  <VERSION_LABEL><![CDATA[PR17Q4.1]]></VERSION_LABEL>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--FF8080813129ADA401312CA1222A0005--></AD_MODULE>
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></STARTVERSION>
+<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.33164]]></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.32880]]></STARTVERSION>
+<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.33164]]></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	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></VERSION>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.33164]]></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.
@@ -19,7 +19,7 @@
 <!--FF8080813141B198013141B86DD70003-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--FF8080813141B198013141B86DD70003-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--FF8080813141B198013141B86DD70003-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--FF8080813141B198013141B86DD70003-->  <VERSION_LABEL><![CDATA[PR17Q4.1]]></VERSION_LABEL>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--FF8080813141B198013141B86DD70003-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--FF8080813141B198013141B86DD70003-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--FF8080813141B198013141B86DD70003--></AD_MODULE>
--- a/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></STARTVERSION>
+<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.33164]]></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	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></VERSION>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.33164]]></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>
@@ -22,7 +22,7 @@
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0]]></UPDATEINFO>
-<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION_LABEL><![CDATA[PR17Q4.1]]></VERSION_LABEL>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1--></AD_MODULE>
--- a/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></STARTVERSION>
+<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.33164]]></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.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java	Tue Feb 20 05:47:07 2018 +0000
@@ -889,7 +889,7 @@
     }
 
     if (Boolean.class == property.getPrimitiveObjectType()) {
-      return new Boolean(value.toString());
+      return Boolean.valueOf(value.toString());
     } else if (property.isNumericType()) {
       try {
         final BigDecimal bdValue = new BigDecimal(value.toString());
@@ -918,23 +918,26 @@
           }
         }
         if (property.isDate()) {
+          hasComeADateTime = false;
           date = simpleDateFormat.parse(value.toString());
         }
         final Calendar calendar = Calendar.getInstance();
         calendar.setTime(date);
 
-        // move the date to the beginning of the day
-        if (isGreaterOperator(operator)) {
-          calendar.set(Calendar.HOUR_OF_DAY, 0);
-          calendar.set(Calendar.MINUTE, 0);
-          calendar.set(Calendar.SECOND, 0);
-          calendar.set(Calendar.MILLISECOND, 0);
-        } else if (isLesserOperator(operator)) {
-          // move the data to the end of the day
-          calendar.set(Calendar.HOUR_OF_DAY, 23);
-          calendar.set(Calendar.MINUTE, 59);
-          calendar.set(Calendar.SECOND, 59);
-          calendar.set(Calendar.MILLISECOND, 999);
+        if (!hasComeADateTime) {
+          // move the date to the beginning of the day
+          if (isGreaterOperator(operator)) {
+            calendar.set(Calendar.HOUR_OF_DAY, 0);
+            calendar.set(Calendar.MINUTE, 0);
+            calendar.set(Calendar.SECOND, 0);
+            calendar.set(Calendar.MILLISECOND, 0);
+          } else if (isLesserOperator(operator)) {
+            // move the data to the end of the day
+            calendar.set(Calendar.HOUR_OF_DAY, 23);
+            calendar.set(Calendar.MINUTE, 59);
+            calendar.set(Calendar.SECOND, 59);
+            calendar.set(Calendar.MILLISECOND, 999);
+          }
         }
 
         if (hasComeADateTime || property.isDatetime() || property.isDate()) {
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java	Tue Feb 20 05:47:07 2018 +0000
@@ -24,8 +24,10 @@
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang.StringUtils;
@@ -77,7 +79,7 @@
   private List<String> additionalProperties = new ArrayList<String>();
 
   // limit the json serialization to these properties
-  private List<String> selectedProperties = new ArrayList<String>();
+  private Set<String> selectedProperties = new HashSet<>();
 
   // display property used for table reference fields
   private String displayProperty = null;
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java	Tue Feb 20 05:47:07 2018 +0000
@@ -1120,23 +1120,11 @@
 
     } catch (JSONException e) {
       throw new OBException(e);
-    } finally {
-      if (DataSourceAction.FETCH != action) {
-        // Only flush non fetch operations.
-        OBDal.getInstance().flush();
-      }
     }
   }
 
   protected String doPostAction(Map<String, String> parameters, String content,
       DataSourceAction action, String originalObject) {
-    if (action == DataSourceAction.FETCH) {
-      // Clear session to prevent slow flush
-      OBDal.getInstance().getSession().clear();
-    } else {
-      OBDal.getInstance().flush();
-    }
-
     try {
       // this gets the data before the insert, so that it can be used
       // for preprocessing, for example inserting an order
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonToDataConverter.java	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonToDataConverter.java	Tue Feb 20 05:47:07 2018 +0000
@@ -194,11 +194,11 @@
       } else if (value instanceof Double) {
         return BigDecimal.valueOf((Double) value);
       } else if (value instanceof Integer && property.getPrimitiveObjectType() == Long.class) {
-        return new Long((Integer) value);
+        return Long.valueOf((Integer) value);
       } else if (value instanceof Integer && property.getPrimitiveObjectType() == Float.class) {
-        return new Float((Integer) value);
+        return Float.valueOf((Integer) value);
       } else if (value instanceof Long && property.getPrimitiveObjectType() == Float.class) {
-        return new Float((Long) value);
+        return Float.valueOf((Long) value);
       } else if (value instanceof BigDecimal
           && property.getPrimitiveObjectType() == BigDecimal.class) {
         return value;
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></VERSION>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.33164]]></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>
@@ -22,7 +22,7 @@
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0]]></UPDATEINFO>
-<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION_LABEL><![CDATA[PR17Q4.1]]></VERSION_LABEL>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--5EB4F15C80684ACA904756BDC12ADBE5--></AD_MODULE>
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></STARTVERSION>
+<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.33164]]></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.32880]]></STARTVERSION>
+<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.33164]]></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.32880]]></STARTVERSION>
+<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.33164]]></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.32880]]></STARTVERSION>
+<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.33164]]></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.32880]]></STARTVERSION>
+<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.33164]]></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.32880]]></STARTVERSION>
+<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.33164]]></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/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java	Tue Feb 20 05:47:07 2018 +0000
@@ -354,7 +354,7 @@
       }
     } else if (domainType instanceof BooleanDomainType) {
       whereClause = field.getClauseLeftPart() + " = "
-          + getTypedParameterAlias(typedParameters, new Boolean(value));
+          + getTypedParameterAlias(typedParameters, Boolean.valueOf(value));
     } else if (domainType instanceof UniqueIdDomainType) {
       whereClause = field.getClauseLeftPart() + " = "
           + getTypedParameterAlias(typedParameters, value);
--- a/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js	Tue Feb 20 05:47:07 2018 +0000
@@ -656,7 +656,7 @@
     // only do the identifier actions when clearing
     // in all other cases pickValue is called
     if (!newValue) {
-      if (this.required && this.getElementValue() === '' && this.pickList && this.pickList.getSelectedRecord() && this.pickList.getSelectedRecord().id) {
+      if (this.getElementValue() === '' && this.pickList && this.pickList.getSelectedRecord() && this.pickList.getSelectedRecord().id) {
         // handle special case: after selecting a value, a redraw is fired in the form.
         // due to asynchrony problems, the redraw flow was able to access to _value before setting it with the current value.
         // if we are in this case, then we do not need to continue setting the value because 'null' is not the value to be assigned.
--- a/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></VERSION>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.33164]]></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>
@@ -23,7 +23,7 @@
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION_LABEL><![CDATA[PR17Q4.1]]></VERSION_LABEL>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--96998CBC42744B3DBEE28AC8095C9335--></AD_MODULE>
--- a/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></STARTVERSION>
+<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.33164]]></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	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></VERSION>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.33164]]></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>
@@ -23,7 +23,7 @@
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0
 Updated to new SmartClient 8.3d 26-May-2012]]></UPDATEINFO>
-<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION_LABEL><![CDATA[PR17Q4.1]]></VERSION_LABEL>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9--></AD_MODULE>
--- a/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></STARTVERSION>
+<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.33164]]></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.32880]]></STARTVERSION>
+<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.33164]]></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.32880]]></STARTVERSION>
+<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.33164]]></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.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js	Tue Feb 20 05:47:07 2018 +0000
@@ -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) 2011-2018 Openbravo SLU
+ * All portions are Copyright (C) 2011-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -103,6 +103,9 @@
       if (target && target.view) {
         target.view.messageBar.setMessage('error', null, OB.I18N.getLabel('OBUIAPP_TooManyNodes'));
       }
+      if (target && target.treeItem && target.treeItem.tree) {
+        target.treeItem.tree.showErrorMessageInPicker(OB.I18N.getLabel('OBUIAPP_TooManyResults'));
+      }
       return;
     }
 
@@ -274,9 +277,7 @@
         operator: 'and',
         criteria: []
         },
-        crit = result.criteria,
         valueParts = [],
-        allowEx = true,
         ds = isc.DS.get(this.form.expressionDataSource || this.form.dataSource);
 
     if (!value) {
@@ -839,8 +840,24 @@
 
   _fieldMatchesFilter: isc.DataSource.getPrototype().fieldMatchesFilter,
   fieldMatchesFilter: function (fieldValue, filterValue, requestProperties) {
-    fieldValue = OB.Utilities.removeAccents(fieldValue);
-    filterValue = OB.Utilities.removeAccents(filterValue);
+    if (fieldValue && typeof fieldValue === 'string') {
+      fieldValue = fieldValue.replace(/á|à|ä|â/g, 'a').replace(/Á|À|Ä|Â/g, 'A');
+      fieldValue = fieldValue.replace(/é|è|ë|ê/g, 'e').replace(/É|È|Ë|Ê/g, 'E');
+      fieldValue = fieldValue.replace(/í|ì|ï|î/g, 'i').replace(/Í|Ì|Ï|Î/g, 'I');
+      fieldValue = fieldValue.replace(/ó|ò|ö|ô/g, 'o').replace(/Ó|Ò|Ö|Ô/g, 'O');
+      fieldValue = fieldValue.replace(/ú|ù|ü|û/g, 'u').replace(/Ú|Ù|Ü|Û/g, 'U');
+      fieldValue = fieldValue.replace(/ç/g, 'c').replace(/Ç/g, 'C');
+      fieldValue = fieldValue.replace(/ñ/g, 'n').replace(/Ñ/g, 'N');
+    }
+    if (filterValue && typeof filterValue === 'string') {
+      filterValue = filterValue.replace(/á|à|ä|â/g, 'a').replace(/Á|À|Ä|Â/g, 'A');
+      filterValue = filterValue.replace(/é|è|ë|ê/g, 'e').replace(/É|È|Ë|Ê/g, 'E');
+      filterValue = filterValue.replace(/í|ì|ï|î/g, 'i').replace(/Í|Ì|Ï|Î/g, 'I');
+      filterValue = filterValue.replace(/ó|ò|ö|ô/g, 'o').replace(/Ó|Ò|Ö|Ô/g, 'O');
+      filterValue = filterValue.replace(/ú|ù|ü|û/g, 'u').replace(/Ú|Ù|Ü|Û/g, 'U');
+      filterValue = filterValue.replace(/ç/g, 'c').replace(/Ç/g, 'C');
+      filterValue = filterValue.replace(/ñ/g, 'n').replace(/Ñ/g, 'N');
+    }
     return this._fieldMatchesFilter(fieldValue, filterValue, requestProperties);
   }
 });
--- a/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -6,7 +6,7 @@
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <NAME><![CDATA[Log Clean Up Utility]]></NAME>
-<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION><![CDATA[1.0.32880]]></VERSION>
+<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION><![CDATA[1.0.33164]]></VERSION>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <DESCRIPTION><![CDATA[Log Clean Up Utility]]></DESCRIPTION>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <HELP><![CDATA[Utility to periodically cleanup log tables]]></HELP>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <URL><![CDATA[http://centralrepository.openbravo.com/heartbeat-server/org.openbravo.forge.ui/ForgeProjectDetail?projectId=7DC25E3B7ADE426CAD71E7804B95C1BF]]></URL>
@@ -21,7 +21,7 @@
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
-<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION_LABEL><![CDATA[PR17Q4.1]]></VERSION_LABEL>
+<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--8A34B301DC524EA3A07513DF9F42CC90--></AD_MODULE>
--- a/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -7,7 +7,7 @@
 <!--86EBD30DEB8045508185B457896C9F6D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <AD_MODULE_ID><![CDATA[8A34B301DC524EA3A07513DF9F42CC90]]></AD_MODULE_ID>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--86EBD30DEB8045508185B457896C9F6D-->  <STARTVERSION><![CDATA[2.1.32880]]></STARTVERSION>
+<!--86EBD30DEB8045508185B457896C9F6D-->  <STARTVERSION><![CDATA[2.1.33164]]></STARTVERSION>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.v3.datasets/referencedata/standard/V3_Roles.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.v3.datasets/referencedata/standard/V3_Roles.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -4,9 +4,9 @@
     <specialForm id="800015" entity-name="ADForm" identifier="About"/>
     <role id="CA5B7FB2C95740E499C0F102343D51AD" entity-name="ADRole" identifier="Employee"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.367Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.390Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.367Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.390Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -16,9 +16,9 @@
     <specialForm id="800015" entity-name="ADForm" identifier="About"/>
     <role id="FF808181259DADEB01259DDDA4C201E6" entity-name="ADRole" identifier="Company Executive"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.367Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.390Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.367Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.390Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -28,9 +28,9 @@
     <specialForm id="1004400000" entity-name="ADForm" identifier="Requisition To Order"/>
     <role id="D7D7D228E4594ACE8D00FD0E08B333DE" entity-name="ADRole" identifier="Procurement"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.367Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.390Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.367Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.390Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -40,9 +40,9 @@
     <specialForm id="4201E189318E443297F6B23F03CABB9D" entity-name="ADForm" identifier="AccountTransactions"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.367Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.390Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.367Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.390Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -52,9 +52,9 @@
     <specialForm id="FE9623C32FE749DD803ED7C64CCD7405" entity-name="ADForm" identifier="Payment Execution"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.366Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.390Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.366Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.390Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -64,9 +64,9 @@
     <specialForm id="800015" entity-name="ADForm" identifier="About"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.366Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.390Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.366Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.390Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -76,9 +76,9 @@
     <specialForm id="800015" entity-name="ADForm" identifier="About"/>
     <role id="FF808181259DADEB01259DDDA4BB01E5" entity-name="ADRole" identifier="Company Admin"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.366Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.390Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.366Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.390Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -88,9 +88,9 @@
     <specialForm id="800015" entity-name="ADForm" identifier="About"/>
     <role id="FF808181259DADEB01259DDDA4C201E7" entity-name="ADRole" identifier="Warehouse"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.366Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.390Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.366Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.390Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -100,9 +100,9 @@
     <specialForm id="800015" entity-name="ADForm" identifier="About"/>
     <role id="D7D7D228E4594ACE8D00FD0E08B333DE" entity-name="ADRole" identifier="Procurement"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.366Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.390Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.366Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.390Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -112,9 +112,9 @@
     <specialForm id="800015" entity-name="ADForm" identifier="About"/>
     <role id="FF8081812250326E012250353BDE0006" entity-name="ADRole" identifier="Sales"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.365Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.389Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.365Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.389Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -124,9 +124,9 @@
     <specialForm id="800016" entity-name="ADForm" identifier="Alert Management"/>
     <role id="FF808181259DADEB01259DDDA4BB01E5" entity-name="ADRole" identifier="Company Admin"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.365Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.389Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.365Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.389Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -136,9 +136,9 @@
     <specialForm id="800016" entity-name="ADForm" identifier="Alert Management"/>
     <role id="FF8081812250326E012250353BDE0006" entity-name="ADRole" identifier="Sales"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.365Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.389Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.365Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.389Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -148,9 +148,9 @@
     <specialForm id="800016" entity-name="ADForm" identifier="Alert Management"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.365Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.389Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.365Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.389Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -160,9 +160,9 @@
     <specialForm id="800003" entity-name="ADForm" identifier="GL Posting by DB Tables"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.365Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.389Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.365Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.389Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -172,9 +172,9 @@
     <specialForm id="100" entity-name="ADForm" identifier="Create Invoices from Orders"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.364Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.389Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.364Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.389Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -184,9 +184,9 @@
     <specialForm id="800016" entity-name="ADForm" identifier="Alert Management"/>
     <role id="FF808181259DADEB01259DDDA4C201E6" entity-name="ADRole" identifier="Company Executive"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.364Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.389Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.364Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.389Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -196,9 +196,9 @@
     <specialForm id="800016" entity-name="ADForm" identifier="Alert Management"/>
     <role id="FF808181259DADEB01259DDDA4C201E7" entity-name="ADRole" identifier="Warehouse"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.364Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.389Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.364Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.389Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -208,9 +208,9 @@
     <specialForm id="110" entity-name="ADForm" identifier="Create Shipments from Orders"/>
     <role id="FF808181259DADEB01259DDDA4C201E7" entity-name="ADRole" identifier="Warehouse"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.364Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.389Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.364Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.389Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -220,9 +220,9 @@
     <specialForm id="800009" entity-name="ADForm" identifier="Pending Goods Receipts"/>
     <role id="FF808181259DADEB01259DDDA4C201E7" entity-name="ADRole" identifier="Warehouse"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.364Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.388Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.364Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.388Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -232,9 +232,9 @@
     <window id="800092" entity-name="ADWindow" identifier="Requisition"/>
     <role id="D7D7D228E4594ACE8D00FD0E08B333DE" entity-name="ADRole" identifier="Procurement"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.364Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.388Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.364Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.388Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -244,21 +244,33 @@
     <window id="557A0AA1D0D745F9A61557C05483072C" entity-name="ADWindow" identifier="Bank File Format"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.363Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.388Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.363Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.388Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>false</editableField>
     <inheritedFrom xsi:nil="true"/>
   </ADWindowAccess>
+  <ADWindowAccess id="06869D54C7D7479DB225702CEB0AE0EF" identifier="Copy from Orders P&amp;E - Sales">
+    <id>06869D54C7D7479DB225702CEB0AE0EF</id>
+    <window id="A839712F8D5E4929BB2D057BAA55A2A3" entity-name="ADWindow" identifier="Copy from Orders P&amp;E"/>
+    <role id="FF8081812250326E012250353BDE0006" entity-name="ADRole" identifier="Sales"/>
+    <active>true</active>
+    <creationDate transient="true">2017-11-28T13:36:10.634Z</creationDate>
+    <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
+    <updated transient="true">2017-11-28T13:36:10.634Z</updated>
+    <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
+    <editableField>true</editableField>
+    <inheritedFrom xsi:nil="true"/>
+  </ADWindowAccess>
   <ADWindowAccess id="17334F9036F54D0DAE2D11FD59C60A42" identifier="Requisition - Sales">
     <id>17334F9036F54D0DAE2D11FD59C60A42</id>
     <window id="800092" entity-name="ADWindow" identifier="Requisition"/>
     <role id="FF8081812250326E012250353BDE0006" entity-name="ADRole" identifier="Sales"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.363Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.388Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.363Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.388Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -268,9 +280,9 @@
     <window id="FEB8679CAA0D47E5978F10E22566FCEA" entity-name="ADWindow" identifier="Audit Trail"/>
     <role id="FF808181259DADEB01259DDDA4BB01E5" entity-name="ADRole" identifier="Company Admin"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.363Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.388Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.363Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.388Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -280,9 +292,9 @@
     <window id="123" entity-name="ADWindow" identifier="Business Partner"/>
     <role id="D7D7D228E4594ACE8D00FD0E08B333DE" entity-name="ADRole" identifier="Procurement"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.363Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.388Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.363Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.388Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -292,9 +304,9 @@
     <window id="D549B07D9D774AB2A60FF09E1562C93A" entity-name="ADWindow" identifier="Payment Priority"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.362Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.388Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.362Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.388Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -304,9 +316,9 @@
     <window id="1002100003" entity-name="ADWindow" identifier="Tax Register Type"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.362Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.388Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.362Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.388Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -316,9 +328,9 @@
     <window id="800092" entity-name="ADWindow" identifier="Requisition"/>
     <role id="FF808181259DADEB01259DDDA4BB01E5" entity-name="ADRole" identifier="Company Admin"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.362Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.388Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.362Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.388Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -328,9 +340,9 @@
     <window id="146" entity-name="ADWindow" identifier="Price List"/>
     <role id="D7D7D228E4594ACE8D00FD0E08B333DE" entity-name="ADRole" identifier="Procurement"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.362Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.387Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.362Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.387Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -340,9 +352,9 @@
     <window id="E547CE89D4C04429B6340FFA44E70716" entity-name="ADWindow" identifier="Payment In"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.362Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.387Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.362Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.387Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -352,9 +364,9 @@
     <window id="800092" entity-name="ADWindow" identifier="Requisition"/>
     <role id="FF808181259DADEB01259DDDA4C201E7" entity-name="ADRole" identifier="Warehouse"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.361Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.387Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.361Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.387Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -364,9 +376,9 @@
     <window id="1004400000" entity-name="ADWindow" identifier="Manage Requisitions"/>
     <role id="D7D7D228E4594ACE8D00FD0E08B333DE" entity-name="ADRole" identifier="Procurement"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.361Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.387Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.361Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.387Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -376,9 +388,9 @@
     <window id="6F8F913FA60F4CBD93DC1D3AA696E76E" entity-name="ADWindow" identifier="Payment Out"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.361Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.387Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.361Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.387Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -388,9 +400,9 @@
     <window id="800092" entity-name="ADWindow" identifier="Requisition"/>
     <role id="FF808181259DADEB01259DDDA4C201E6" entity-name="ADRole" identifier="Company Executive"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.361Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.387Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.361Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.387Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -400,9 +412,9 @@
     <window id="3CAAC7D54593489384452416ACF356DD" entity-name="ADWindow" identifier="Payment Method"/>
     <role id="FF808181259DADEB01259DDDA4BB01E5" entity-name="ADRole" identifier="Company Admin"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.361Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.387Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.361Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.387Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -412,9 +424,9 @@
     <window id="D549B07D9D774AB2A60FF09E1562C93A" entity-name="ADWindow" identifier="Payment Priority"/>
     <role id="FF808181259DADEB01259DDDA4BB01E5" entity-name="ADRole" identifier="Company Admin"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.360Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.387Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.360Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.387Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -424,9 +436,9 @@
     <window id="24DDE1DDF13942D78B6D6F216979E56A" entity-name="ADWindow" identifier="Execution Process"/>
     <role id="FF808181259DADEB01259DDDA4BB01E5" entity-name="ADRole" identifier="Company Admin"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.360Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.387Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.360Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.387Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -436,9 +448,9 @@
     <window id="181" entity-name="ADWindow" identifier="Purchase Order"/>
     <role id="D7D7D228E4594ACE8D00FD0E08B333DE" entity-name="ADRole" identifier="Procurement"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.360Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.386Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.360Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.386Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -448,9 +460,9 @@
     <window id="800092" entity-name="ADWindow" identifier="Requisition"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.360Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.386Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.360Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.386Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -460,9 +472,9 @@
     <window id="140" entity-name="ADWindow" identifier="Product"/>
     <role id="D7D7D228E4594ACE8D00FD0E08B333DE" entity-name="ADRole" identifier="Procurement"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.360Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.386Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.360Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.386Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -472,21 +484,33 @@
     <window id="800077" entity-name="ADWindow" identifier="Budget"/>
     <role id="FF808181259DADEB01259DDDA4C201E6" entity-name="ADRole" identifier="Company Executive"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.359Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.386Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.359Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.386Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
   </ADWindowAccess>
+  <ADWindowAccess id="D4A4188327384D72A0220A76DA0D8618" identifier="Copy from Orders P&amp;E - Finance">
+    <id>D4A4188327384D72A0220A76DA0D8618</id>
+    <window id="A839712F8D5E4929BB2D057BAA55A2A3" entity-name="ADWindow" identifier="Copy from Orders P&amp;E"/>
+    <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
+    <active>true</active>
+    <creationDate transient="true">2017-11-28T13:36:19.934Z</creationDate>
+    <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
+    <updated transient="true">2017-11-28T13:36:19.934Z</updated>
+    <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
+    <editableField>false</editableField>
+    <inheritedFrom xsi:nil="true"/>
+  </ADWindowAccess>
   <ADWindowAccess id="E070AF0C85144578B8D09269E521DA08" identifier="Budget - Finance">
     <id>E070AF0C85144578B8D09269E521DA08</id>
     <window id="800077" entity-name="ADWindow" identifier="Budget"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.359Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.386Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.359Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.386Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -496,9 +520,9 @@
     <window id="1002100004" entity-name="ADWindow" identifier="Tax Payment"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.359Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.386Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.359Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.386Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -508,9 +532,9 @@
     <window id="AFE6BDF360C44B99ACA6FB5E9F51EA45" entity-name="ADWindow" identifier="Payment Run"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.359Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.386Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.359Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.386Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -520,9 +544,9 @@
     <window id="3CAAC7D54593489384452416ACF356DD" entity-name="ADWindow" identifier="Payment Method"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.359Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.386Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.359Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.386Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -532,9 +556,9 @@
     <window id="D1D0C603DFC0423099D897A0DB388AC2" entity-name="ADWindow" identifier="Matching Algorithm"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.358Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.385Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.358Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.385Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>false</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -544,9 +568,9 @@
     <window id="137" entity-name="ADWindow" identifier="Tax Rate"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.358Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.385Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.358Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.385Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -556,9 +580,9 @@
     <window id="1B7B3BB7FEAF41ED8D9727AB98779D3C" entity-name="ADWindow" identifier="Payment Proposal"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.358Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.385Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.358Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.385Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -568,9 +592,9 @@
     <window id="94EAA455D2644E04AB25D93BE5157B6D" entity-name="ADWindow" identifier="Financial Account"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.358Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.385Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.358Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.385Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -580,9 +604,9 @@
     <window id="800092" entity-name="ADWindow" identifier="Requisition"/>
     <role id="CA5B7FB2C95740E499C0F102343D51AD" entity-name="ADRole" identifier="Employee"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.357Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.385Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.357Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.385Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -592,9 +616,9 @@
     <window id="144" entity-name="ADWindow" identifier="Product Category"/>
     <role id="FF808181259DADEB01259DDDA4BB01E5" entity-name="ADRole" identifier="Company Admin"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.357Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.385Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.357Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.385Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -604,9 +628,9 @@
     <window id="110" entity-name="ADWindow" identifier="Organization"/>
     <role id="FF808181259DADEB01259DDDA4BB01E5" entity-name="ADRole" identifier="Company Admin"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.357Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.385Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.357Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.385Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -616,9 +640,9 @@
     <window id="112" entity-name="ADWindow" identifier="Document Sequence"/>
     <role id="FF808181259DADEB01259DDDA4BB01E5" entity-name="ADRole" identifier="Company Admin"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.357Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.385Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.357Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.385Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -628,9 +652,9 @@
     <window id="120" entity-name="ADWindow" identifier="Unit of Measure"/>
     <role id="FF808181259DADEB01259DDDA4BB01E5" entity-name="ADRole" identifier="Company Admin"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.356Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.385Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.356Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.385Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -640,9 +664,9 @@
     <window id="116" entity-name="ADWindow" identifier="Conversion Rates"/>
     <role id="FF808181259DADEB01259DDDA4BB01E5" entity-name="ADRole" identifier="Company Admin"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.356Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.384Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.356Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.384Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -652,9 +676,9 @@
     <window id="115" entity-name="ADWindow" identifier="Currency"/>
     <role id="FF808181259DADEB01259DDDA4BB01E5" entity-name="ADRole" identifier="Company Admin"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.356Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.384Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.356Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.384Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -664,9 +688,9 @@
     <window id="260" entity-name="ADWindow" identifier="Attribute"/>
     <role id="FF808181259DADEB01259DDDA4BB01E5" entity-name="ADRole" identifier="Company Admin"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.356Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.384Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.356Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.384Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -676,9 +700,9 @@
     <window id="192" entity-name="ADWindow" identifier="Business Partner Category"/>
     <role id="FF808181259DADEB01259DDDA4BB01E5" entity-name="ADRole" identifier="Company Admin"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.356Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.384Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.356Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.384Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -688,9 +712,9 @@
     <window id="135" entity-name="ADWindow" identifier="Document Type"/>
     <role id="FF808181259DADEB01259DDDA4BB01E5" entity-name="ADRole" identifier="Company Admin"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.355Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.384Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.355Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.384Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -700,9 +724,9 @@
     <window id="256" entity-name="ADWindow" identifier="Attribute Set"/>
     <role id="FF808181259DADEB01259DDDA4BB01E5" entity-name="ADRole" identifier="Company Admin"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.355Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.384Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.355Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.384Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -712,9 +736,9 @@
     <window id="137" entity-name="ADWindow" identifier="Tax Rate"/>
     <role id="FF808181259DADEB01259DDDA4BB01E5" entity-name="ADRole" identifier="Company Admin"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.355Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.384Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.355Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.384Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -724,9 +748,9 @@
     <window id="138" entity-name="ADWindow" identifier="Tax Category"/>
     <role id="FF808181259DADEB01259DDDA4BB01E5" entity-name="ADRole" identifier="Company Admin"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.355Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.384Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.355Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.384Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -736,9 +760,9 @@
     <window id="800086" entity-name="ADWindow" identifier="Business Partner Tax Category"/>
     <role id="FF808181259DADEB01259DDDA4BB01E5" entity-name="ADRole" identifier="Company Admin"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.354Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.384Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.354Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.384Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -748,9 +772,9 @@
     <window id="146" entity-name="ADWindow" identifier="Price List"/>
     <role id="FF8081812250326E012250353BDE0006" entity-name="ADRole" identifier="Sales"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.354Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.383Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.354Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.383Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -760,9 +784,9 @@
     <window id="140" entity-name="ADWindow" identifier="Product"/>
     <role id="FF8081812250326E012250353BDE0006" entity-name="ADRole" identifier="Sales"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.354Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.383Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.354Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.383Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -772,9 +796,9 @@
     <window id="143" entity-name="ADWindow" identifier="Sales Order"/>
     <role id="FF8081812250326E012250353BDE0006" entity-name="ADRole" identifier="Sales"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.354Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.383Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.354Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.383Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -784,9 +808,9 @@
     <window id="123" entity-name="ADWindow" identifier="Business Partner"/>
     <role id="FF8081812250326E012250353BDE0006" entity-name="ADRole" identifier="Sales"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.354Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.383Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.354Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.383Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -796,9 +820,9 @@
     <window id="800026" entity-name="ADWindow" identifier="Amortization"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.353Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.383Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.353Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.383Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -808,9 +832,9 @@
     <window id="800017" entity-name="ADWindow" identifier="Basic Discount"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.353Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.383Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.353Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.383Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -820,9 +844,9 @@
     <window id="143" entity-name="ADWindow" identifier="Sales Order"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.353Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.383Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.353Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.383Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -832,9 +856,9 @@
     <window id="118" entity-name="ADWindow" identifier="Account Tree"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.353Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.383Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.353Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.383Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -844,9 +868,9 @@
     <window id="123" entity-name="ADWindow" identifier="Business Partner"/>
     <role id="FF808181259DADEB01259DDDA4C201E6" entity-name="ADRole" identifier="Company Executive"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.352Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.382Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.352Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.382Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -856,9 +880,9 @@
     <window id="184" entity-name="ADWindow" identifier="Goods Receipt"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.352Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.382Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.352Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.382Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -868,9 +892,9 @@
     <window id="141" entity-name="ADWindow" identifier="Payment Term"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.352Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.382Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.352Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.382Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -880,9 +904,9 @@
     <window id="140" entity-name="ADWindow" identifier="Product"/>
     <role id="FF808181259DADEB01259DDDA4C201E6" entity-name="ADRole" identifier="Company Executive"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.352Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.382Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.352Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.382Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -892,9 +916,9 @@
     <window id="139" entity-name="ADWindow" identifier="Warehouse and Storage Bins"/>
     <role id="FF808181259DADEB01259DDDA4C201E7" entity-name="ADRole" identifier="Warehouse"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.351Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.382Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.351Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.382Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -904,9 +928,9 @@
     <window id="162" entity-name="ADWindow" identifier="Accounting Transaction Details"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.351Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.382Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.351Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.382Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -916,9 +940,9 @@
     <window id="137" entity-name="ADWindow" identifier="Tax Rate"/>
     <role id="FF808181259DADEB01259DDDA4C201E6" entity-name="ADRole" identifier="Company Executive"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.351Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.382Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.351Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.382Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -928,9 +952,9 @@
     <window id="800007" entity-name="ADWindow" identifier="G/L Item"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.351Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.381Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.351Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.381Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -940,9 +964,9 @@
     <window id="125" entity-name="ADWindow" identifier="General Ledger Configuration"/>
     <role id="FF808181259DADEB01259DDDA4BB01E5" entity-name="ADRole" identifier="Company Admin"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.350Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.381Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.350Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.381Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -952,9 +976,9 @@
     <window id="144" entity-name="ADWindow" identifier="Product Category"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.350Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.381Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.350Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.381Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -964,9 +988,9 @@
     <window id="169" entity-name="ADWindow" identifier="Goods Shipment"/>
     <role id="FF808181259DADEB01259DDDA4C201E7" entity-name="ADRole" identifier="Warehouse"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.350Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.381Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.350Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.381Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -976,9 +1000,9 @@
     <window id="132" entity-name="ADWindow" identifier="G/L Journal"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.350Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.381Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.350Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.381Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -988,9 +1012,9 @@
     <window id="E56E701CCBA14B8BA480CBDE37C50D7A" entity-name="ADWindow" identifier="Period Control Log"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.350Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.381Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.350Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.381Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1000,9 +1024,9 @@
     <window id="170" entity-name="ADWindow" identifier="Goods Movements"/>
     <role id="FF808181259DADEB01259DDDA4C201E7" entity-name="ADRole" identifier="Warehouse"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.349Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.381Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.349Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.381Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1012,9 +1036,9 @@
     <window id="146" entity-name="ADWindow" identifier="Price List"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.349Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.380Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.349Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.380Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1024,9 +1048,9 @@
     <window id="800027" entity-name="ADWindow" identifier="Assets"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.349Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.380Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.349Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.380Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1036,9 +1060,9 @@
     <window id="233" entity-name="ADWindow" identifier="Price List Schema"/>
     <role id="FF808181259DADEB01259DDDA4BB01E5" entity-name="ADRole" identifier="Company Admin"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.349Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.380Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.349Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.380Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1048,9 +1072,9 @@
     <window id="183" entity-name="ADWindow" identifier="Purchase Invoice"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.349Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.380Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.349Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.380Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1060,9 +1084,9 @@
     <window id="123" entity-name="ADWindow" identifier="Business Partner"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.348Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.380Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.348Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.380Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1072,9 +1096,9 @@
     <window id="167" entity-name="ADWindow" identifier="Sales Invoice"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.348Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.380Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.348Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.380Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1084,9 +1108,9 @@
     <window id="117" entity-name="ADWindow" identifier="Fiscal Calendar"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.348Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.379Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.348Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.379Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1096,9 +1120,9 @@
     <window id="168" entity-name="ADWindow" identifier="Physical Inventory"/>
     <role id="FF808181259DADEB01259DDDA4C201E7" entity-name="ADRole" identifier="Warehouse"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.348Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.379Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.348Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.379Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1108,9 +1132,9 @@
     <window id="252" entity-name="ADWindow" identifier="Asset Group"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.348Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.379Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.348Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.379Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1120,9 +1144,9 @@
     <window id="140" entity-name="ADWindow" identifier="Product"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.347Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.379Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.347Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.379Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1132,9 +1156,9 @@
     <window id="184" entity-name="ADWindow" identifier="Goods Receipt"/>
     <role id="FF808181259DADEB01259DDDA4C201E7" entity-name="ADRole" identifier="Warehouse"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.347Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.379Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.347Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.379Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1144,9 +1168,9 @@
     <window id="192" entity-name="ADWindow" identifier="Business Partner Category"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.347Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.378Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.347Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.378Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1156,9 +1180,9 @@
     <window id="181" entity-name="ADWindow" identifier="Purchase Order"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.347Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.378Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.347Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.378Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1168,9 +1192,9 @@
     <window id="147" entity-name="ADWindow" identifier="Invoice Schedule"/>
     <role id="FF808181259DADEB01259DDDA4BB01E5" entity-name="ADRole" identifier="Company Admin"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.347Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.378Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.347Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.378Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1180,9 +1204,9 @@
     <process id="800185" entity-name="ADProcess" identifier="Stock Report"/>
     <role id="D7D7D228E4594ACE8D00FD0E08B333DE" entity-name="ADRole" identifier="Procurement"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.346Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.378Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.346Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.378Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1192,9 +1216,9 @@
     <process id="6AD04479EC134BD4826077F36B709876" entity-name="ADProcess" identifier="Payment Report"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.346Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.378Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.346Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.378Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1204,9 +1228,9 @@
     <process id="800181" entity-name="ADProcess" identifier="Purchase Dimensional Report"/>
     <role id="D7D7D228E4594ACE8D00FD0E08B333DE" entity-name="ADRole" identifier="Procurement"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.346Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.378Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.346Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.378Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1216,9 +1240,9 @@
     <process id="ACD33F81B247441B8659BECF10D7A808" entity-name="ADProcess" identifier="Print payments process"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.346Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.378Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.346Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.378Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1228,9 +1252,9 @@
     <process id="3C4A5FB206B74C3CA9FE20116FCA0464" entity-name="ADProcess" identifier="Reconciliation Details"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.345Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.377Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.345Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.377Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1240,9 +1264,9 @@
     <process id="2EED9BC16DB34D2B80BA40A21564BECF" entity-name="ADProcess" identifier="Add Payment"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.345Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.377Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.345Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.377Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1252,9 +1276,9 @@
     <process id="1003900000" entity-name="ADProcess" identifier="TaxPayment Post"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.345Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.377Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.345Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.377Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1264,9 +1288,9 @@
     <process id="C125EA7C85234D8B89FEA511FCCD2E9E" entity-name="ADProcess" identifier="Match Statement"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.345Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.377Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.345Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.377Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1276,9 +1300,9 @@
     <process id="800138" entity-name="ADProcess" identifier="Export Budget to Excel"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.345Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.377Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.345Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.377Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1288,9 +1312,9 @@
     <process id="1004400000" entity-name="ADProcess" identifier="Create Purchase Order"/>
     <role id="D7D7D228E4594ACE8D00FD0E08B333DE" entity-name="ADRole" identifier="Procurement"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.344Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.376Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.344Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.376Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1300,9 +1324,9 @@
     <process id="E3E92E9F08214507958E6875E66F2F99" entity-name="ADProcess" identifier="Add Transaction"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.344Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.376Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.344Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.376Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1312,9 +1336,9 @@
     <process id="800067" entity-name="ADProcess" identifier="Price List Report"/>
     <role id="D7D7D228E4594ACE8D00FD0E08B333DE" entity-name="ADRole" identifier="Procurement"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.344Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.376Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.344Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.376Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1324,9 +1348,9 @@
     <process id="EB3D56BDD37E4229B67DBAB9F9A9B167" entity-name="ADProcess" identifier="Reconcile"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.344Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.376Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.344Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.376Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1336,9 +1360,9 @@
     <process id="4A059E4F79294640AD37B1B718C56E5D" entity-name="ADProcess" identifier="Add Payment From Transaction"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.344Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.376Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.344Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.376Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1348,9 +1372,9 @@
     <process id="7AC7BE9024E448A0BB863C159DA762F9" entity-name="ADProcess" identifier="Import Statement"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.343Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.376Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.343Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.376Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1360,9 +1384,9 @@
     <process id="800135" entity-name="ADProcess" identifier="Copy Budget"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.343Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.376Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.343Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.376Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1372,9 +1396,9 @@
     <process id="62E6270312534380B9A8BDF603CA8FBB" entity-name="ADProcess" identifier="Select Expected Payments"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.343Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.376Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.343Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.376Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1384,9 +1408,9 @@
     <process id="1002100000" entity-name="ADProcess" identifier="Create Vat Registers"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.343Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.375Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.343Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.375Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1396,9 +1420,9 @@
     <process id="12016E2EDE0245B5A36B84CBA144DBDF" entity-name="ADProcess" identifier="Add Details"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.343Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.375Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.343Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.375Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1408,9 +1432,9 @@
     <process id="DC23BB9234174E52879E4B21C8CD1F4B" entity-name="ADProcess" identifier="Process Payment Proposal"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.342Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.375Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.342Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.375Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1420,9 +1444,9 @@
     <process id="E011F492B0814A74B63CD1F3B9FF0526" entity-name="ADProcess" identifier="Execute Payment"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.342Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.375Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.342Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.375Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1432,9 +1456,9 @@
     <process id="800137" entity-name="ADProcess" identifier="Create Budget Reports in Excel"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.342Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.375Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.342Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.375Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1444,9 +1468,9 @@
     <process id="6255BE488882480599C81284B70CD9B3" entity-name="ADProcess" identifier="Payment Process"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.342Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.375Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.342Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.375Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1456,9 +1480,9 @@
     <process id="D16966FBF9604A3D91A50DC83C6EA8E3" entity-name="ADProcess" identifier="Payment Proposal Process"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.342Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.375Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.342Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.375Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1468,9 +1492,9 @@
     <process id="BBA11D1A061346459AF6148920FE6629" entity-name="ADProcess" identifier="Reconciliation Summary"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.341Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.375Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.341Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.375Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1480,9 +1504,9 @@
     <process id="800023" entity-name="ADProcess" identifier="Invoice Taxes Report"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.341Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.375Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.341Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.375Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1492,9 +1516,9 @@
     <process id="800099" entity-name="ADProcess" identifier="Bpartner print"/>
     <role id="FF808181259DADEB01259DDDA4C201E6" entity-name="ADRole" identifier="Company Executive"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.341Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.374Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.341Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.374Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>false</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1504,9 +1528,9 @@
     <process id="800099" entity-name="ADProcess" identifier="Bpartner print"/>
     <role id="FF8081812250326E012250353BDE0006" entity-name="ADRole" identifier="Sales"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.341Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.374Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.341Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.374Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>false</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1516,9 +1540,9 @@
     <process id="800099" entity-name="ADProcess" identifier="Bpartner print"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.341Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.374Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.341Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.374Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>false</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1528,9 +1552,9 @@
     <process id="800099" entity-name="ADProcess" identifier="Bpartner print"/>
     <role id="D7D7D228E4594ACE8D00FD0E08B333DE" entity-name="ADRole" identifier="Procurement"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.340Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.374Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.340Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.374Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>false</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1540,21 +1564,9 @@
     <process id="800168" entity-name="ADProcess" identifier="Not Posted Transaction Report"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.340Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.374Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.340Z</updated>
-    <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <editableField>true</editableField>
-    <inheritedFrom xsi:nil="true"/>
-  </ADProcessAccess>
-  <ADProcessAccess id="FF808181259DADEB01259DDDA4D3022D" identifier="Copy from Order - Finance">
-    <id>FF808181259DADEB01259DDDA4D3022D</id>
-    <process id="800165" entity-name="ADProcess" identifier="Copy from Order"/>
-    <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
-    <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.340Z</creationDate>
-    <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.340Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.374Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1564,9 +1576,9 @@
     <process id="800039" entity-name="ADProcess" identifier="Trial Balance"/>
     <role id="FF808181259DADEB01259DDDA4C201E6" entity-name="ADRole" identifier="Company Executive"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.340Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.374Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.340Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.374Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1576,9 +1588,9 @@
     <process id="800021" entity-name="ADProcess" identifier="Balance sheet and P&amp;L structure"/>
     <role id="FF808181259DADEB01259DDDA4C201E6" entity-name="ADRole" identifier="Company Executive"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.340Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.374Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.340Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.374Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1588,9 +1600,9 @@
     <process id="800000" entity-name="ADProcess" identifier="Journal Entries Report"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.339Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.373Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.339Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.373Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1600,9 +1612,9 @@
     <process id="800001" entity-name="ADProcess" identifier="General Ledger Report"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.339Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.373Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.339Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.373Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1612,9 +1624,9 @@
     <process id="800038" entity-name="ADProcess" identifier="Undo Close Year"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.339Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.373Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.339Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.373Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1624,9 +1636,9 @@
     <process id="800176" entity-name="ADProcess" identifier="Sales Order Report"/>
     <role id="FF8081812250326E012250353BDE0006" entity-name="ADRole" identifier="Sales"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.339Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.373Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.339Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.373Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1636,9 +1648,9 @@
     <process id="800067" entity-name="ADProcess" identifier="Price List Report"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.338Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.373Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.338Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.373Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1648,9 +1660,9 @@
     <process id="800058" entity-name="ADProcess" identifier="Shipments Dimensional Report"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.338Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.373Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.338Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.373Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1660,9 +1672,9 @@
     <process id="800184" entity-name="ADProcess" identifier="Sales Dimensional Report"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.338Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.373Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.338Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.373Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1672,9 +1684,9 @@
     <process id="800046" entity-name="ADProcess" identifier="Product Movements Report"/>
     <role id="FF808181259DADEB01259DDDA4C201E7" entity-name="ADRole" identifier="Warehouse"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.338Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.373Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.338Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.373Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1684,9 +1696,9 @@
     <process id="119" entity-name="ADProcess" identifier="Generate Invoices"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.338Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.373Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.338Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.373Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1696,9 +1708,9 @@
     <process id="800183" entity-name="ADProcess" identifier="Purchase Invoice Dimensional Report"/>
     <role id="FF808181259DADEB01259DDDA4C201E6" entity-name="ADRole" identifier="Company Executive"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.337Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.372Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.337Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.372Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>false</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1708,9 +1720,9 @@
     <process id="800018" entity-name="ADProcess" identifier="Material Transaction Report"/>
     <role id="FF808181259DADEB01259DDDA4C201E7" entity-name="ADRole" identifier="Warehouse"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.337Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.372Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.337Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.372Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>false</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1720,9 +1732,9 @@
     <process id="800067" entity-name="ADProcess" identifier="Price List Report"/>
     <role id="FF8081812250326E012250353BDE0006" entity-name="ADRole" identifier="Sales"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.337Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.372Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.337Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.372Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1732,9 +1744,9 @@
     <process id="800036" entity-name="ADProcess" identifier="Close Year"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.337Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.372Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.337Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.372Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1744,9 +1756,9 @@
     <process id="800085" entity-name="ADProcess" identifier="Generate Average Costs"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.337Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.372Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.337Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.372Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1756,9 +1768,9 @@
     <process id="800184" entity-name="ADProcess" identifier="Sales Dimensional Report"/>
     <role id="FF8081812250326E012250353BDE0006" entity-name="ADRole" identifier="Sales"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.336Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.372Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.336Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.372Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1768,9 +1780,9 @@
     <process id="6D3B1C36BF594A51878281B505F6CECF" entity-name="ADProcess" identifier="Sales Invoice Dimensional Report"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.336Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.372Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.336Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.372Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1780,9 +1792,9 @@
     <process id="800182" entity-name="ADProcess" identifier="Goods Receipts Dimensional Report"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.336Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.372Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.336Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.372Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1792,9 +1804,9 @@
     <process id="3DAA5E63A30D45A8ABF87701F8BD91EF" entity-name="ADProcess" identifier="Orders Awaiting Delivery Report"/>
     <role id="FF808181259DADEB01259DDDA4C201E7" entity-name="ADRole" identifier="Warehouse"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.336Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.371Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.336Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.371Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>false</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1804,9 +1816,9 @@
     <process id="800067" entity-name="ADProcess" identifier="Price List Report"/>
     <role id="FF808181259DADEB01259DDDA4C201E6" entity-name="ADRole" identifier="Company Executive"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.335Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.371Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.335Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.371Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>false</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1816,9 +1828,9 @@
     <process id="800184" entity-name="ADProcess" identifier="Sales Dimensional Report"/>
     <role id="FF808181259DADEB01259DDDA4C201E6" entity-name="ADRole" identifier="Company Executive"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.335Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.371Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.335Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.371Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1828,9 +1840,9 @@
     <process id="E5BE98DCF4514A18B571F21183B397DD" entity-name="ADProcess" identifier="Valued Stock Report"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.335Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.371Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.335Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.371Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1840,33 +1852,21 @@
     <process id="3DAA5E63A30D45A8ABF87701F8BD91EF" entity-name="ADProcess" identifier="Orders Awaiting Delivery Report"/>
     <role id="FF8081812250326E012250353BDE0006" entity-name="ADRole" identifier="Sales"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.335Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.371Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.335Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.371Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>false</editableField>
     <inheritedFrom xsi:nil="true"/>
   </ADProcessAccess>
-  <ADProcessAccess id="FF808181259DADEB01259DDDA4E6024E" identifier="Copy from Order - Sales">
-    <id>FF808181259DADEB01259DDDA4E6024E</id>
-    <process id="800165" entity-name="ADProcess" identifier="Copy from Order"/>
-    <role id="FF8081812250326E012250353BDE0006" entity-name="ADRole" identifier="Sales"/>
-    <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.334Z</creationDate>
-    <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.334Z</updated>
-    <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <editableField>true</editableField>
-    <inheritedFrom xsi:nil="true"/>
-  </ADProcessAccess>
   <ADProcessAccess id="FF808181259DADEB01259DDDA4E70250" identifier="Monthly Invoice - Finance">
     <id>FF808181259DADEB01259DDDA4E70250</id>
     <process id="129" entity-name="ADProcess" identifier="Monthly Invoice"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.334Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.371Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.334Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.371Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1876,9 +1876,9 @@
     <process id="800079" entity-name="ADProcess" identifier="Traceability Report"/>
     <role id="FF808181259DADEB01259DDDA4C201E7" entity-name="ADRole" identifier="Warehouse"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.334Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.371Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.334Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.371Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1888,9 +1888,9 @@
     <process id="176" entity-name="ADProcess" identifier="Reset Accounting Old"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.334Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.371Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.334Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.371Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1900,9 +1900,9 @@
     <process id="462033447A1548F09BBFB0683FA976CC" entity-name="ADProcess" identifier="Asset report for depreciation schedule"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.334Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.371Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.334Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.371Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1912,9 +1912,9 @@
     <process id="E5BE98DCF4514A18B571F21183B397DD" entity-name="ADProcess" identifier="Valued Stock Report"/>
     <role id="FF808181259DADEB01259DDDA4C201E7" entity-name="ADRole" identifier="Warehouse"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.333Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.370Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.333Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.370Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1924,9 +1924,9 @@
     <process id="800185" entity-name="ADProcess" identifier="Stock Report"/>
     <role id="FF8081812250326E012250353BDE0006" entity-name="ADRole" identifier="Sales"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.333Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.370Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.333Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.370Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>false</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1936,9 +1936,9 @@
     <process id="800058" entity-name="ADProcess" identifier="Shipments Dimensional Report"/>
     <role id="FF8081812250326E012250353BDE0006" entity-name="ADRole" identifier="Sales"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.333Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.370Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.333Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.370Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>false</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1948,9 +1948,9 @@
     <process id="800183" entity-name="ADProcess" identifier="Purchase Invoice Dimensional Report"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.333Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.370Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.333Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.370Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1960,9 +1960,9 @@
     <process id="800021" entity-name="ADProcess" identifier="Balance sheet and P&amp;L structure"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.333Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.370Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.333Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.370Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1972,9 +1972,9 @@
     <process id="6D3B1C36BF594A51878281B505F6CECF" entity-name="ADProcess" identifier="Sales Invoice Dimensional Report"/>
     <role id="FF808181259DADEB01259DDDA4C201E6" entity-name="ADRole" identifier="Company Executive"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.332Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.370Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.332Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.370Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1984,9 +1984,9 @@
     <process id="800058" entity-name="ADProcess" identifier="Shipments Dimensional Report"/>
     <role id="FF808181259DADEB01259DDDA4C201E6" entity-name="ADRole" identifier="Company Executive"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.332Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.370Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.332Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.370Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -1996,9 +1996,9 @@
     <process id="166" entity-name="ADProcess" identifier="Create Invoice"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.332Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.370Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.332Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.370Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -2008,9 +2008,9 @@
     <process id="800039" entity-name="ADProcess" identifier="Trial Balance"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.332Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.370Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.332Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.370Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -2020,9 +2020,9 @@
     <process id="800085" entity-name="ADProcess" identifier="Generate Average Costs"/>
     <role id="FF808181259DADEB01259DDDA4C201E7" entity-name="ADRole" identifier="Warehouse"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.331Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.369Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.331Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.369Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -2032,9 +2032,9 @@
     <process id="800181" entity-name="ADProcess" identifier="Purchase Dimensional Report"/>
     <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.331Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.369Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.331Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.369Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
@@ -2044,31 +2044,55 @@
     <process id="800185" entity-name="ADProcess" identifier="Stock Report"/>
     <role id="FF808181259DADEB01259DDDA4C201E7" entity-name="ADRole" identifier="Warehouse"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.331Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.369Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.331Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.369Z</updated>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
   </ADProcessAccess>
   <OBUIAPP_Process_Access id="76CAA60305E940628F7778E9374E9A18" identifier="76CAA60305E940628F7778E9374E9A18 - Procurement">
-    <id>393FAC129A564786987C1C7B8B4ED8A7</id>
+    <id>76CAA60305E940628F7778E9374E9A18</id>
     <obuiappProcess id="4BDE0AF5E8C44B6C9575E388AAECDF69" entity-name="OBUIAPP_Process" identifier="Purchase Order Report"/>
     <role id="D7D7D228E4594ACE8D00FD0E08B333DE" entity-name="ADRole" identifier="Procurement"/>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:54:27.260Z</creationDate>
-    <createdBy transient="true" id="A44F5B3CBF3E4D18855B1218C51FEF13" entity-name="ADUser" identifier="cliente"/>
-    <updated transient="true">2017-05-30T11:54:27.260Z</updated>
-    <updatedBy transient="true" id="A44F5B3CBF3E4D18855B1218C51FEF13" entity-name="ADUser" identifier="cliente"/>
+    <creationDate transient="true">2017-11-28T13:00:08.369Z</creationDate>
+    <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
+    <updated transient="true">2017-11-28T13:00:08.369Z</updated>
+    <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
+    <editableField>true</editableField>
+    <inheritedFrom xsi:nil="true"/>
+  </OBUIAPP_Process_Access>
+  <OBUIAPP_Process_Access id="7CBC622102FC4CD9B71C4159170B9C57" identifier="7CBC622102FC4CD9B71C4159170B9C57 - Sales">
+    <id>7CBC622102FC4CD9B71C4159170B9C57</id>
+    <obuiappProcess id="8B81D80B06364566B87853FEECAB5DE0" entity-name="OBUIAPP_Process" identifier="Copy from Orders"/>
+    <role id="FF8081812250326E012250353BDE0006" entity-name="ADRole" identifier="Sales"/>
+    <active>true</active>
+    <creationDate transient="true">2017-11-28T13:03:09.185Z</creationDate>
+    <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
+    <updated transient="true">2017-11-28T13:03:09.185Z</updated>
+    <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
+    <editableField>true</editableField>
+    <inheritedFrom xsi:nil="true"/>
+  </OBUIAPP_Process_Access>
+  <OBUIAPP_Process_Access id="FAD61092C5A142E59D67919312CD78CA" identifier="FAD61092C5A142E59D67919312CD78CA - Finance">
+    <id>FAD61092C5A142E59D67919312CD78CA</id>
+    <obuiappProcess id="8B81D80B06364566B87853FEECAB5DE0" entity-name="OBUIAPP_Process" identifier="Copy from Orders"/>
+    <role id="FF8081812250326E012250353BDE0005" entity-name="ADRole" identifier="Finance"/>
+    <active>true</active>
+    <creationDate transient="true">2017-11-28T13:03:19.52Z</creationDate>
+    <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
+    <updated transient="true">2017-11-28T13:03:19.52Z</updated>
+    <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <editableField>true</editableField>
     <inheritedFrom xsi:nil="true"/>
   </OBUIAPP_Process_Access>
   <ADRole id="CA5B7FB2C95740E499C0F102343D51AD" identifier="Employee">
     <id>CA5B7FB2C95740E499C0F102343D51AD</id>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.331Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.369Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.331Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.369Z</updated>
     <name>Employee</name>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <description>Role with access to self-service requisitions.</description>
@@ -2090,9 +2114,9 @@
   <ADRole id="D7D7D228E4594ACE8D00FD0E08B333DE" identifier="Procurement">
     <id>D7D7D228E4594ACE8D00FD0E08B333DE</id>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.330Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.369Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.330Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.369Z</updated>
     <name>Procurement</name>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <description>User working in the procurement department.</description>
@@ -2114,9 +2138,9 @@
   <ADRole id="FF8081812250326E012250353BDE0005" identifier="Finance">
     <id>FF8081812250326E012250353BDE0005</id>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.330Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.368Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.330Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.368Z</updated>
     <name>Finance</name>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <description>User working in the Finance department.</description>
@@ -2138,9 +2162,9 @@
   <ADRole id="FF8081812250326E012250353BDE0006" identifier="Sales">
     <id>FF8081812250326E012250353BDE0006</id>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.330Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.368Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.330Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.368Z</updated>
     <name>Sales</name>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <description>Manage and create sales transactions.</description>
@@ -2162,9 +2186,9 @@
   <ADRole id="FF808181259DADEB01259DDDA4BB01E5" identifier="Company Admin">
     <id>FF808181259DADEB01259DDDA4BB01E5</id>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.330Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.368Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.330Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.368Z</updated>
     <name>Company Admin</name>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <description>Set vital parameters of the company's Openbravo client.</description>
@@ -2186,9 +2210,9 @@
   <ADRole id="FF808181259DADEB01259DDDA4C201E6" identifier="Company Executive">
     <id>FF808181259DADEB01259DDDA4C201E6</id>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.329Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.368Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.329Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.368Z</updated>
     <name>Company Executive</name>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <description>Overview key performance indicators and manage crucial data.</description>
@@ -2210,9 +2234,9 @@
   <ADRole id="FF808181259DADEB01259DDDA4C201E7" identifier="Warehouse">
     <id>FF808181259DADEB01259DDDA4C201E7</id>
     <active>true</active>
-    <creationDate transient="true">2017-05-30T11:47:04.329Z</creationDate>
+    <creationDate transient="true">2017-11-28T13:00:08.368Z</creationDate>
     <createdBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
-    <updated transient="true">2017-05-30T11:47:04.329Z</updated>
+    <updated transient="true">2017-11-28T13:00:08.368Z</updated>
     <name>Warehouse</name>
     <updatedBy transient="true" id="100" entity-name="ADUser" identifier="Openbravo"/>
     <description>Manage master data as part of warehouse and procurement management.</description>
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_DATASET.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_DATASET.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -12,7 +12,7 @@
 <!--49446AB3B19D4DD2AD0320D171EC2760-->  <EXPORT><![CDATA[N]]></EXPORT>
 <!--49446AB3B19D4DD2AD0320D171EC2760-->  <ACCESSLEVEL><![CDATA[6]]></ACCESSLEVEL>
 <!--49446AB3B19D4DD2AD0320D171EC2760-->  <EXPORTALLOWED><![CDATA[Y]]></EXPORTALLOWED>
-<!--49446AB3B19D4DD2AD0320D171EC2760-->  <CHECKSUM><![CDATA[204546209368682899496776916815840853745]]></CHECKSUM>
+<!--49446AB3B19D4DD2AD0320D171EC2760-->  <CHECKSUM><![CDATA[202663778136100076641772867762474140402]]></CHECKSUM>
 <!--49446AB3B19D4DD2AD0320D171EC2760-->  <ISDEFAULTVALUESDATASET><![CDATA[N]]></ISDEFAULTVALUESDATASET>
 <!--49446AB3B19D4DD2AD0320D171EC2760--></AD_DATASET>
 
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></VERSION>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.33164]]></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
@@ -28,7 +28,7 @@
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <REFERENCEDATAINFO><![CDATA[Pre-configured collection of standard ERP roles]]></REFERENCEDATAINFO>
-<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION_LABEL><![CDATA[PR17Q4.1]]></VERSION_LABEL>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61--></AD_MODULE>
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></STARTVERSION>
+<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.33164]]></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.32880]]></STARTVERSION>
+<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.33164]]></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.32880]]></STARTVERSION>
+<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.33164]]></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	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></VERSION>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.33164]]></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>
@@ -24,7 +24,7 @@
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <UPDATEINFO><![CDATA[minor bugfix release to include latest client.application 2.0.1, client.myob 2.0.2 and client.kernel 2.0.1]]></UPDATEINFO>
-<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION_LABEL><![CDATA[PR17Q4.1]]></VERSION_LABEL>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--7E48CDD73B7E493A8BED4F7253E7C989--></AD_MODULE>
--- a/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></STARTVERSION>
+<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.33164]]></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.32880]]></STARTVERSION>
+<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.33164]]></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.32880]]></STARTVERSION>
+<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.33164]]></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.32880]]></STARTVERSION>
+<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.33164]]></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.32880]]></STARTVERSION>
+<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.33164]]></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.32880]]></STARTVERSION>
+<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.33164]]></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.32880]]></STARTVERSION>
+<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.33164]]></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.32880]]></STARTVERSION>
+<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.33164]]></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.32880]]></STARTVERSION>
+<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.33164]]></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.32880]]></STARTVERSION>
+<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.33164]]></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.32880]]></STARTVERSION>
+<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.33164]]></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.32880]]></STARTVERSION>
+<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.33164]]></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	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -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.32880]]></VERSION>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.33164]]></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>
@@ -20,7 +20,7 @@
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION_LABEL><![CDATA[PR17Q4.1]]></VERSION_LABEL>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--0138E7A89B5E4DC3932462252801FFBC--></AD_MODULE>
--- a/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -7,7 +7,7 @@
 <!--48D556894CE54CF998DC97882E904CBD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--48D556894CE54CF998DC97882E904CBD-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--48D556894CE54CF998DC97882E904CBD-->  <AD_DEPENDENT_MODULE_ID><![CDATA[8A098711BB324335A19833286BDB093D]]></AD_DEPENDENT_MODULE_ID>
-<!--48D556894CE54CF998DC97882E904CBD-->  <STARTVERSION><![CDATA[1.0.32880]]></STARTVERSION>
+<!--48D556894CE54CF998DC97882E904CBD-->  <STARTVERSION><![CDATA[1.0.33164]]></STARTVERSION>
 <!--48D556894CE54CF998DC97882E904CBD-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--48D556894CE54CF998DC97882E904CBD-->  <DEPENDANT_MODULE_NAME><![CDATA[Apache External Connection Pool]]></DEPENDANT_MODULE_NAME>
 <!--48D556894CE54CF998DC97882E904CBD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--4D11E3A70650475381139522373CD191-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4D11E3A70650475381139522373CD191-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--4D11E3A70650475381139522373CD191-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.32880]]></STARTVERSION>
+<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.33164]]></STARTVERSION>
 <!--4D11E3A70650475381139522373CD191-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--4D11E3A70650475381139522373CD191-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--4D11E3A70650475381139522373CD191-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_DEPENDENT_MODULE_ID>
-<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.32880]]></STARTVERSION>
+<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.33164]]></STARTVERSION>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <DEPENDANT_MODULE_NAME><![CDATA[Payment Report]]></DEPENDANT_MODULE_NAME>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--60834727BB114764ACEF019F40A34562-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--60834727BB114764ACEF019F40A34562-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--60834727BB114764ACEF019F40A34562-->  <AD_DEPENDENT_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_DEPENDENT_MODULE_ID>
-<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.32880]]></STARTVERSION>
+<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.33164]]></STARTVERSION>
 <!--60834727BB114764ACEF019F40A34562-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--60834727BB114764ACEF019F40A34562-->  <DEPENDANT_MODULE_NAME><![CDATA[Orders Awaiting Delivery]]></DEPENDANT_MODULE_NAME>
 <!--60834727BB114764ACEF019F40A34562-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--8418885E97D643138B6D907671351E3D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8418885E97D643138B6D907671351E3D-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--8418885E97D643138B6D907671351E3D-->  <AD_DEPENDENT_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_DEPENDENT_MODULE_ID>
-<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.32880]]></STARTVERSION>
+<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.33164]]></STARTVERSION>
 <!--8418885E97D643138B6D907671351E3D-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--8418885E97D643138B6D907671351E3D-->  <DEPENDANT_MODULE_NAME><![CDATA[Standard Roles]]></DEPENDANT_MODULE_NAME>
 <!--8418885E97D643138B6D907671351E3D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -77,7 +77,7 @@
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.32880]]></STARTVERSION>
+<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.33164]]></STARTVERSION>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MINOR]]></DEPENDENCY_ENFORCEMENT>
@@ -91,7 +91,7 @@
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.32880]]></STARTVERSION>
+<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.33164]]></STARTVERSION>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -105,7 +105,7 @@
 <!--FEF6E40F244A4061B7C62CB755663712-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <AD_DEPENDENT_MODULE_ID><![CDATA[8A34B301DC524EA3A07513DF9F42CC90]]></AD_DEPENDENT_MODULE_ID>
-<!--FEF6E40F244A4061B7C62CB755663712-->  <STARTVERSION><![CDATA[1.0.32880]]></STARTVERSION>
+<!--FEF6E40F244A4061B7C62CB755663712-->  <STARTVERSION><![CDATA[1.0.33164]]></STARTVERSION>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <DEPENDANT_MODULE_NAME><![CDATA[Log Clean Up Utility]]></DEPENDANT_MODULE_NAME>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -119,7 +119,7 @@
 <!--FF8080813189932B013189B45B59003A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813189932B013189B45B59003A-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FF8080813189932B013189B45B59003A-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.32880]]></STARTVERSION>
+<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.33164]]></STARTVERSION>
 <!--FF8080813189932B013189B45B59003A-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8080813189932B013189B45B59003A-->  <DEPENDANT_MODULE_NAME><![CDATA[OpenID Service Integration]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813189932B013189B45B59003A-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -133,7 +133,7 @@
 <!--FF8080813189932B013189B4C00F003D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813189932B013189B4C00F003D-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FF8080813189932B013189B4C00F003D-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.32880]]></STARTVERSION>
+<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.33164]]></STARTVERSION>
 <!--FF8080813189932B013189B4C00F003D-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8080813189932B013189B4C00F003D-->  <DEPENDANT_MODULE_NAME><![CDATA[Integration with Google APIs]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813189932B013189B4C00F003D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -147,7 +147,7 @@
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.32880]]></STARTVERSION>
+<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.33164]]></STARTVERSION>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDANT_MODULE_NAME><![CDATA[Widgets Collection]]></DEPENDANT_MODULE_NAME>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/referencedata/sampledata/F_B_International_Group/AD_PROCESS_ACCESS.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/referencedata/sampledata/F_B_International_Group/AD_PROCESS_ACCESS.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -4467,20 +4467,6 @@
 </AD_PROCESS_ACCESS>
 
 <AD_PROCESS_ACCESS>
-  <AD_PROCESS_ACCESS_ID><![CDATA[1794B7C53C6D4E29B8240B44A14A8EE8]]></AD_PROCESS_ACCESS_ID>
-  <AD_PROCESS_ID><![CDATA[800165]]></AD_PROCESS_ID>
-  <AD_ROLE_ID><![CDATA[6DCC4F942CE944F997596B9EA51A4FEB]]></AD_ROLE_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:47.981]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:47.981]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
-</AD_PROCESS_ACCESS>
-
-<AD_PROCESS_ACCESS>
   <AD_PROCESS_ACCESS_ID><![CDATA[17B3D09464BD4D468583256F15F28980]]></AD_PROCESS_ACCESS_ID>
   <AD_PROCESS_ID><![CDATA[800023]]></AD_PROCESS_ID>
   <AD_ROLE_ID><![CDATA[9A2D4EC760704A79BAFF8FF244FE0273]]></AD_ROLE_ID>
@@ -6147,20 +6133,6 @@
 </AD_PROCESS_ACCESS>
 
 <AD_PROCESS_ACCESS>
-  <AD_PROCESS_ACCESS_ID><![CDATA[1FBD3F15886C456B8F74090BFCCB15B6]]></AD_PROCESS_ACCESS_ID>
-  <AD_PROCESS_ID><![CDATA[800165]]></AD_PROCESS_ID>
-  <AD_ROLE_ID><![CDATA[0D4689364DDB473BB3023E4E554C8762]]></AD_ROLE_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:47.976]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:47.976]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
-</AD_PROCESS_ACCESS>
-
-<AD_PROCESS_ACCESS>
   <AD_PROCESS_ACCESS_ID><![CDATA[1FE0F0200DA649939A8A25357E2E77D0]]></AD_PROCESS_ACCESS_ID>
   <AD_PROCESS_ID><![CDATA[800046]]></AD_PROCESS_ID>
   <AD_ROLE_ID><![CDATA[F3196A30B53A42778727B2852FF90C24]]></AD_ROLE_ID>
@@ -6441,20 +6413,6 @@
 </AD_PROCESS_ACCESS>
 
 <AD_PROCESS_ACCESS>
-  <AD_PROCESS_ACCESS_ID><![CDATA[2165DF9DA6804D93A477B6656C9911C1]]></AD_PROCESS_ACCESS_ID>
-  <AD_PROCESS_ID><![CDATA[800165]]></AD_PROCESS_ID>
-  <AD_ROLE_ID><![CDATA[E669860946664B24BD1AE1ACDF2F5FC3]]></AD_ROLE_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:47.975]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:47.975]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
-</AD_PROCESS_ACCESS>
-
-<AD_PROCESS_ACCESS>
   <AD_PROCESS_ACCESS_ID><![CDATA[21683F64286F47AB906A51BBB7EC7F45]]></AD_PROCESS_ACCESS_ID>
   <AD_PROCESS_ID><![CDATA[6FBD65B0FDB74D1AB07F0EADF18D48AE]]></AD_PROCESS_ID>
   <AD_ROLE_ID><![CDATA[0D4689364DDB473BB3023E4E554C8762]]></AD_ROLE_ID>
@@ -9591,20 +9549,6 @@
 </AD_PROCESS_ACCESS>
 
 <AD_PROCESS_ACCESS>
-  <AD_PROCESS_ACCESS_ID><![CDATA[34A4B7DC81934DA9A89F9DDD61136AF7]]></AD_PROCESS_ACCESS_ID>
-  <AD_PROCESS_ID><![CDATA[800165]]></AD_PROCESS_ID>
-  <AD_ROLE_ID><![CDATA[42D0EEB1C66F497A90DD526DC597E6F0]]></AD_ROLE_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:47.966]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:47.966]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
-</AD_PROCESS_ACCESS>
-
-<AD_PROCESS_ACCESS>
   <AD_PROCESS_ACCESS_ID><![CDATA[34EC756B973243D396E7CF74090F6885]]></AD_PROCESS_ACCESS_ID>
   <AD_PROCESS_ID><![CDATA[192]]></AD_PROCESS_ID>
   <AD_ROLE_ID><![CDATA[1CAE17A7848D4F0BAAF21FEB17045B88]]></AD_ROLE_ID>
@@ -14561,20 +14505,6 @@
 </AD_PROCESS_ACCESS>
 
 <AD_PROCESS_ACCESS>
-  <AD_PROCESS_ACCESS_ID><![CDATA[511E03A6ED4044D58759083E5B7C6DC2]]></AD_PROCESS_ACCESS_ID>
-  <AD_PROCESS_ID><![CDATA[800165]]></AD_PROCESS_ID>
-  <AD_ROLE_ID><![CDATA[8CB7726D1DCD435FAF7D1654C9560F81]]></AD_ROLE_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:47.951]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:47.951]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
-</AD_PROCESS_ACCESS>
-
-<AD_PROCESS_ACCESS>
   <AD_PROCESS_ACCESS_ID><![CDATA[5124EC157B6D43D48E1B7C24B1B5F7B4]]></AD_PROCESS_ACCESS_ID>
   <AD_PROCESS_ID><![CDATA[800036]]></AD_PROCESS_ID>
   <AD_ROLE_ID><![CDATA[F77D70601AD549B19DE47965F6D48D12]]></AD_ROLE_ID>
@@ -14715,20 +14645,6 @@
 </AD_PROCESS_ACCESS>
 
 <AD_PROCESS_ACCESS>
-  <AD_PROCESS_ACCESS_ID><![CDATA[520ADCCE78A54CBFA26186902EF8AE93]]></AD_PROCESS_ACCESS_ID>
-  <AD_PROCESS_ID><![CDATA[800165]]></AD_PROCESS_ID>
-  <AD_ROLE_ID><![CDATA[45C861D70874409D86AE1CC7007AB43A]]></AD_ROLE_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:47.951]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:47.951]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
-</AD_PROCESS_ACCESS>
-
-<AD_PROCESS_ACCESS>
   <AD_PROCESS_ACCESS_ID><![CDATA[521928B43A2F47859E504E6E12D84C00]]></AD_PROCESS_ACCESS_ID>
   <AD_PROCESS_ID><![CDATA[B54318B49E984B9CB855AEFB1F474CD6]]></AD_PROCESS_ID>
   <AD_ROLE_ID><![CDATA[0D4689364DDB473BB3023E4E554C8762]]></AD_ROLE_ID>
@@ -18803,20 +18719,6 @@
 </AD_PROCESS_ACCESS>
 
 <AD_PROCESS_ACCESS>
-  <AD_PROCESS_ACCESS_ID><![CDATA[69A090AC71E3488DA06E68055B28131B]]></AD_PROCESS_ACCESS_ID>
-  <AD_PROCESS_ID><![CDATA[800165]]></AD_PROCESS_ID>
-  <AD_ROLE_ID><![CDATA[DB6660F6713A4DCFA320A502B4A0E670]]></AD_ROLE_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:47.938]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:47.938]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
-</AD_PROCESS_ACCESS>
-
-<AD_PROCESS_ACCESS>
   <AD_PROCESS_ACCESS_ID><![CDATA[69C5B3F7C2D147FF8122052DAA1416C5]]></AD_PROCESS_ACCESS_ID>
   <AD_PROCESS_ID><![CDATA[FF80818132C964E30132C9747257002E]]></AD_PROCESS_ID>
   <AD_ROLE_ID><![CDATA[8CB7726D1DCD435FAF7D1654C9560F81]]></AD_ROLE_ID>
@@ -23843,20 +23745,6 @@
 </AD_PROCESS_ACCESS>
 
 <AD_PROCESS_ACCESS>
-  <AD_PROCESS_ACCESS_ID><![CDATA[86C8B7F3182243C58F257E73AA615D63]]></AD_PROCESS_ACCESS_ID>
-  <AD_PROCESS_ID><![CDATA[800165]]></AD_PROCESS_ID>
-  <AD_ROLE_ID><![CDATA[F77D70601AD549B19DE47965F6D48D12]]></AD_ROLE_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:47.922]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:47.922]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
-</AD_PROCESS_ACCESS>
-
-<AD_PROCESS_ACCESS>
   <AD_PROCESS_ACCESS_ID><![CDATA[86DA133DD74943A5AF7941E0AFDED7E7]]></AD_PROCESS_ACCESS_ID>
   <AD_PROCESS_ID><![CDATA[800023]]></AD_PROCESS_ID>
   <AD_ROLE_ID><![CDATA[0D4689364DDB473BB3023E4E554C8762]]></AD_ROLE_ID>
@@ -26657,20 +26545,6 @@
 </AD_PROCESS_ACCESS>
 
 <AD_PROCESS_ACCESS>
-  <AD_PROCESS_ACCESS_ID><![CDATA[958119B0B1A1419BB20649025961DE90]]></AD_PROCESS_ACCESS_ID>
-  <AD_PROCESS_ID><![CDATA[800165]]></AD_PROCESS_ID>
-  <AD_ROLE_ID><![CDATA[9A2D4EC760704A79BAFF8FF244FE0273]]></AD_ROLE_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:47.914]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:47.914]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
-</AD_PROCESS_ACCESS>
-
-<AD_PROCESS_ACCESS>
   <AD_PROCESS_ACCESS_ID><![CDATA[9594CEEA255F4142BCAB3C061A62D614]]></AD_PROCESS_ACCESS_ID>
   <AD_PROCESS_ID><![CDATA[1004400002]]></AD_PROCESS_ID>
   <AD_ROLE_ID><![CDATA[F77D70601AD549B19DE47965F6D48D12]]></AD_ROLE_ID>
@@ -27329,20 +27203,6 @@
 </AD_PROCESS_ACCESS>
 
 <AD_PROCESS_ACCESS>
-  <AD_PROCESS_ACCESS_ID><![CDATA[98C51B93BC10421C808E3F87E5199C6E]]></AD_PROCESS_ACCESS_ID>
-  <AD_PROCESS_ID><![CDATA[800165]]></AD_PROCESS_ID>
-  <AD_ROLE_ID><![CDATA[332225C1B45C463984B8D14A3B4F15DF]]></AD_ROLE_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:47.912]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:47.912]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
-</AD_PROCESS_ACCESS>
-
-<AD_PROCESS_ACCESS>
   <AD_PROCESS_ACCESS_ID><![CDATA[98C6F124809540DD8FD334935429B74E]]></AD_PROCESS_ACCESS_ID>
   <AD_PROCESS_ID><![CDATA[69DFD737ACC74499A44574B046F8983C]]></AD_PROCESS_ID>
   <AD_ROLE_ID><![CDATA[42D0EEB1C66F497A90DD526DC597E6F0]]></AD_ROLE_ID>
@@ -30395,20 +30255,6 @@
 </AD_PROCESS_ACCESS>
 
 <AD_PROCESS_ACCESS>
-  <AD_PROCESS_ACCESS_ID><![CDATA[A908DEA864C84329A96E68EDEFDEFE49]]></AD_PROCESS_ACCESS_ID>
-  <AD_PROCESS_ID><![CDATA[800165]]></AD_PROCESS_ID>
-  <AD_ROLE_ID><![CDATA[C7E9112E632348F396B4967517E62805]]></AD_ROLE_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:47.902]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:47.902]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
-</AD_PROCESS_ACCESS>
-
-<AD_PROCESS_ACCESS>
   <AD_PROCESS_ACCESS_ID><![CDATA[A9150BF2C4C54589B3035CAA822628BA]]></AD_PROCESS_ACCESS_ID>
   <AD_PROCESS_ID><![CDATA[800184]]></AD_PROCESS_ID>
   <AD_ROLE_ID><![CDATA[42D0EEB1C66F497A90DD526DC597E6F0]]></AD_ROLE_ID>
@@ -32565,20 +32411,6 @@
 </AD_PROCESS_ACCESS>
 
 <AD_PROCESS_ACCESS>
-  <AD_PROCESS_ACCESS_ID><![CDATA[B4F75DAB62D74C73874484E74D371246]]></AD_PROCESS_ACCESS_ID>
-  <AD_PROCESS_ID><![CDATA[800165]]></AD_PROCESS_ID>
-  <AD_ROLE_ID><![CDATA[E03ED4A0056340678C3D6A3BA183F941]]></AD_ROLE_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:47.895]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:47.895]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
-</AD_PROCESS_ACCESS>
-
-<AD_PROCESS_ACCESS>
   <AD_PROCESS_ACCESS_ID><![CDATA[B4FA45CFFDA7462B975C8F7765086B9E]]></AD_PROCESS_ACCESS_ID>
   <AD_PROCESS_ID><![CDATA[800091]]></AD_PROCESS_ID>
   <AD_ROLE_ID><![CDATA[6DCC4F942CE944F997596B9EA51A4FEB]]></AD_ROLE_ID>
@@ -33069,20 +32901,6 @@
 </AD_PROCESS_ACCESS>
 
 <AD_PROCESS_ACCESS>
-  <AD_PROCESS_ACCESS_ID><![CDATA[B83F3C3651CC4AC79D395BCDE0BA551E]]></AD_PROCESS_ACCESS_ID>
-  <AD_PROCESS_ID><![CDATA[800165]]></AD_PROCESS_ID>
-  <AD_ROLE_ID><![CDATA[F3196A30B53A42778727B2852FF90C24]]></AD_ROLE_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:47.894]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:47.894]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
-</AD_PROCESS_ACCESS>
-
-<AD_PROCESS_ACCESS>
   <AD_PROCESS_ACCESS_ID><![CDATA[B864AC74A30645D5B71476621CCCFFB5]]></AD_PROCESS_ACCESS_ID>
   <AD_PROCESS_ID><![CDATA[800133]]></AD_PROCESS_ID>
   <AD_ROLE_ID><![CDATA[0D4689364DDB473BB3023E4E554C8762]]></AD_ROLE_ID>
@@ -44633,20 +44451,6 @@
 </AD_PROCESS_ACCESS>
 
 <AD_PROCESS_ACCESS>
-  <AD_PROCESS_ACCESS_ID><![CDATA[FC4441D83D9E45F890E02258119C6798]]></AD_PROCESS_ACCESS_ID>
-  <AD_PROCESS_ID><![CDATA[800165]]></AD_PROCESS_ID>
-  <AD_ROLE_ID><![CDATA[1CAE17A7848D4F0BAAF21FEB17045B88]]></AD_ROLE_ID>
-  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2013-07-04 23:45:47.85]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:47.85]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
-</AD_PROCESS_ACCESS>
-
-<AD_PROCESS_ACCESS>
   <AD_PROCESS_ACCESS_ID><![CDATA[FC5DADB24943487BBC1C0EBD55F23DF4]]></AD_PROCESS_ACCESS_ID>
   <AD_PROCESS_ID><![CDATA[7CB6B4D1ECCF4036B3F111D2CF11AADE]]></AD_PROCESS_ID>
   <AD_ROLE_ID><![CDATA[42D0EEB1C66F497A90DD526DC597E6F0]]></AD_ROLE_ID>
--- a/referencedata/sampledata/F_B_International_Group/AD_PROCESS_REQUEST.xml	Thu Feb 15 12:47:07 2018 +0000
+++ b/referencedata/sampledata/F_B_International_Group/AD_PROCESS_REQUEST.xml	Tue Feb 20 05:47:07 2018 +0000
@@ -91,6 +91,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[012C683EB2DF43C58688B8EEC49AD0C1]]></AD_PROCESS_REQUEST_ID>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2017-12-15 00:25:29.908195]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2017-12-15 00:25:29.908195]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_PROCESS_ID><![CDATA[5BE14AA10165490A9ADEFB7532F7FA94]]></AD_PROCESS_ID>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <ISROLESECURITY><![CDATA[Y]]></ISROLESECURITY>
+  <OB_CONTEXT><![CDATA[{"org.openbravo.scheduling.ProcessContext":{"user":100,"role":"42D0EEB1C66F497A90DD526DC597E6F0","language":"en_US","theme":"ltr\/org.openbravo.userinterface.skin.250to300Comp\/250to300Comp","client":"23C59575B9CF467C9620760EB255B389","organization":"E443A31992CB4635AFCAEABE7183CE85","warehouse":"B2D40D8A5D644DD89E329DC297309055","command":"SAVE_BUTTONDocAction5BE14AA10165490A9ADEFB7532F7FA94","userClient":"'23C59575B9CF467C9620760EB255B389'","userOrganization":"'7BABA5FF80494CAFA54DEBD22EC46F01','2E60544D37534C0B89E765FE29BC0B43','19404EAD144C49A0AF37D54377CF452D','0','B843C30461EA4501935CB1D125C9C25A','E443A31992CB4635AFCAEABE7183CE85','DC206C91AA6A4897B44DA897936E0EC3','BAE22373FEBE4CCCA24517E23F0C8A48'","dbSessionID":"6325592C30854367889A9350ABA23E81","javaDateFormat":"dd-MM-yyyy","javaDateTimeFormat":"dd-MM-yyyy HH:mm:ss","jsDateFormat":"%d-%m-%Y","sqlDateFormat":"DD-MM-YYYY","accessLevel":1,"roleSecurity":true}}]]></OB_CONTEXT>
+  <STATUS><![CDATA[COM]]></STATUS>
+  <CHANNEL><![CDATA[Direct]]></CHANNEL>
+  <ISGROUP><![CDATA[N]]></ISGROUP>
+</AD_PROCESS_REQUEST>
+
+<AD_PROCESS_REQUEST>
   <AD_PROCESS_REQUEST_ID><![CDATA[012D07845ACD41B585F222F5449A685B]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -235,6 +253,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[020C0E55BC5F42109BB79DC48FE26ADD]]></AD_PROCESS_REQUEST_ID>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2017-12-15 00:08:20.53634]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2017-12-15 00:08:20.53634]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_PROCESS_ID><![CDATA[154]]></AD_PROCESS_ID>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <ISROLESECURITY><![CDATA[Y]]></ISROLESECURITY>
+  <OB_CONTEXT><![CDATA[{"org.openbravo.scheduling.ProcessContext":{"user":100,"role":"42D0EEB1C66F497A90DD526DC597E6F0","language":"en_US","theme":"ltr\/org.openbravo.userinterface.skin.250to300Comp\/250to300Comp","client":"23C59575B9CF467C9620760EB255B389","organization":"E443A31992CB4635AFCAEABE7183CE85","warehouse":"B2D40D8A5D644DD89E329DC297309055","command":"SAVE_BUTTONGenerateTo154","userClient":"'23C59575B9CF467C9620760EB255B389'","userOrganization":"'7BABA5FF80494CAFA54DEBD22EC46F01','2E60544D37534C0B89E765FE29BC0B43','19404EAD144C49A0AF37D54377CF452D','0','B843C30461EA4501935CB1D125C9C25A','E443A31992CB4635AFCAEABE7183CE85','DC206C91AA6A4897B44DA897936E0EC3','BAE22373FEBE4CCCA24517E23F0C8A48'","dbSessionID":"6325592C30854367889A9350ABA23E81","javaDateFormat":"dd-MM-yyyy","javaDateTimeFormat":"dd-MM-yyyy HH:mm:ss","jsDateFormat":"%d-%m-%Y","sqlDateFormat":"DD-MM-YYYY","accessLevel":1,"roleSecurity":true}}]]></OB_CONTEXT>
+  <STATUS><![CDATA[COM]]></STATUS>
+  <CHANNEL><![CDATA[Direct]]></CHANNEL>
+  <ISGROUP><![CDATA[N]]></ISGROUP>
+</AD_PROCESS_REQUEST>
+
+<AD_PROCESS_REQUEST>
   <AD_PROCESS_REQUEST_ID><![CDATA[021B9D76F8A54617852B542D5711DEFD]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -1135,6 +1171,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[07A49B67F75D4EB7A163533D46A83F68]]></AD_PROCESS_REQUEST_ID>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2017-12-15 01:25:21.111553]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2017-12-15 01:25:21.111553]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_PROCESS_ID><![CDATA[5BE14AA10165490A9ADEFB7532F7FA94]]></AD_PROCESS_ID>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <ISROLESECURITY><![CDATA[Y]]></ISROLESECURITY>
+  <OB_CONTEXT><![CDATA[{"org.openbravo.scheduling.ProcessContext":{"user":100,"role":"42D0EEB1C66F497A90DD526DC597E6F0","language":"en_US","theme":"ltr\/org.openbravo.userinterface.skin.250to300Comp\/250to300Comp","client":"23C59575B9CF467C9620760EB255B389","organization":"E443A31992CB4635AFCAEABE7183CE85","warehouse":"B2D40D8A5D644DD89E329DC297309055","command":"SAVE_BUTTONDocAction5BE14AA10165490A9ADEFB7532F7FA94","userClient":"'23C59575B9CF467C9620760EB255B389'","userOrganization":"'7BABA5FF80494CAFA54DEBD22EC46F01','2E60544D37534C0B89E765FE29BC0B43','19404EAD144C49A0AF37D54377CF452D','0','B843C30461EA4501935CB1D125C9C25A','E443A31992CB4635AFCAEABE7183CE85','DC206C91AA6A4897B44DA897936E0EC3','BAE22373FEBE4CCCA24517E23F0C8A48'","dbSessionID":"6325592C30854367889A9350ABA23E81","javaDateFormat":"dd-MM-yyyy","javaDateTimeFormat":"dd-MM-yyyy HH:mm:ss","jsDateFormat":"%d-%m-%Y","sqlDateFormat":"DD-MM-YYYY","accessLevel":1,"roleSecurity":true}}]]></OB_CONTEXT>
+  <STATUS><![CDATA[COM]]></STATUS>
+  <CHANNEL><![CDATA[Direct]]></CHANNEL>
+  <ISGROUP><![CDATA[N]]></ISGROUP>
+</AD_PROCESS_REQUEST>
+
+<AD_PROCESS_REQUEST>
   <AD_PROCESS_REQUEST_ID><![CDATA[07C51C6A67134790A78B08CD51521CA5]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -1711,6 +1765,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[0B06B526B96643059D4B4EA774FF949A]]></AD_PROCESS_REQUEST_ID>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2017-12-15 00:20:35.353098]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2017-12-15 00:20:35.353098]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_PROCESS_ID><![CDATA[F68F2890E96D4D85A1DEF0274D105BCE]]></AD_PROCESS_ID>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <ISROLESECURITY><![CDATA[Y]]></ISROLESECURITY>
+  <OB_CONTEXT><![CDATA[{"org.openbravo.scheduling.ProcessContext":{"user":100,"role":"42D0EEB1C66F497A90DD526DC597E6F0","language":"en_US","theme":"ltr\/org.openbravo.userinterface.skin.250to300Comp\/250to300Comp","client":"23C59575B9CF467C9620760EB255B389","organization":"E443A31992CB4635AFCAEABE7183CE85","warehouse":"B2D40D8A5D644DD89E329DC297309055","command":"SAVE_BUTTONEM_Aprm_ProcessedF68F2890E96D4D85A1DEF0274D105BCE","userClient":"'23C59575B9CF467C9620760EB255B389'","userOrganization":"'7BABA5FF80494CAFA54DEBD22EC46F01','2E60544D37534C0B89E765FE29BC0B43','19404EAD144C49A0AF37D54377CF452D','0','B843C30461EA4501935CB1D125C9C25A','E443A31992CB4635AFCAEABE7183CE85','DC206C91AA6A4897B44DA897936E0EC3','BAE22373FEBE4CCCA24517E23F0C8A48'","dbSessionID":"6325592C30854367889A9350ABA23E81","javaDateFormat":"dd-MM-yyyy","javaDateTimeFormat":"dd-MM-yyyy HH:mm:ss","jsDateFormat":"%d-%m-%Y","sqlDateFormat":"DD-MM-YYYY","accessLevel":1,"roleSecurity":true}}]]></OB_CONTEXT>
+  <STATUS><![CDATA[COM]]></STATUS>
+  <CHANNEL><![CDATA[Direct]]></CHANNEL>
+  <ISGROUP><![CDATA[N]]></ISGROUP>
+</AD_PROCESS_REQUEST>
+
+<AD_PROCESS_REQUEST>
   <AD_PROCESS_REQUEST_ID><![CDATA[0B2BFCD1627C49A1A3816CFF854C8AD1]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -1801,6 +1873,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[0BF33171D66B45058E9631A67C065059]]></AD_PROCESS_REQUEST_ID>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2017-12-15 02:19:43.152445]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2017-12-15 02:19:43.152445]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <ISROLESECURITY><![CDATA[Y]]></ISROLESECURITY>
+  <OB_CONTEXT><![CDATA[{"org.openbravo.scheduling.ProcessContext":{"user":100,"role":"42D0EEB1C66F497A90DD526DC597E6F0","language":"en_US","theme":"ltr\/org.openbravo.userinterface.skin.250to300Comp\/250to300Comp","client":"23C59575B9CF467C9620760EB255B389","organization":"E443A31992CB4635AFCAEABE7183CE85","warehouse":"B2D40D8A5D644DD89E329DC297309055","command":"SAVE_BUTTONDocAction104","userClient":"'23C59575B9CF467C9620760EB255B389'","userOrganization":"'7BABA5FF80494CAFA54DEBD22EC46F01','2E60544D37534C0B89E765FE29BC0B43','19404EAD144C49A0AF37D54377CF452D','0','B843C30461EA4501935CB1D125C9C25A','E443A31992CB4635AFCAEABE7183CE85','DC206C91AA6A4897B44DA897936E0EC3','BAE22373FEBE4CCCA24517E23F0C8A48'","dbSessionID":"1FFF34CA5E944A90BC171D65E34FA078","javaDateFormat":"dd-MM-yyyy","javaDateTimeFormat":"dd-MM-yyyy HH:mm:ss","jsDateFormat":"%d-%m-%Y","sqlDateFormat":"DD-MM-YYYY","accessLevel":1,"roleSecurity":true}}]]></OB_CONTEXT>
+  <STATUS><![CDATA[COM]]></STATUS>
+  <CHANNEL><![CDATA[Direct]]></CHANNEL>
+  <ISGROUP><![CDATA[N]]></ISGROUP>
+</AD_PROCESS_REQUEST>
+
+<AD_PROCESS_REQUEST>
   <AD_PROCESS_REQUEST_ID><![CDATA[0C1C3063916740679813CEBD1611D7C0]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -1945,6 +2035,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[0CCC5D4591C34F2B965BD09CC94FAD87]]></AD_PROCESS_REQUEST_ID>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2017-12-15 00:08:23.492007]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2017-12-15 00:08:23.492007]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_PROCESS_ID><![CDATA[154]]></AD_PROCESS_ID>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <ISROLESECURITY><![CDATA[Y]]></ISROLESECURITY>
+  <OB_CONTEXT><![CDATA[{"org.openbravo.scheduling.ProcessContext":{"user":100,"role":"42D0EEB1C66F497A90DD526DC597E6F0","language":"en_US","theme":"ltr\/org.openbravo.userinterface.skin.250to300Comp\/250to300Comp","client":"23C59575B9CF467C9620760EB255B389","organization":"E443A31992CB4635AFCAEABE7183CE85","warehouse":"B2D40D8A5D644DD89E329DC297309055","command":"SAVE_BUTTONGenerateTo154","userClient":"'23C59575B9CF467C9620760EB255B389'","userOrganization":"'7BABA5FF80494CAFA54DEBD22EC46F01','2E60544D37534C0B89E765FE29BC0B43','19404EAD144C49A0AF37D54377CF452D','0','B843C30461EA4501935CB1D125C9C25A','E443A31992CB4635AFCAEABE7183CE85','DC206C91AA6A4897B44DA897936E0EC3','BAE22373FEBE4CCCA24517E23F0C8A48'","dbSessionID":"6325592C30854367889A9350ABA23E81","javaDateFormat":"dd-MM-yyyy","javaDateTimeFormat":"dd-MM-yyyy HH:mm:ss","jsDateFormat":"%d-%m-%Y","sqlDateFormat":"DD-MM-YYYY","accessLevel":1,"roleSecurity":true}}]]></OB_CONTEXT>
+  <STATUS><![CDATA[COM]]></STATUS>
+  <CHANNEL><![CDATA[Direct]]></CHANNEL>
+  <ISGROUP><![CDATA[N]]></ISGROUP>
+</AD_PROCESS_REQUEST>
+
+<AD_PROCESS_REQUEST>
   <AD_PROCESS_REQUEST_ID><![CDATA[0CECBDF74ED3441091003FDFF0102E89]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -2269,6 +2377,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[0DF13CDC5DBC4670905CC47B0B94F270]]></AD_PROCESS_REQUEST_ID>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2017-12-15 01:02:04.822249]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2017-12-15 01:02:04.822249]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_PROCESS_ID><![CDATA[154]]></AD_PROCESS_ID>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <ISROLESECURITY><![CDATA[Y]]></ISROLESECURITY>
+  <OB_CONTEXT><![CDATA[{"org.openbravo.scheduling.ProcessContext":{"user":100,"role":"42D0EEB1C66F497A90DD526DC597E6F0","language":"en_US","theme":"ltr\/org.openbravo.userinterface.skin.250to300Comp\/250to300Comp","client":"23C59575B9CF467C9620760EB255B389","organization":"E443A31992CB4635AFCAEABE7183CE85","warehouse":"B2D40D8A5D644DD89E329DC297309055","command":"SAVE_BUTTONGenerateTo154","userClient":"'23C59575B9CF467C9620760EB255B389'","userOrganization":"'7BABA5FF80494CAFA54DEBD22EC46F01','2E60544D37534C0B89E765FE29BC0B43','19404EAD144C49A0AF37D54377CF452D','0','B843C30461EA4501935CB1D125C9C25A','E443A31992CB4635AFCAEABE7183CE85','DC206C91AA6A4897B44DA897936E0EC3','BAE22373FEBE4CCCA24517E23F0C8A48'","dbSessionID":"6325592C30854367889A9350ABA23E81","javaDateFormat":"dd-MM-yyyy","javaDateTimeFormat":"dd-MM-yyyy HH:mm:ss","jsDateFormat":"%d-%m-%Y","sqlDateFormat":"DD-MM-YYYY","accessLevel":1,"roleSecurity":true}}]]></OB_CONTEXT>
+  <STATUS><![CDATA[COM]]></STATUS>
+  <CHANNEL><![CDATA[Direct]]></CHANNEL>
+  <ISGROUP><![CDATA[N]]></ISGROUP>
+</AD_PROCESS_REQUEST>
+
+<AD_PROCESS_REQUEST>
   <AD_PROCESS_REQUEST_ID><![CDATA[0E07BB8A2B714A8680010BFA9295A6DE]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -2647,6 +2773,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[11ACC65497664E59ABE04567CD12FE12]]></AD_PROCESS_REQUEST_ID>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2017-12-15 00:43:02.656444]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2017-12-15 00:43:02.656444]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <ISROLESECURITY><![CDATA[Y]]></ISROLESECURITY>
+  <OB_CONTEXT><![CDATA[{"org.openbravo.scheduling.ProcessContext":{"user":100,"role":"42D0EEB1C66F497A90DD526DC597E6F0","language":"en_US","theme":"ltr\/org.openbravo.userinterface.skin.250to300Comp\/250to300Comp","client":"23C59575B9CF467C9620760EB255B389","organization":"E443A31992CB4635AFCAEABE7183CE85","warehouse":"B2D40D8A5D644DD89E329DC297309055","command":"SAVE_BUTTONDocAction104","userClient":"'23C59575B9CF467C9620760EB255B389'","userOrganization":"'7BABA5FF80494CAFA54DEBD22EC46F01','2E60544D37534C0B89E765FE29BC0B43','19404EAD144C49A0AF37D54377CF452D','0','B843C30461EA4501935CB1D125C9C25A','E443A31992CB4635AFCAEABE7183CE85','DC206C91AA6A4897B44DA897936E0EC3','BAE22373FEBE4CCCA24517E23F0C8A48'","dbSessionID":"6325592C30854367889A9350ABA23E81","javaDateFormat":"dd-MM-yyyy","javaDateTimeFormat":"dd-MM-yyyy HH:mm:ss","jsDateFormat":"%d-%m-%Y","sqlDateFormat":"DD-MM-YYYY","accessLevel":1,"roleSecurity":true}}]]></OB_CONTEXT>
+  <STATUS><![CDATA[COM]]></STATUS>
+  <CHANNEL><![CDATA[Direct]]></CHANNEL>
+  <ISGROUP><![CDATA[N]]></ISGROUP>
+</AD_PROCESS_REQUEST>
+
+<AD_PROCESS_REQUEST>
   <AD_PROCESS_REQUEST_ID><![CDATA[11C64DF904624E379A6CBC21F6C0764D]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -3025,6 +3169,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[1448D3DEB6E14F628EF32F63265F3154]]></AD_PROCESS_REQUEST_ID>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2017-12-15 02:44:56.993201]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2017-12-15 02:44:56.993201]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <ISROLESECURITY><![CDATA[Y]]></ISROLESECURITY>
+  <OB_CONTEXT><![CDATA[{"org.openbravo.scheduling.ProcessContext":{"user":100,"role":"42D0EEB1C66F497A90DD526DC597E6F0","language":"en_US","theme":"ltr\/org.openbravo.userinterface.skin.250to300Comp\/250to300Comp","client":"23C59575B9CF467C9620760EB255B389","organization":"E443A31992CB4635AFCAEABE7183CE85","warehouse":"B2D40D8A5D644DD89E329DC297309055","command":"SAVE_BUTTONDocAction104","userClient":"'23C59575B9CF467C9620760EB255B389'","userOrganization":"'7BABA5FF80494CAFA54DEBD22EC46F01','2E60544D37534C0B89E765FE29BC0B43','19404EAD144C49A0AF37D54377CF452D','0','B843C30461EA4501935CB1D125C9C25A','E443A31992CB4635AFCAEABE7183CE85','DC206C91AA6A4897B44DA897936E0EC3','BAE22373FEBE4CCCA24517E23F0C8A48'","dbSessionID":"1FFF34CA5E944A90BC171D65E34FA078","javaDateFormat":"dd-MM-yyyy","javaDateTimeFormat":"dd-MM-yyyy HH:mm:ss","jsDateFormat":"%d-%m-%Y","sqlDateFormat":"DD-MM-YYYY","accessLevel":1,"roleSecurity":true}}]]></OB_CONTEXT>
+  <STATUS><![CDATA[COM]]></STATUS>
+  <CHANNEL><![CDATA[Direct]]></CHANNEL>
+  <ISGROUP><![CDATA[N]]></ISGROUP>
+</AD_PROCESS_REQUEST>
+
+<AD_PROCESS_REQUEST>
   <AD_PROCESS_REQUEST_ID><![CDATA[1455E32034D24CA5BDD07F75065F5FCE]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
@@ -3421,6 +3583,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[16FD65F37C444A979F70EAF75250B336]]></AD_PROCESS_REQUEST_ID>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2017-12-14 23:50:23.708502]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2017-12-14 23:50:23.708502]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <ISROLESECURITY><![CDATA[Y]]></ISROLESECURITY>
+  <OB_CONTEXT><![CDATA[{"org.openbravo.scheduling.ProcessContext":{"user":100,"role":"42D0EEB1C66F497A90DD526DC597E6F0","language":"en_US","theme":"ltr\/org.openbravo.userinterface.skin.250to300Comp\/250to300Comp","client":"23C59575B9CF467C9620760EB255B389","organization":"E443A31992CB4635AFCAEABE7183CE85","warehouse":"B2D40D8A5D644DD89E329DC297309055","command":"SAVE_BUTTONDocAction104","userClient":"'23C59575B9CF467C9620760EB255B389'","userOrganization":"'7BABA5FF80494CAFA54DEBD22EC46F01','2E60544D37534C0B89E765FE29BC0B43','19404EAD144C49A0AF37D54377CF452D','0','B843C30461EA4501935CB1D125C9C25A','E443A31992CB4635AFCAEABE7183CE85','DC206C91AA6A4897B44DA897936E0EC3','BAE22373FEBE4CCCA24517E23F0C8A48'","dbSessionID":"6325592C30854367889A9350ABA23E81","javaDateFormat":"dd-MM-yyyy","javaDateTimeFormat":"dd-MM-yyyy HH:mm:ss","jsDateFormat":"%d-%m-%Y","sqlDateFormat":"DD-MM-YYYY","accessLevel":1,"roleSecurity":true}}]]></OB_CONTEXT>
+  <STATUS><![CDATA[COM]]></STATUS>
+  <CHANNEL><![CDATA[Direct]]></CHANNEL>
+  <ISGROUP><![CDATA[N]]></ISGROUP>
+</AD_PROCESS_REQUEST>
+
+<AD_PROCESS_REQUEST>
   <AD_PROCESS_REQUEST_ID><![CDATA[173BB0905AA746B48F1A7E81C3E364F1]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -3745,6 +3925,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[1A881CAFE8C4403385CF7F36D77A5D18]]></AD_PROCESS_REQUEST_ID>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2017-12-15 03:10:36.732667]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2017-12-15 03:10:36.732667]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_PROCESS_ID><![CDATA[800134]]></AD_PROCESS_ID>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <ISROLESECURITY><![CDATA[Y]]></ISROLESECURITY>
+  <OB_CONTEXT><![CDATA[{"org.openbravo.scheduling.ProcessContext":{"user":100,"role":"42D0EEB1C66F497A90DD526DC597E6F0","language":"en_US","theme":"ltr\/org.openbravo.userinterface.skin.250to300Comp\/250to300Comp","client":"23C59575B9CF467C9620760EB255B389","organization":"E443A31992CB4635AFCAEABE7183CE85","warehouse":"B2D40D8A5D644DD89E329DC297309055","command":"SAVE_BUTTONProcessed800134","userClient":"'23C59575B9CF467C9620760EB255B389'","userOrganization":"'7BABA5FF80494CAFA54DEBD22EC46F01','2E60544D37534C0B89E765FE29BC0B43','19404EAD144C49A0AF37D54377CF452D','0','B843C30461EA4501935CB1D125C9C25A','E443A31992CB4635AFCAEABE7183CE85','DC206C91AA6A4897B44DA897936E0EC3','BAE22373FEBE4CCCA24517E23F0C8A48'","dbSessionID":"1FFF34CA5E944A90BC171D65E34FA078","javaDateFormat":"dd-MM-yyyy","javaDateTimeFormat":"dd-MM-yyyy HH:mm:ss","jsDateFormat":"%d-%m-%Y","sqlDateFormat":"DD-MM-YYYY","accessLevel":1,"roleSecurity":true}}]]></OB_CONTEXT>
+  <STATUS><![CDATA[COM]]></STATUS>
+  <CHANNEL><![CDATA[Direct]]></CHANNEL>
+  <ISGROUP><![CDATA[N]]></ISGROUP>
+</AD_PROCESS_REQUEST>
+
+<AD_PROCESS_REQUEST>
   <AD_PROCESS_REQUEST_ID><![CDATA[1AD3D2608F534454AB2E5B18B4D1C79B]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -3781,6 +3979,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[1AEDB06942404CDAA1A685F2E5D5DF30]]></AD_PROCESS_REQUEST_ID>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2017-12-15 02:45:06.254837]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2017-12-15 02:45:06.254837]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <ISROLESECURITY><![CDATA[Y]]></ISROLESECURITY>
+  <OB_CONTEXT><![CDATA[{"org.openbravo.scheduling.ProcessContext":{"user":100,"role":"42D0EEB1C66F497A90DD526DC597E6F0","language":"en_US","theme":"ltr\/org.openbravo.userinterface.skin.250to300Comp\/250to300Comp","client":"23C59575B9CF467C9620760EB255B389","organization":"E443A31992CB4635AFCAEABE7183CE85","warehouse":"B2D40D8A5D644DD89E329DC297309055","command":"SAVE_BUTTONDocAction104","userClient":"'23C59575B9CF467C9620760EB255B389'","userOrganization":"'7BABA5FF80494CAFA54DEBD22EC46F01','2E60544D37534C0B89E765FE29BC0B43','19404EAD144C49A0AF37D54377CF452D','0','B843C30461EA4501935CB1D125C9C25A','E443A31992CB4635AFCAEABE7183CE85','DC206C91AA6A4897B44DA897936E0EC3','BAE22373FEBE4CCCA24517E23F0C8A48'","dbSessionID":"1FFF34CA5E944A90BC171D65E34FA078","javaDateFormat":"dd-MM-yyyy","javaDateTimeFormat":"dd-MM-yyyy HH:mm:ss","jsDateFormat":"%d-%m-%Y","sqlDateFormat":"DD-MM-YYYY","accessLevel":1,"roleSecurity":true}}]]></OB_CONTEXT>
+  <STATUS><![CDATA[COM