Merge temporary head for 3.0PR18Q1.2
authorRM packaging bot <staff.rm@openbravo.com>
Tue, 24 Apr 2018 06:49:23 +0000
changeset 33860 915292301a97
parent 33769 ead4656f507e (diff)
parent 33859 b569a063cd93 (current diff)
child 33861 727d1d8c02ef
child 33935 84416a0203c9
Merge temporary head for 3.0PR18Q1.2
.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.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.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
src-db/database/sourcedata/AD_MODULE.xml
--- a/.hgsigs	Wed Apr 18 12:21:14 2018 +0000
+++ b/.hgsigs	Tue Apr 24 06:49:23 2018 +0000
@@ -222,5 +222,10 @@
 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
+f06ec509f2bf413f13d422e937ec12531fe1821a 0 iEYEABECAAYFAlqzgcwACgkQCX/oGf+2qkP/EACeJH+QthNIdldCdTvfnllHXTXDo24AnRVV1DveMhhNbgb50zu8ETDZ1WVT
+b90f619fc9f3f9ca6439969e99f742f9a9403f82 0 iEYEABECAAYFAlqMGfIACgkQCX/oGf+2qkPjiQCgyYNqJlbSOSoax5ydjqpJKun85RIAoM9s2iEyLfJ8CJyfUXFmz6FtvmqC
+c38ab6f55348fbb5963fd77b770f939a5c0eda23 0 iEYEABECAAYFAlq0lSgACgkQCX/oGf+2qkN3FwCgggZ7hoUQveeRYCuBBuHAi77v84gAn1RBjuscKhHjc7ouPvgiPgIVanBb
 9bad88c00b5da708f3e9c1abacd25ea6e6cfd664 0 iEUEABECAAYFAlrXODoACgkQCX/oGf+2qkOblACg0WOwH27TgkH75iKw2Y9tNYxSL8oAl3j0FbjQF6F05ESzZC0l3Uv2Nfg=
--- a/.hgtags	Wed Apr 18 12:21:14 2018 +0000
+++ b/.hgtags	Tue Apr 24 06:49:23 2018 +0000
@@ -233,5 +233,10 @@
 a8925ad2d61f4625aa62c1ee31babecaa73b787f 3.0PR17Q3
 452e6c576f1db52e686cf3138099790e242e7927 3.0PR17Q3.1
 f500d43a59bb69265a7aa704a9fd20bffd68c8a9 3.0PR17Q3.2
+dd65065492e55421c107be4c87894a508bb1244d 3.0PR17Q3.3
 a8b6912d30a34e4a7d0873fc0fe53df228417b49 3.0PR17Q4
+82be2c7d9d11d77238355e65724408b6c5aa2ffb 3.0PR17Q4.1
+7b0d4c95c2b308cd1b12dcfbe2a36c7f77fb49a4 3.0PR17Q4.2
+46184d2680e43a9b29d3058a75dea7d15d47b4b4 3.0PR18Q1
+03f6ac7d17926657b093b25f613a4cd3fb47ef65 3.0PR18Q1.1
 650aaadd6b6c5fda4f7ad957701face4fa4c3317 3.0PR18Q1.2
--- a/build.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/build.xml	Tue Apr 24 06:49:23 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) 2001-2017 Openbravo SLU
+* All portions are Copyright (C) 2001-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************
@@ -98,17 +98,8 @@
  
   <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 property="xdoclint.missing" value="" else="-Xdoclint:-missing">
+    <equals arg1="${ant.java.version}" arg2="1.7"/>
   </condition>
 
   <condition property="calculate.core.rev">
@@ -535,12 +526,7 @@
   </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">
+    <javadoc Windowtitle="${title}" access="protected" Header="${header}" Footer="${footer}" destdir="${build.docs}" maxmemory="1024M" failonerror="yes" additionalparam="${xdoclint.missing}">
       <sourcepath>
         <pathelement path="${base.src}" />
         <pathelement path="${base.src.test}/src" />
@@ -566,35 +552,6 @@
     </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>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/legal/CDDL-1.0.txt	Tue Apr 24 06:49:23 2018 +0000
@@ -0,0 +1,263 @@
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+
+1. Definitions.
+
+   1.1. Contributor. means each individual or entity that creates or contributes to the creation of Modifications.
+
+   1.2. Contributor Version. means the combination of the Original Software, prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor.
+
+   1.3. Covered Software. means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof.
+
+   1.4. Executable. means the Covered Software in any form other than Source Code.
+
+   1.5. Initial Developer. means the individual or entity that first makes Original Software available under this License.
+
+   1.6. Larger Work. means a work which combines Covered Software or portions thereof with code not governed by the terms of this License.
+
+   1.7. License. means this document.
+
+   1.8. Licensable. means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
+
+   1.9. Modifications. means the Source Code and Executable form of any of the following:
+
+        A. Any file that results from an addition to, deletion from or modification of the contents of a file containing Original Software or previous Modifications;
+
+        B. Any new file that contains any part of the Original Software or previous Modification; or
+
+        C. Any new file that is contributed or otherwise made available under the terms of this License.
+
+   1.10. Original Software. means the Source Code and Executable form of computer software code that is originally released under this License.
+
+   1.11. Patent Claims. means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor.
+
+   1.12. Source Code. means (a) the common form of computer software code in which modifications are made and (b) associated documentation included in or with such code.
+
+   1.13. You. (or .Your.) means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, .You. includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, .control. means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
+
+2. License Grants.
+
+      2.1. The Initial Developer Grant.
+
+      Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license:
+
+         (a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and
+
+         (b) under Patent Claims infringed by the making, using or selling of Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof).
+
+        (c) The licenses granted in Sections 2.1(a) and (b) are effective on the date Initial Developer first distributes or otherwise makes the Original Software available to a third party under the terms of this License.
+
+        (d) Notwithstanding Section 2.1(b) above, no patent license is granted: (1) for code that You delete from the Original Software, or (2) for infringements caused by: (i) the modification of the Original Software, or (ii) the combination of the Original Software with other software or devices.
+
+    2.2. Contributor Grant.
+
+    Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license:
+
+        (a) under intellectual property rights (other than patent or trademark) Licensable by Contributor to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof), either on an unmodified basis, with other Modifications, as Covered Software and/or as part of a Larger Work; and
+
+        (b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: (1) Modifications made by that Contributor (or portions thereof); and (2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination).
+
+        (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first distributes or otherwise makes the Modifications available to a third party.
+
+        (d) Notwithstanding Section 2.2(b) above, no patent license is granted: (1) for any code that Contributor has deleted from the Contributor Version; (2) for infringements caused by: (i) third party modifications of Contributor Version, or (ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or (3) under Patent Claims infringed by Covered Software in the absence of Modifications made by that Contributor.
+
+3. Distribution Obligations.
+
+      3.1. Availability of Source Code.
+      Any Covered Software that You distribute or otherwise make available in Executable form must also be made available in Source Code form and that Source Code form must be distributed only under the terms of this License. You must include a copy of this License with every copy of the Source Code form of the Covered Software You distribute or otherwise make available. You must inform recipients of any such Covered Software in Executable form as to how they can obtain such Covered Software in Source Code form in a reasonable manner on or through a medium customarily used for software exchange.
+
+      3.2. Modifications.
+      The Modifications that You create or to which You contribute are governed by the terms of this License. You represent that You believe Your Modifications are Your original creation(s) and/or You have sufficient rights to grant the rights conveyed by this License.
+
+      3.3. Required Notices.
+      You must include a notice in each of Your Modifications that identifies You as the Contributor of the Modification. You may not remove or alter any copyright, patent or trademark notices contained within the Covered Software, or any notices of licensing or any descriptive text giving attribution to any Contributor or the Initial Developer.
+
+      3.4. Application of Additional Terms.
+      You may not offer or impose any terms on any Covered Software in Source Code form that alters or restricts the applicable version of this License or the recipients. rights hereunder. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, you may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear that any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
+
+      3.5. Distribution of Executable Versions.
+      You may distribute the Executable form of the Covered Software under the terms of this License or under the terms of a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable form does not attempt to limit or alter the recipient.s rights in the Source Code form from the rights set forth in this License. If You distribute the Covered Software in Executable form under a different license, You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.
+
+      3.6. Larger Works.
+      You may create a Larger Work by combining Covered Software with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Software.
+
+4. Versions of the License.
+
+      4.1. New Versions.
+      Sun Microsystems, Inc. is the initial license steward and may publish revised and/or new versions of this License from time to time. Each version will be given a distinguishing version number. Except as provided in Section 4.3, no one other than the license steward has the right to modify this License.
+
+      4.2. Effect of New Versions.
+      You may always continue to use, distribute or otherwise make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. If the Initial Developer includes a notice in the Original Software prohibiting it from being distributed or otherwise made available under any subsequent version of the License, You must distribute and make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. Otherwise, You may also choose to use, distribute or otherwise make the Covered Software available under the terms of any subsequent version of the License published by the license steward.
+
+      4.3. Modified Versions.
+      When You are an Initial Developer and You want to create a new license for Your Original Software, You may create and use a modified version of this License if You: (a) rename the license and remove any references to the name of the license steward (except to note that the license differs from this License); and (b) otherwise make it clear that the license contains terms which differ from this License.
+
+5. DISCLAIMER OF WARRANTY.
+
+   COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN .AS IS. BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+6. TERMINATION.
+
+      6.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive.
+
+      6.2. If You assert a patent infringement claim (excluding declaratory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You assert such claim is referred to as .Participant.) alleging that the Participant Software (meaning the Contributor Version where the Participant is a Contributor or the Original Software where the Participant is the Initial Developer) directly or indirectly infringes any patent, then any and all rights granted directly or indirectly to You by such Participant, the Initial Developer (if the Initial Developer is not the Participant) and all Contributors under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively and automatically at the expiration of such 60 day notice period, unless if within such 60 day period You withdraw Your claim with respect to the Participant Software against such Participant either unilaterally or pursuant to a written agreement with Participant.
+
+      6.3. In the event of termination under Sections 6.1 or 6.2 above, all end user licenses that have been validly granted by You or any distributor hereunder prior to termination (excluding licenses granted to You by any distributor) shall survive termination.
+
+7. LIMITATION OF LIABILITY.
+
+   UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY.S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+8. U.S. GOVERNMENT END USERS.
+
+   The Covered Software is a .commercial item,. as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of .commercial computer software. (as that term is defined at 48 C.F.R. ? 252.227-7014(a)(1)) and .commercial computer software documentation. as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Software with only those rights set forth herein. This U.S. Government Rights clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or provision that addresses Government rights in computer software under this License.
+
+9. MISCELLANEOUS.
+
+   This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by the law of the jurisdiction specified in a notice contained within the Original Software (except to the extent applicable law, if any, provides otherwise), excluding such jurisdiction.s conflict-of-law provisions. Any litigation relating to this License shall be subject to the jurisdiction of the courts located in the jurisdiction and venue specified in a notice contained within the Original Software, with the losing party responsible for costs, including, without limitation, court costs and reasonable attorneys. fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. You agree that You alone are responsible for compliance with the United States export administration regulations (and the export control laws and regulation of any other countries) when You use, distribute or otherwise make available any Covered Software.
+
+10. RESPONSIBILITY FOR CLAIMS.
+
+   As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
+
+   NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
+
+   The code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California.
+
+
+The GNU General Public License (GPL) Version 2, June 1991
+
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification follow.
+
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
+
+   a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
+
+   b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
+
+   c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
+
+   a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+   b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+   c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
+
+   One line to give the program's name and a brief idea of what it does.
+
+   Copyright (C)
+
+   This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this when it starts in an interactive mode:
+
+   Gnomovision version 69, Copyright (C) year name of author
+   Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names:
+
+   Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+   signature of Ty Coon, 1 April 1989
+   Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License.
+
+
+"CLASSPATH" EXCEPTION TO THE GPL VERSION 2
+
+Certain source files distributed by Sun Microsystems, Inc. are subject to the following clarification and special exception to the GPL Version 2, but only where Sun has expressly included in the particular source file's header the words
+
+"Sun designates this particular file as subject to the "Classpath" exception as provided by Sun in the License file that accompanied this code."
+
+Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and conditions of the GNU General Public License Version 2 cover the whole combination.
+
+As a special exception, the copyright holders of this library give you permission to link this library with independent modules to produce an executable, regardless of the license terms of these independent modules, and to copy and distribute the resulting executable under terms of your choice, provided that you also meet, for each linked independent module, the terms and conditions of the license of that module.? An independent module is a module which is not derived from or based on this library.? If you modify this library, you may extend this exception to your version of the library, but you are not obligated to do so.? If you do not wish to do so, delete this exception statement from your version.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/legal/CDDL-1.1.txt	Tue Apr 24 06:49:23 2018 +0000
@@ -0,0 +1,759 @@
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
+
+1. Definitions.
+
+    1.1. "Contributor" means each individual or entity that creates or
+    contributes to the creation of Modifications.
+
+    1.2. "Contributor Version" means the combination of the Original
+    Software, prior Modifications used by a Contributor (if any), and
+    the Modifications made by that particular Contributor.
+
+    1.3. "Covered Software" means (a) the Original Software, or (b)
+    Modifications, or (c) the combination of files containing Original
+    Software with files containing Modifications, in each case including
+    portions thereof.
+
+    1.4. "Executable" means the Covered Software in any form other than
+    Source Code.
+
+    1.5. "Initial Developer" means the individual or entity that first
+    makes Original Software available under this License.
+
+    1.6. "Larger Work" means a work which combines Covered Software or
+    portions thereof with code not governed by the terms of this License.
+
+    1.7. "License" means this document.
+
+    1.8. "Licensable" means having the right to grant, to the maximum
+    extent possible, whether at the time of the initial grant or
+    subsequently acquired, any and all of the rights conveyed herein.
+
+    1.9. "Modifications" means the Source Code and Executable form of
+    any of the following:
+
+    A. Any file that results from an addition to, deletion from or
+    modification of the contents of a file containing Original Software
+    or previous Modifications;
+
+    B. Any new file that contains any part of the Original Software or
+    previous Modification; or
+
+    C. Any new file that is contributed or otherwise made available
+    under the terms of this License.
+
+    1.10. "Original Software" means the Source Code and Executable form
+    of computer software code that is originally released under this
+    License.
+
+    1.11. "Patent Claims" means any patent claim(s), now owned or
+    hereafter acquired, including without limitation, method, process,
+    and apparatus claims, in any patent Licensable by grantor.
+
+    1.12. "Source Code" means (a) the common form of computer software
+    code in which modifications are made and (b) associated
+    documentation included in or with such code.
+
+    1.13. "You" (or "Your") means an individual or a legal entity
+    exercising rights under, and complying with all of the terms of,
+    this License. For legal entities, "You" includes any entity which
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants.
+
+    2.1. The Initial Developer Grant.
+
+    Conditioned upon Your compliance with Section 3.1 below and subject
+    to third party intellectual property claims, the Initial Developer
+    hereby grants You a world-wide, royalty-free, non-exclusive license:
+
+    (a) under intellectual property rights (other than patent or
+    trademark) Licensable by Initial Developer, to use, reproduce,
+    modify, display, perform, sublicense and distribute the Original
+    Software (or portions thereof), with or without Modifications,
+    and/or as part of a Larger Work; and
+
+    (b) under Patent Claims infringed by the making, using or selling of
+    Original Software, to make, have made, use, practice, sell, and
+    offer for sale, and/or otherwise dispose of the Original Software
+    (or portions thereof).
+
+    (c) The licenses granted in Sections 2.1(a) and (b) are effective on
+    the date Initial Developer first distributes or otherwise makes the
+    Original Software available to a third party under the terms of this
+    License.
+
+    (d) Notwithstanding Section 2.1(b) above, no patent license is
+    granted: (1) for code that You delete from the Original Software, or
+    (2) for infringements caused by: (i) the modification of the
+    Original Software, or (ii) the combination of the Original Software
+    with other software or devices.
+
+    2.2. Contributor Grant.
+
+    Conditioned upon Your compliance with Section 3.1 below and subject
+    to third party intellectual property claims, each Contributor hereby
+    grants You a world-wide, royalty-free, non-exclusive license:
+
+    (a) under intellectual property rights (other than patent or
+    trademark) Licensable by Contributor to use, reproduce, modify,
+    display, perform, sublicense and distribute the Modifications
+    created by such Contributor (or portions thereof), either on an
+    unmodified basis, with other Modifications, as Covered Software
+    and/or as part of a Larger Work; and
+
+    (b) under Patent Claims infringed by the making, using, or selling
+    of Modifications made by that Contributor either alone and/or in
+    combination with its Contributor Version (or portions of such
+    combination), to make, use, sell, offer for sale, have made, and/or
+    otherwise dispose of: (1) Modifications made by that Contributor (or
+    portions thereof); and (2) the combination of Modifications made by
+    that Contributor with its Contributor Version (or portions of such
+    combination).
+
+    (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective
+    on the date Contributor first distributes or otherwise makes the
+    Modifications available to a third party.
+
+    (d) Notwithstanding Section 2.2(b) above, no patent license is
+    granted: (1) for any code that Contributor has deleted from the
+    Contributor Version; (2) for infringements caused by: (i) third
+    party modifications of Contributor Version, or (ii) the combination
+    of Modifications made by that Contributor with other software
+    (except as part of the Contributor Version) or other devices; or (3)
+    under Patent Claims infringed by Covered Software in the absence of
+    Modifications made by that Contributor.
+
+3. Distribution Obligations.
+
+    3.1. Availability of Source Code.
+
+    Any Covered Software that You distribute or otherwise make available
+    in Executable form must also be made available in Source Code form
+    and that Source Code form must be distributed only under the terms
+    of this License. You must include a copy of this License with every
+    copy of the Source Code form of the Covered Software You distribute
+    or otherwise make available. You must inform recipients of any such
+    Covered Software in Executable form as to how they can obtain such
+    Covered Software in Source Code form in a reasonable manner on or
+    through a medium customarily used for software exchange.
+
+    3.2. Modifications.
+
+    The Modifications that You create or to which You contribute are
+    governed by the terms of this License. You represent that You
+    believe Your Modifications are Your original creation(s) and/or You
+    have sufficient rights to grant the rights conveyed by this License.
+
+    3.3. Required Notices.
+
+    You must include a notice in each of Your Modifications that
+    identifies You as the Contributor of the Modification. You may not
+    remove or alter any copyright, patent or trademark notices contained
+    within the Covered Software, or any notices of licensing or any
+    descriptive text giving attribution to any Contributor or the
+    Initial Developer.
+
+    3.4. Application of Additional Terms.
+
+    You may not offer or impose any terms on any Covered Software in
+    Source Code form that alters or restricts the applicable version of
+    this License or the recipients' rights hereunder. You may choose to
+    offer, and to charge a fee for, warranty, support, indemnity or
+    liability obligations to one or more recipients of Covered Software.
+    However, you may do so only on Your own behalf, and not on behalf of
+    the Initial Developer or any Contributor. You must make it
+    absolutely clear that any such warranty, support, indemnity or
+    liability obligation is offered by You alone, and You hereby agree
+    to indemnify the Initial Developer and every Contributor for any
+    liability incurred by the Initial Developer or such Contributor as a
+    result of warranty, support, indemnity or liability terms You offer.
+
+    3.5. Distribution of Executable Versions.
+
+    You may distribute the Executable form of the Covered Software under
+    the terms of this License or under the terms of a license of Your
+    choice, which may contain terms different from this License,
+    provided that You are in compliance with the terms of this License
+    and that the license for the Executable form does not attempt to
+    limit or alter the recipient's rights in the Source Code form from
+    the rights set forth in this License. If You distribute the Covered
+    Software in Executable form under a different license, You must make
+    it absolutely clear that any terms which differ from this License
+    are offered by You alone, not by the Initial Developer or
+    Contributor. You hereby agree to indemnify the Initial Developer and
+    every Contributor for any liability incurred by the Initial
+    Developer or such Contributor as a result of any such terms You offer.
+
+    3.6. Larger Works.
+
+    You may create a Larger Work by combining Covered Software with
+    other code not governed by the terms of this License and distribute
+    the Larger Work as a single product. In such a case, You must make
+    sure the requirements of this License are fulfilled for the Covered
+    Software.
+
+4. Versions of the License.
+
+    4.1. New Versions.
+
+    Oracle is the initial license steward and may publish revised and/or
+    new versions of this License from time to time. Each version will be
+    given a distinguishing version number. Except as provided in Section
+    4.3, no one other than the license steward has the right to modify
+    this License.
+
+    4.2. Effect of New Versions.
+
+    You may always continue to use, distribute or otherwise make the
+    Covered Software available under the terms of the version of the
+    License under which You originally received the Covered Software. If
+    the Initial Developer includes a notice in the Original Software
+    prohibiting it from being distributed or otherwise made available
+    under any subsequent version of the License, You must distribute and
+    make the Covered Software available under the terms of the version
+    of the License under which You originally received the Covered
+    Software. Otherwise, You may also choose to use, distribute or
+    otherwise make the Covered Software available under the terms of any
+    subsequent version of the License published by the license steward.
+
+    4.3. Modified Versions.
+
+    When You are an Initial Developer and You want to create a new
+    license for Your Original Software, You may create and use a
+    modified version of this License if You: (a) rename the license and
+    remove any references to the name of the license steward (except to
+    note that the license differs from this License); and (b) otherwise
+    make it clear that the license contains terms which differ from this
+    License.
+
+5. DISCLAIMER OF WARRANTY.
+
+    COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+    INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE
+    IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR
+    NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF
+    THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE
+    DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY
+    OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING,
+    REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
+    ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS
+    AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+6. TERMINATION.
+
+    6.1. This License and the rights granted hereunder will terminate
+    automatically if You fail to comply with terms herein and fail to
+    cure such breach within 30 days of becoming aware of the breach.
+    Provisions which, by their nature, must remain in effect beyond the
+    termination of this License shall survive.
+
+    6.2. If You assert a patent infringement claim (excluding
+    declaratory judgment actions) against Initial Developer or a
+    Contributor (the Initial Developer or Contributor against whom You
+    assert such claim is referred to as "Participant") alleging that the
+    Participant Software (meaning the Contributor Version where the
+    Participant is a Contributor or the Original Software where the
+    Participant is the Initial Developer) directly or indirectly
+    infringes any patent, then any and all rights granted directly or
+    indirectly to You by such Participant, the Initial Developer (if the
+    Initial Developer is not the Participant) and all Contributors under
+    Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice
+    from Participant terminate prospectively and automatically at the
+    expiration of such 60 day notice period, unless if within such 60
+    day period You withdraw Your claim with respect to the Participant
+    Software against such Participant either unilaterally or pursuant to
+    a written agreement with Participant.
+
+    6.3. If You assert a patent infringement claim against Participant
+    alleging that the Participant Software directly or indirectly
+    infringes any patent where such claim is resolved (such as by
+    license or settlement) prior to the initiation of patent
+    infringement litigation, then the reasonable value of the licenses
+    granted by such Participant under Sections 2.1 or 2.2 shall be taken
+    into account in determining the amount or value of any payment or
+    license.
+
+    6.4. In the event of termination under Sections 6.1 or 6.2 above,
+    all end user licenses that have been validly granted by You or any
+    distributor hereunder prior to termination (excluding licenses
+    granted to You by any distributor) shall survive termination.
+
+7. LIMITATION OF LIABILITY.
+
+    UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+    (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
+    INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
+    COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE
+    TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
+    CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
+    LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER
+    FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR
+    LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE
+    POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT
+    APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH
+    PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH
+    LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR
+    LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION
+    AND LIMITATION MAY NOT APPLY TO YOU.
+
+8. U.S. GOVERNMENT END USERS.
+
+    The Covered Software is a "commercial item," as that term is defined
+    in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
+    software" (as that term is defined at 48 C.F.R. \A7
+    252.227-7014(a)(1)) and "commercial computer software documentation"
+    as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent
+    with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4
+    (June 1995), all U.S. Government End Users acquire Covered Software
+    with only those rights set forth herein. This U.S. Government Rights
+    clause is in lieu of, and supersedes, any other FAR, DFAR, or other
+    clause or provision that addresses Government rights in computer
+    software under this License.
+
+9. MISCELLANEOUS.
+
+    This License represents the complete agreement concerning subject
+    matter hereof. If any provision of this License is held to be
+    unenforceable, such provision shall be reformed only to the extent
+    necessary to make it enforceable. This License shall be governed by
+    the law of the jurisdiction specified in a notice contained within
+    the Original Software (except to the extent applicable law, if any,
+    provides otherwise), excluding such jurisdiction's conflict-of-law
+    provisions. Any litigation relating to this License shall be subject
+    to the jurisdiction of the courts located in the jurisdiction and
+    venue specified in a notice contained within the Original Software,
+    with the losing party responsible for costs, including, without
+    limitation, court costs and reasonable attorneys' fees and expenses.
+    The application of the United Nations Convention on Contracts for
+    the International Sale of Goods is expressly excluded. Any law or
+    regulation which provides that the language of a contract shall be
+    construed against the drafter shall not apply to this License. You
+    agree that You alone are responsible for compliance with the United
+    States export administration regulations (and the export control
+    laws and regulation of any other countries) when You use, distribute
+    or otherwise make available any Covered Software.
+
+10. RESPONSIBILITY FOR CLAIMS.
+
+    As between Initial Developer and the Contributors, each party is
+    responsible for claims and damages arising, directly or indirectly,
+    out of its utilization of rights under this License and You agree to
+    work with Initial Developer and Contributors to distribute such
+    responsibility on an equitable basis. Nothing herein is intended or
+    shall be deemed to constitute any admission of liability.
+
+------------------------------------------------------------------------
+
+NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
+LICENSE (CDDL)
+
+The code released under the CDDL shall be governed by the laws of the
+State of California (excluding conflict-of-law provisions). Any
+litigation relating to this License shall be subject to the jurisdiction
+of the Federal Courts of the Northern District of California and the
+state courts of the State of California, with venue lying in Santa Clara
+County, California.
+
+
+
+  The GNU General Public License (GPL) Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor
+Boston, MA 02110-1335
+USA
+
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to
+share and change it. By contrast, the GNU General Public License is
+intended to guarantee your freedom to share and change free software--to
+make sure the software is free for all its users. This General Public
+License applies to most of the Free Software Foundation's software and
+to any other program whose authors commit to using it. (Some other Free
+Software Foundation software is covered by the GNU Library General
+Public License instead.) You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price.
+Our General Public Licenses are designed to make sure that you have the
+freedom to distribute copies of free software (and charge for this
+service if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone
+to deny you these rights or to ask you to surrender the rights. These
+restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis
+or for a fee, you must give the recipients all the rights that you have.
+You must make sure that they, too, receive or can get the source code.
+And you must show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+Finally, any free program is threatened constantly by software patents.
+We wish to avoid the danger that redistributors of a free program will
+individually obtain patent licenses, in effect making the program
+proprietary. To prevent this, we have made it clear that any patent must
+be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a
+notice placed by the copyright holder saying it may be distributed under
+the terms of this General Public License. The "Program", below, refers
+to any such program or work, and a "work based on the Program" means
+either the Program or any derivative work under copyright law: that is
+to say, a work containing the Program or a portion of it, either
+verbatim or with modifications and/or translated into another language.
+(Hereinafter, translation is included without limitation in the term
+"modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of running
+the Program is not restricted, and the output from the Program is
+covered only if its contents constitute a work based on the Program
+(independent of having been made by running the Program). Whether that
+is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source
+code as you receive it, in any medium, provided that you conspicuously
+and appropriately publish on each copy an appropriate copyright notice
+and disclaimer of warranty; keep intact all the notices that refer to
+this License and to the absence of any warranty; and give any other
+recipients of the Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of
+it, thus forming a work based on the Program, and copy and distribute
+such modifications or work under the terms of Section 1 above, provided
+that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any part
+    thereof, to be licensed as a whole at no charge to all third parties
+    under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a notice
+    that there is no warranty (or else, saying that you provide a
+    warranty) and that users may redistribute the program under these
+    conditions, and telling the user how to view a copy of this License.
+    (Exception: if the Program itself is interactive but does not
+    normally print such an announcement, your work based on the Program
+    is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program, and
+can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based on
+the Program, the distribution of the whole must be on the terms of this
+License, whose permissions for other licensees extend to the entire
+whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of a
+storage or distribution medium does not bring the other work under the
+scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections 1
+    and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your cost
+    of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer to
+    distribute corresponding source code. (This alternative is allowed
+    only for noncommercial distribution and only if you received the
+    program in object code or executable form with such an offer, in
+    accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source code
+means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to control
+compilation and installation of the executable. However, as a special
+exception, the source code distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies the
+executable.
+
+If distribution of executable or object code is made by offering access
+to copy from a designated place, then offering equivalent access to copy
+the source code from the same place counts as distribution of the source
+code, even though third parties are not compelled to copy the source
+along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt otherwise
+to copy, modify, sublicense or distribute the Program is void, and will
+automatically terminate your rights under this License. However, parties
+who have received copies, or rights, from you under this License will
+not have their licenses terminated so long as such parties remain in
+full compliance.
+
+5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and all
+its terms and conditions for copying, distributing or modifying the
+Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further restrictions
+on the recipients' exercise of the rights granted herein. You are not
+responsible for enforcing compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot distribute
+so as to satisfy simultaneously your obligations under this License and
+any other pertinent obligations, then as a consequence you may not
+distribute the Program at all. For example, if a patent license would
+not permit royalty-free redistribution of the Program by all those who
+receive copies directly or indirectly through you, then the only way you
+could satisfy both it and this License would be to refrain entirely from
+distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is implemented
+by public license practices. Many people have made generous
+contributions to the wide range of software distributed through that
+system in reliance on consistent application of that system; it is up to
+the author/donor to decide if he or she is willing to distribute
+software through any other system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is believed to be
+a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License may
+add an explicit geographical distribution limitation excluding those
+countries, so that distribution is permitted only in or among countries
+not thus excluded. In such case, this License incorporates the
+limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new
+versions of the General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Program does not specify a version
+number of this License, you may choose any version ever published by the
+Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the
+author to ask for permission. For software which is copyrighted by the
+Free Software Foundation, write to the Free Software Foundation; we
+sometimes make exceptions for this. Our decision will be guided by the
+two goals of preserving the free status of all derivatives of our free
+software and of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND,
+EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE
+ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH
+YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
+NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR
+DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL
+DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM
+(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
+INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF
+THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR
+OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest to
+attach them to the start of each source file to most effectively convey
+the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    One line to give the program's name and a brief idea of what it does.
+    Copyright (C) <year> <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type
+    `show w'. This is free software, and you are welcome to redistribute
+    it under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the
+appropriate parts of the General Public License. Of course, the commands
+you use may be called something other than `show w' and `show c'; they
+could even be mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+    Yoyodyne, Inc., hereby disclaims all copyright interest in the
+    program `Gnomovision' (which makes passes at compilers) written by
+    James Hacker.
+
+    signature of Ty Coon, 1 April 1989
+    Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications
+with the library. If this is what you want to do, use the GNU Library
+General Public License instead of this License.
+
+#
+
+Certain source files distributed by Oracle America, Inc. and/or its
+affiliates are subject to the following clarification and special
+exception to the GPLv2, based on the GNU Project exception for its
+Classpath libraries, known as the GNU Classpath Exception, but only
+where Oracle has expressly included in the particular source file's
+header the words "Oracle designates this particular file as subject to
+the "Classpath" exception as provided by Oracle in the LICENSE file
+that accompanied this code."
+
+You should also note that Oracle includes multiple, independent
+programs in this software package. Some of those programs are provided
+under licenses deemed incompatible with the GPLv2 by the Free Software
+Foundation and others.  For example, the package includes programs
+licensed under the Apache License, Version 2.0.  Such programs are
+licensed to you under their original licenses.
+
+Oracle facilitates your further distribution of this package by adding
+the Classpath Exception to the necessary parts of its GPLv2 code, which
+permits you to use that code in combination with other independent
+modules not licensed under the GPLv2.  However, note that this would
+not permit you to commingle code under an incompatible license with
+Oracle's GPLv2 licensed code by, for example, cutting and pasting such
+code into a file also containing Oracle's GPLv2 licensed code and then
+distributing the result.  Additionally, if you were to remove the
+Classpath Exception from any of the files to which it applies and
+distribute the result, you would likely be required to license some or
+all of the other code in that distribution under the GPLv2 as well, and
+since the GPLv2 is incompatible with the license terms of some items
+included in the distribution by Oracle, removing the Classpath
+Exception could therefore effectively compromise your ability to
+further distribute the package.
+
+Proceed with caution and we recommend that you obtain the advice of a
+lawyer skilled in open source matters before removing the Classpath
+Exception or making modifications to this package which may
+subsequently be redistributed and/or involve the use of third party
+software.
+
+CLASSPATH EXCEPTION
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License version 2 cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from or
+based on this library.  If you modify this library, you may extend this
+exception to your version of the library, but you are not obligated to
+do so.  If you do not wish to do so, delete this exception statement
+from your version.
--- a/legal/Licensing.txt	Wed Apr 18 12:21:14 2018 +0000
+++ b/legal/Licensing.txt	Tue Apr 24 06:49:23 2018 +0000
@@ -3,7 +3,7 @@
 This license file applies to the Openbravo ERP software (the "Openbravo
 Software"), except as described below.
 
-This product is Copyright 2001-2017 Openbravo S.L.U.  For other detailed notice,
+This product is Copyright 2001-2018 Openbravo S.L.U.  For other detailed notice,
 see the "NOTICE" file with this distribution.
 
 This product is free software; you can redistribute it and/or modify
@@ -106,14 +106,14 @@
 # catalina-ant.jar
 # commons-beanutils-1.8.3.jar
 # commons-betwixt-0.8.jar
-# commons-codec-1.5.jar
+# commons-codec-1.11.jar
 # commons-collections-3.2.1.jar
 # commons-dbcp-1.4.jar
 # commons-digester-1.8.1.jar
 # commons-fileupload-1.2.2.jar
 # commons-io-2.4.jar
 # commons-lang-2.6.jar
-# commons-logging-1.1.1.jar
+# commons-logging-1.2.jar
 # commons-pool-1.5.6.jar
 # fop-1.1.jar
 # jakarta-oro-2.0.8.jar
@@ -146,9 +146,9 @@
 # itext-pdfa-5.5.0.jar
 Both files under AGPL V3 license with LGPL Exception (included as iTextpdf_license.txt in this folder)
 
-# jackson-core-2.5.1.jar
-# jackson-databind-2.5.1.jar
-# jackson-annotations-2.5.1.jar
+# jackson-core-2.9.4.jar
+# jackson-databind-2.9.4.jar
+# jackson-annotations-2.9.4.jar
 All files under the Apache 2.0 license (included as Apache_license-2.0.txt in this folder)
 
 # jasperreports-6.0.0.jar
@@ -257,9 +257,9 @@
 # shrinkwrap-spi-1.2.2.jar
 # validation-api-1.0.0.GA.jar
 # jsmin.0.2.4.jar
-# httpcore-4.0.1.jar
-# httpclient-4.0.jar
-# httpmime-4.1.jar
+# httpcore-4.4.9.jar
+# httpclient-4.5.5.jar
+# httpmime-4.5.5.jar
 # guice-2.0.jar
 # tomcat-juli.jar
 # tomcat-jdbc.jar
@@ -268,6 +268,17 @@
 # jslint4java-1.4.7.jar
 Under the New BSD license (available at http://www.opensource.org/licenses/bsd-license.php)
 
+# javax.annotation-api-1.2.jar
+# javax.xml.soap-api-1.3.7.jar
+Under the CDDL license version 1.0 (license available at https://spdx.org/licenses/CDDL-1.0.html 
+or in the file CDDL-1.0.txt in this folder)
+
+# javax.activation-api-1.2.0.jar
+# jaxws-api-2.2.12.jar
+# jaxb-api-2.2.12.jar
+Under the CDDL license version 1.1 (license available at https://spdx.org/licenses/CDDL-1.1.html 
+or in the file CDDL-1.1.txt in this folder)
+
 # CSSMinimizer.java
 CSSMin Copyright License Agreement (BSD License), Copyright (c) 2011, Barry van Oudtshoorn
 The full license text is embedded within the CSSMinimizer.java file itself
Binary file lib/runtime/commons-codec-1.11.jar has changed
Binary file lib/runtime/commons-codec-1.5.jar has changed
Binary file lib/runtime/commons-logging-1.1.1.jar has changed
Binary file lib/runtime/commons-logging-1.2.jar has changed
Binary file lib/runtime/jackson-annotations-2.5.1.jar has changed
Binary file lib/runtime/jackson-annotations-2.9.4.jar has changed
Binary file lib/runtime/jackson-core-2.5.1.jar has changed
Binary file lib/runtime/jackson-core-2.9.4.jar has changed
Binary file lib/runtime/jackson-databind-2.5.1.jar has changed
Binary file lib/runtime/jackson-databind-2.9.4.jar has changed
Binary file lib/runtime/javax.activation-api-1.2.0.jar has changed
Binary file lib/runtime/javax.annotation-api-1.2.jar has changed
Binary file lib/runtime/javax.xml.soap-api-1.3.7.jar has changed
Binary file lib/runtime/jaxb-api-2.2.12.jar has changed
Binary file lib/runtime/jaxws-api-2.2.12.jar has changed
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Tue Apr 24 06:49:23 2018 +0000
@@ -16,7 +16,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2010-2017 Openbravo SLU
+* All portions are Copyright (C) 2010-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -95,6 +95,7 @@
 v_paymentamt NUMBER:=0;
 v_depositamt NUMBER:=0;
 v_transactiontype VARCHAR2(32);
+v_finalsettlementdate C_Invoice.FinalSettlement%TYPE;
 
 BEGIN
 
@@ -613,6 +614,15 @@
       WHERE C_INVOICE_ID=P_RECORD_ID
         AND OUTSTANDINGAMT != 0;
 
+      IF(v_OutstandingAmount = 0) THEN
+        SELECT MAX(lastpayment)
+        INTO v_finalsettlementdate
+        FROM fin_payment_sched_inv_v
+        WHERE c_invoice_id = P_RECORD_ID;
+      ELSE
+        v_finalsettlementdate := NULL;
+      END IF;
+
       --Updating Payment Monitor values into C_INVOICE
       UPDATE C_INVOICE
       SET TOTALPAID = v_PaidAmount,
@@ -621,7 +631,7 @@
           DAYSTILLDUE = V_DayStillDue,
           LASTCALCULATEDONDATE = now(),
           ISPAID = CASE v_OutstandingAmount WHEN 0 THEN 'Y' ELSE 'N' END,
-          FINALSETTLEMENT = CASE v_OutstandingAmount WHEN 0 THEN now() ELSE NULL END
+          FINALSETTLEMENT = v_finalsettlementdate
       WHERE C_INVOICE_ID = P_RECORD_ID;
 
       -- Updating SO_CREDITUSED when Invoices are being processed
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml	Tue Apr 24 06:49:23 2018 +0000
@@ -21,11 +21,9 @@
 * Contributor(s):  ______________________________________.
 ************************************************************************/
 
-p_message VARCHAR(2000);
 p_record_id VARCHAR(60);
 p_docAction VARCHAR(60);
 p_user VARCHAR(60);
-p_result NUMBER;
 
 v_ResultStr VARCHAR2(2000):='';
 v_GrandTotal NUMBER:=0;
@@ -57,10 +55,6 @@
       p_record_id := cur_params.p_string;
     ELSIF (cur_params.parametername LIKE 'User') THEN
       p_user := cur_params.p_string;
-    ELSIF (cur_params.parametername LIKE 'Message') THEN
-      p_message := cur_params.p_text;
-    ELSIF (cur_params.parametername LIKE 'Result') THEN
-      p_result := cur_params.p_number;
     END IF;
   END LOOP;
 
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml	Tue Apr 24 06:49:23 2018 +0000
@@ -26,8 +26,6 @@
 p_GLItem VARCHAR2(32);
 p_Amount NUMBER;
 p_IsReceipt CHAR(1);
-p_message VARCHAR(2000);
-p_result NUMBER;
 
 v_TaxPaymentName VARCHAR2(60);
 v_FinancialAccountName VARCHAR2(60);
@@ -77,10 +75,6 @@
       p_amount := cur_params.p_number;
     ELSIF (cur_params.parametername LIKE 'IsReceipt') THEN
       p_isReceipt := cur_params.p_string;
-    ELSIF (cur_params.parametername LIKE 'Message') THEN
-      p_message := cur_params.p_text;
-    ELSIF (cur_params.parametername LIKE 'Result') THEN
-      p_result := cur_params.p_number;
     END IF;
   END LOOP;
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/AD_ORG.xml	Tue Apr 24 06:49:23 2018 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+  <database name="MODIFIED TABLE AD_ORG">
+    <table name="AD_ORG" primaryKey="AD_ORG_KEY">
+      <column name="EM_APRM_GLITEM_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <foreign-key foreignTable="C_GLITEM" name="EM_APRM_ORG_GLITEM">
+        <reference local="EM_APRM_GLITEM_ID" foreign="C_GLITEM_ID"/>
+      </foreign-key>
+    </table>
+  </database>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml	Tue Apr 24 06:49:23 2018 +0000
@@ -37,5 +37,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="EM_APRM_ISFUNDSTRANS_ENABLED" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
+      <check name="EM_APRM_FIN_FINACC_ISFUNDS_CHK"><![CDATA[EM_APRM_ISFUNDSTRANS_ENABLED IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Tue Apr 24 06:49:23 2018 +0000
@@ -10100,6 +10100,45 @@
 <!--B44BDBCFCEC243179D78A333FA0497A5-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--B44BDBCFCEC243179D78A333FA0497A5--></AD_COLUMN>
 
+<!--B502077EB5A64A43A07CD42323BBAC57--><AD_COLUMN>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <AD_COLUMN_ID><![CDATA[B502077EB5A64A43A07CD42323BBAC57]]></AD_COLUMN_ID>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <NAME><![CDATA[EM_Aprm_Isfundstrans_Enabled]]></NAME>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <DESCRIPTION><![CDATA[Funds Transfer Enabled flag is used to show/hide funds transfer button process.]]></DESCRIPTION>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <HELP><![CDATA[Funds Transfer Enabled flag is used to show/hide funds transfer button process and to show/hide Financial Accounts in Funds Transfer Process]]></HELP>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <COLUMNNAME><![CDATA[EM_Aprm_Isfundstrans_Enabled]]></COLUMNNAME>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <AD_TABLE_ID><![CDATA[B129E53BC0E747879F7BA17F0AECEC32]]></AD_TABLE_ID>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <SEQNO><![CDATA[520]]></SEQNO>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <AD_ELEMENT_ID><![CDATA[F18571A261AB41D49246E1C04D647256]]></AD_ELEMENT_ID>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <POSITION><![CDATA[45]]></POSITION>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--B502077EB5A64A43A07CD42323BBAC57--></AD_COLUMN>
+
 <!--B50241F11C4F404583CACB2A88CE875F--><AD_COLUMN>
 <!--B50241F11C4F404583CACB2A88CE875F-->  <AD_COLUMN_ID><![CDATA[B50241F11C4F404583CACB2A88CE875F]]></AD_COLUMN_ID>
 <!--B50241F11C4F404583CACB2A88CE875F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -10141,6 +10180,45 @@
 <!--B50241F11C4F404583CACB2A88CE875F-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--B50241F11C4F404583CACB2A88CE875F--></AD_COLUMN>
 
+<!--B5066970A1944B9EBDA0A2BE48F026F6--><AD_COLUMN>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <AD_COLUMN_ID><![CDATA[B5066970A1944B9EBDA0A2BE48F026F6]]></AD_COLUMN_ID>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <NAME><![CDATA[EM_APRM_Glitem_ID]]></NAME>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <DESCRIPTION><![CDATA[Default G/L Item used for Funds Transfer Process]]></DESCRIPTION>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <HELP><![CDATA[Default G/L Item used for Funds Transfer Process in Financial Account Window]]></HELP>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <COLUMNNAME><![CDATA[EM_APRM_Glitem_ID]]></COLUMNNAME>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <AD_TABLE_ID><![CDATA[155]]></AD_TABLE_ID>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <AD_REFERENCE_VALUE_ID><![CDATA[1A6C5E0A5868417786ECCF3C02B17D65]]></AD_REFERENCE_VALUE_ID>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <SEQNO><![CDATA[81]]></SEQNO>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <AD_ELEMENT_ID><![CDATA[A3F4495893084689A6F604722ACA1EC2]]></AD_ELEMENT_ID>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <POSITION><![CDATA[20]]></POSITION>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--B5066970A1944B9EBDA0A2BE48F026F6--></AD_COLUMN>
+
 <!--B591815987C54A369525A5BA485F5FC0--><AD_COLUMN>
 <!--B591815987C54A369525A5BA485F5FC0-->  <AD_COLUMN_ID><![CDATA[B591815987C54A369525A5BA485F5FC0]]></AD_COLUMN_ID>
 <!--B591815987C54A369525A5BA485F5FC0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml	Tue Apr 24 06:49:23 2018 +0000
@@ -1208,6 +1208,20 @@
 <!--A37C6F84AA463F50E040007F01006E35-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--A37C6F84AA463F50E040007F01006E35--></AD_ELEMENT>
 
+<!--A3F4495893084689A6F604722ACA1EC2--><AD_ELEMENT>
+<!--A3F4495893084689A6F604722ACA1EC2-->  <AD_ELEMENT_ID><![CDATA[A3F4495893084689A6F604722ACA1EC2]]></AD_ELEMENT_ID>
+<!--A3F4495893084689A6F604722ACA1EC2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A3F4495893084689A6F604722ACA1EC2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A3F4495893084689A6F604722ACA1EC2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A3F4495893084689A6F604722ACA1EC2-->  <COLUMNNAME><![CDATA[EM_APRM_Glitem_ID]]></COLUMNNAME>
+<!--A3F4495893084689A6F604722ACA1EC2-->  <NAME><![CDATA[Default G/L Item for Funds Transfer]]></NAME>
+<!--A3F4495893084689A6F604722ACA1EC2-->  <PRINTNAME><![CDATA[Default G/L Item for Funds Transfer]]></PRINTNAME>
+<!--A3F4495893084689A6F604722ACA1EC2-->  <DESCRIPTION><![CDATA[Default G/L Item used for Funds Transfer Process]]></DESCRIPTION>
+<!--A3F4495893084689A6F604722ACA1EC2-->  <HELP><![CDATA[Default G/L Item used for Funds Transfer Process in Financial Account Window]]></HELP>
+<!--A3F4495893084689A6F604722ACA1EC2-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--A3F4495893084689A6F604722ACA1EC2-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--A3F4495893084689A6F604722ACA1EC2--></AD_ELEMENT>
+
 <!--A62C80360F274C44AA6BF58315DF65FF--><AD_ELEMENT>
 <!--A62C80360F274C44AA6BF58315DF65FF-->  <AD_ELEMENT_ID><![CDATA[A62C80360F274C44AA6BF58315DF65FF]]></AD_ELEMENT_ID>
 <!--A62C80360F274C44AA6BF58315DF65FF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1706,6 +1720,20 @@
 <!--F109FCAF8CC1462AB2A94F73F4E51EA7-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--F109FCAF8CC1462AB2A94F73F4E51EA7--></AD_ELEMENT>
 
+<!--F18571A261AB41D49246E1C04D647256--><AD_ELEMENT>
+<!--F18571A261AB41D49246E1C04D647256-->  <AD_ELEMENT_ID><![CDATA[F18571A261AB41D49246E1C04D647256]]></AD_ELEMENT_ID>
+<!--F18571A261AB41D49246E1C04D647256-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F18571A261AB41D49246E1C04D647256-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F18571A261AB41D49246E1C04D647256-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F18571A261AB41D49246E1C04D647256-->  <COLUMNNAME><![CDATA[EM_Aprm_Isfundstrans_Enabled]]></COLUMNNAME>
+<!--F18571A261AB41D49246E1C04D647256-->  <NAME><![CDATA[Funds Transfer Enabled]]></NAME>
+<!--F18571A261AB41D49246E1C04D647256-->  <PRINTNAME><![CDATA[Funds Transfer Enabled]]></PRINTNAME>
+<!--F18571A261AB41D49246E1C04D647256-->  <DESCRIPTION><![CDATA[Funds Transfer Enabled flag is used to show/hide funds transfer button process.]]></DESCRIPTION>
+<!--F18571A261AB41D49246E1C04D647256-->  <HELP><![CDATA[Funds Transfer Enabled flag is used to show/hide funds transfer button process and to show/hide Financial Accounts in Funds Transfer Process]]></HELP>
+<!--F18571A261AB41D49246E1C04D647256-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--F18571A261AB41D49246E1C04D647256-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--F18571A261AB41D49246E1C04D647256--></AD_ELEMENT>
+
 <!--F1D81ADE47094291B577E6B10B2B95E4--><AD_ELEMENT>
 <!--F1D81ADE47094291B577E6B10B2B95E4-->  <AD_ELEMENT_ID><![CDATA[F1D81ADE47094291B577E6B10B2B95E4]]></AD_ELEMENT_ID>
 <!--F1D81ADE47094291B577E6B10B2B95E4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Tue Apr 24 06:49:23 2018 +0000
@@ -877,7 +877,8 @@
 <!--0A650E8E8BD944018FD4FD6866AF1481-->  <AD_COLUMN_ID><![CDATA[AFFEB1DBCEFF4A63871F1E214E01071C]]></AD_COLUMN_ID>
 <!--0A650E8E8BD944018FD4FD6866AF1481-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--0A650E8E8BD944018FD4FD6866AF1481-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--0A650E8E8BD944018FD4FD6866AF1481-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <DISPLAYLOGIC><![CDATA[@EM_Aprm_Isfundstrans_Enabled@='Y']]></DISPLAYLOGIC>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--0A650E8E8BD944018FD4FD6866AF1481-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--0A650E8E8BD944018FD4FD6866AF1481-->  <SEQNO><![CDATA[440]]></SEQNO>
 <!--0A650E8E8BD944018FD4FD6866AF1481-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
@@ -13580,6 +13581,35 @@
 <!--9AF76E97875345F587C9DD8F64B96431-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--9AF76E97875345F587C9DD8F64B96431--></AD_FIELD>
 
+<!--9BF656872BAF4AFBA443E4430237D527--><AD_FIELD>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <AD_FIELD_ID><![CDATA[9BF656872BAF4AFBA443E4430237D527]]></AD_FIELD_ID>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <NAME><![CDATA[Default G/L Item for Funds Transfer]]></NAME>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <DESCRIPTION><![CDATA[Default G/L Item used for Funds Transfer Process]]></DESCRIPTION>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <HELP><![CDATA[Default G/L Item used for Funds Transfer Process in Financial Account Window]]></HELP>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <AD_TAB_ID><![CDATA[143]]></AD_TAB_ID>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <AD_COLUMN_ID><![CDATA[B5066970A1944B9EBDA0A2BE48F026F6]]></AD_COLUMN_ID>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <SEQNO><![CDATA[106]]></SEQNO>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--9BF656872BAF4AFBA443E4430237D527--></AD_FIELD>
+
 <!--9CB868DC0BCD49C197CA4AFBBF92093E--><AD_FIELD>
 <!--9CB868DC0BCD49C197CA4AFBBF92093E-->  <AD_FIELD_ID><![CDATA[9CB868DC0BCD49C197CA4AFBBF92093E]]></AD_FIELD_ID>
 <!--9CB868DC0BCD49C197CA4AFBBF92093E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -13778,6 +13808,35 @@
 <!--9E41C5369B034F2DB102624F5277353B-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--9E41C5369B034F2DB102624F5277353B--></AD_FIELD>
 
+<!--9E4ED210DB344E538CA6921C0111E8DD--><AD_FIELD>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <AD_FIELD_ID><![CDATA[9E4ED210DB344E538CA6921C0111E8DD]]></AD_FIELD_ID>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <NAME><![CDATA[Funds Transfer Enabled]]></NAME>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <DESCRIPTION><![CDATA[Funds Transfer Enabled flag is used to show/hide funds transfer button process.]]></DESCRIPTION>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <HELP><![CDATA[Funds Transfer Enabled flag is used to show/hide funds transfer button process.]]></HELP>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <AD_TAB_ID><![CDATA[2845D761A8394468BD3BA4710AA888D4]]></AD_TAB_ID>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <AD_COLUMN_ID><![CDATA[B502077EB5A64A43A07CD42323BBAC57]]></AD_COLUMN_ID>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <SEQNO><![CDATA[135]]></SEQNO>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--9E4ED210DB344E538CA6921C0111E8DD--></AD_FIELD>
+
 <!--9FF475A41081408A892922BF1F7EC5CE--><AD_FIELD>
 <!--9FF475A41081408A892922BF1F7EC5CE-->  <AD_FIELD_ID><![CDATA[9FF475A41081408A892922BF1F7EC5CE]]></AD_FIELD_ID>
 <!--9FF475A41081408A892922BF1F7EC5CE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Tue Apr 24 06:49:23 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.33194]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.33768]]></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[PR18Q1.2]]></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	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Apr 24 06:49:23 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.33194]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.33768]]></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.33194]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.33768]]></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-db/database/sourcedata/AD_VAL_RULE.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml	Tue Apr 24 06:49:23 2018 +0000
@@ -93,9 +93,10 @@
 <!--8CEAB789915E4575BDEB66F1930067BA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--8CEAB789915E4575BDEB66F1930067BA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--8CEAB789915E4575BDEB66F1930067BA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8CEAB789915E4575BDEB66F1930067BA-->  <NAME><![CDATA[Not selected FIN_Financial_Account]]></NAME>
+<!--8CEAB789915E4575BDEB66F1930067BA-->  <NAME><![CDATA[Not selected Financial Account with enabled Funds Transfer]]></NAME>
+<!--8CEAB789915E4575BDEB66F1930067BA-->  <DESCRIPTION><![CDATA[Validates that the financial account is not the same as the selected one and that it has the flag Funds Transfer enabled]]></DESCRIPTION>
 <!--8CEAB789915E4575BDEB66F1930067BA-->  <TYPE><![CDATA[HQL_JS]]></TYPE>
-<!--8CEAB789915E4575BDEB66F1930067BA-->  <CODE><![CDATA["e.id != '" + OB.getParameters().get('inpfinFinancialAccountId') + "'"]]></CODE>
+<!--8CEAB789915E4575BDEB66F1930067BA-->  <CODE><![CDATA["e.aprmIsfundstransEnabled = true and e.id != '" + OB.getParameters().get('inpfinFinancialAccountId') + "'"]]></CODE>
 <!--8CEAB789915E4575BDEB66F1930067BA-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--8CEAB789915E4575BDEB66F1930067BA--></AD_VAL_RULE>
 
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Tue Apr 24 06:49:23 2018 +0000
@@ -207,6 +207,31 @@
 <!--111000BF6C4445E785AA08331A268E1B-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--111000BF6C4445E785AA08331A268E1B--></OBUIAPP_PARAMETER>
 
+<!--11D3060AAE0C4BA8BDC136623F250CD3--><OBUIAPP_PARAMETER>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <OBUIAPP_PARAMETER_ID><![CDATA[11D3060AAE0C4BA8BDC136623F250CD3]]></OBUIAPP_PARAMETER_ID>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <NAME><![CDATA[Description]]></NAME>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <DESCRIPTION><![CDATA[A space to write additional related information.]]></DESCRIPTION>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <HELP><![CDATA[A description is limited to 255 characters.]]></HELP>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <SEQNO><![CDATA[255]]></SEQNO>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <AD_REFERENCE_ID><![CDATA[14]]></AD_REFERENCE_ID>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <COLUMNNAME><![CDATA[description]]></COLUMNNAME>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <FIELDLENGTH><![CDATA[255]]></FIELDLENGTH>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <AD_ELEMENT_ID><![CDATA[275]]></AD_ELEMENT_ID>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <ISFIXED><![CDATA[N]]></ISFIXED>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <OBUIAPP_PROCESS_ID><![CDATA[CC73C4845CDC487395804946EACB225F]]></OBUIAPP_PROCESS_ID>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <STARTINNEWLINE><![CDATA[Y]]></STARTINNEWLINE>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
+<!--11D3060AAE0C4BA8BDC136623F250CD3--></OBUIAPP_PARAMETER>
+
 <!--12DDAD2FBC404963B7A49D2E54985DF9--><OBUIAPP_PARAMETER>
 <!--12DDAD2FBC404963B7A49D2E54985DF9-->  <OBUIAPP_PARAMETER_ID><![CDATA[12DDAD2FBC404963B7A49D2E54985DF9]]></OBUIAPP_PARAMETER_ID>
 <!--12DDAD2FBC404963B7A49D2E54985DF9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1058,6 +1083,7 @@
 <!--7B77F9EF9387445FBB5A40E84D256EE4-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--7B77F9EF9387445FBB5A40E84D256EE4-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
 <!--7B77F9EF9387445FBB5A40E84D256EE4-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7B77F9EF9387445FBB5A40E84D256EE4-->  <DEFAULTVALUE><![CDATA[OB.getFilterExpression("org.openbravo.advpaymentmngt.filterexpression.FundsTransferGLItemDefaultValueExpression")]]></DEFAULTVALUE>
 <!--7B77F9EF9387445FBB5A40E84D256EE4-->  <AD_ELEMENT_ID><![CDATA[DABC92A3E32E4DBFB78068CF6A4FBAC7]]></AD_ELEMENT_ID>
 <!--7B77F9EF9387445FBB5A40E84D256EE4-->  <ISFIXED><![CDATA[N]]></ISFIXED>
 <!--7B77F9EF9387445FBB5A40E84D256EE4-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml	Tue Apr 24 06:49:23 2018 +0000
@@ -155,6 +155,7 @@
 <!--CC73C4845CDC487395804946EACB225F-->  <ISMULTIRECORD><![CDATA[N]]></ISMULTIRECORD>
 <!--CC73C4845CDC487395804946EACB225F-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--CC73C4845CDC487395804946EACB225F-->  <ISGRIDLEGACY><![CDATA[N]]></ISGRIDLEGACY>
+<!--CC73C4845CDC487395804946EACB225F-->  <ON_LOAD_FUNCTION><![CDATA[OB.APRM.FundsTranfer.onLoad]]></ON_LOAD_FUNCTION>
 <!--CC73C4845CDC487395804946EACB225F-->  <ISCANADDRECORDSTOSELECTOR><![CDATA[N]]></ISCANADDRECORDSTOSELECTOR>
 <!--CC73C4845CDC487395804946EACB225F--></OBUIAPP_PROCESS>
 
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/DoubtFulDebtPickEditLines.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/DoubtFulDebtPickEditLines.java	Tue Apr 24 06:49:23 2018 +0000
@@ -20,6 +20,7 @@
 package org.openbravo.advpaymentmngt.actionHandler;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -133,7 +134,7 @@
           }
           int stdPrecision = 2;
           stdPrecision = currency.getStandardPrecision().intValue();
-          amount = amount.setScale(stdPrecision, BigDecimal.ROUND_HALF_UP);
+          amount = amount.setScale(stdPrecision, RoundingMode.HALF_UP);
           newDoubtfulDebt.setClient(doubtfulDebtRun.getClient());
           newDoubtfulDebt.setOrganization(doubtfulDebtRun.getOrganization());
           newDoubtfulDebt.setAccountingDate(doubtfulDebtRun.getAccountingDate());
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/FundsTransferActionHandler.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/FundsTransferActionHandler.java	Tue Apr 24 06:49:23 2018 +0000
@@ -26,8 +26,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.codehaus.jettison.json.JSONArray;
-import org.codehaus.jettison.json.JSONException;
+import org.apache.commons.lang.StringUtils;
 import org.codehaus.jettison.json.JSONObject;
 import org.openbravo.advpaymentmngt.dao.TransactionsDao;
 import org.openbravo.advpaymentmngt.process.FIN_TransactionProcess;
@@ -35,13 +34,14 @@
 import org.openbravo.base.provider.OBProvider;
 import org.openbravo.base.weld.WeldUtils;
 import org.openbravo.client.application.process.BaseProcessActionHandler;
+import org.openbravo.client.application.process.ResponseActionsBuilder.MessageType;
+import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.erpCommon.utility.OBMessageUtils;
 import org.openbravo.financial.FinancialUtils;
 import org.openbravo.model.financialmgmt.gl.GLItem;
 import org.openbravo.model.financialmgmt.payment.FIN_FinaccTransaction;
 import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount;
-import org.openbravo.service.json.JsonConstants;
 import org.openbravo.service.json.JsonUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -88,6 +88,8 @@
       // Amount
       BigDecimal amount = new BigDecimal(jsonParams.getString("deposit_amount"));
 
+      String description = jsonParams.getString("description");
+
       // Conversion Rate
       BigDecimal manualConversionRate = null;
       if (accountFrom.getCurrency().getId().equalsIgnoreCase(accountTo.getCurrency().getId())) {
@@ -109,22 +111,22 @@
       }
 
       createTransfer(trxDate, accountFrom, accountTo, glitem, amount, manualConversionRate,
-          bankFeeFrom, bankFeeTo);
+          bankFeeFrom, bankFeeTo, description);
 
     } catch (OBException e) {
       log.error(ERROR_IN_PROCESS, e);
 
-      return createPopUpError(e.getMessage(), true);
+      return getResponseBuilder()
+          .showMsgInProcessView(MessageType.ERROR, OBMessageUtils.messageBD("error"),
+              e.getMessage(), true).retryExecution().build();
     } catch (Exception e) {
       log.error(ERROR_IN_PROCESS, e);
-
-      return createResponse(JsonConstants.RESPONSE_ERROR,
-          OBMessageUtils.messageBD("OBUIAPP_Error"), OBMessageUtils.messageBD("APRM_UnknownError"),
-          false);
+      return getResponseBuilder().showMsgInProcessView(MessageType.ERROR,
+          OBMessageUtils.messageBD("error"), OBMessageUtils.messageBD("APRM_UnknownError")).build();
     }
-
-    return createResponse("success", OBMessageUtils.messageBD("OBUIAPP_Success"),
-        OBMessageUtils.messageBD("APRM_TransferFundsSuccess"), true);
+    return getResponseBuilder()
+        .showMsgInProcessView(MessageType.SUCCESS, OBMessageUtils.messageBD("success"),
+            OBMessageUtils.messageBD("APRM_TransferFundsSuccess")).refreshGrid().build();
   }
 
   /**
@@ -150,9 +152,40 @@
   public static void createTransfer(Date date, FIN_FinancialAccount accountFrom,
       FIN_FinancialAccount accountTo, GLItem glitem, BigDecimal amount,
       BigDecimal manualConversionRate, BigDecimal bankFeeFrom, BigDecimal bankFeeTo) {
+    createTransfer(date, accountFrom, accountTo, glitem, amount, manualConversionRate, bankFeeFrom,
+        bankFeeTo);
+  }
+
+  /**
+   * Create all the transactions for a funds transfer between two accounts
+   * 
+   * @param date
+   *          used for the transactions, current date is used if this is null.
+   * @param accountFrom
+   *          source account.
+   * @param accountTo
+   *          target account.
+   * @param glitem
+   *          gl item used in transactions.
+   * @param amount
+   *          the transfer amount.
+   * @param manualConversionRate
+   *          conversion rate to override the system one.
+   * @param bankFeeFrom
+   *          fee on the source bank.
+   * @param bankFeeTo
+   *          fee on the target bank.
+   * @param description
+   *          description set by the user in the Funds Transfer Process.
+   */
+  public static void createTransfer(Date date, FIN_FinancialAccount accountFrom,
+      FIN_FinancialAccount accountTo, GLItem glitem, BigDecimal amount,
+      BigDecimal manualConversionRate, BigDecimal bankFeeFrom, BigDecimal bankFeeTo,
+      String description) {
     List<FIN_FinaccTransaction> transactions = new ArrayList<FIN_FinaccTransaction>();
     FIN_FinaccTransaction newTrx;
     Date trxDate = date;
+
     if (trxDate == null) {
       trxDate = new Date();
     }
@@ -164,21 +197,22 @@
 
       // Source Account
       FIN_FinaccTransaction sourceTrx = createTransaction(accountFrom, BP_WITHDRAWAL, trxDate,
-          glitem, amount, lineNoUtil);
+          glitem, amount, lineNoUtil, description);
       transactions.add(sourceTrx);
       if (bankFeeFrom != null && BigDecimal.ZERO.compareTo(bankFeeFrom) != 0) {
-        newTrx = createTransaction(accountFrom, BANK_FEE, trxDate, glitem, bankFeeFrom, lineNoUtil);
+        newTrx = createTransaction(accountFrom, BANK_FEE, trxDate, glitem, bankFeeFrom, lineNoUtil,
+            description);
         transactions.add(newTrx);
       }
 
       // Target Account
       newTrx = createTransaction(accountTo, BP_DEPOSIT, trxDate, glitem, targetAmount, lineNoUtil,
-          sourceTrx);
+          sourceTrx, description);
       transactions.add(newTrx);
 
       if (bankFeeTo != null && BigDecimal.ZERO.compareTo(bankFeeTo) != 0) {
         newTrx = createTransaction(accountTo, BANK_FEE, trxDate, glitem, bankFeeTo, lineNoUtil,
-            sourceTrx);
+            sourceTrx, description);
         transactions.add(newTrx);
       }
 
@@ -206,13 +240,15 @@
   }
 
   private static FIN_FinaccTransaction createTransaction(FIN_FinancialAccount account,
-      String trxType, Date trxDate, GLItem glitem, BigDecimal amount, LineNumberUtil lineNoUtil) {
-    return createTransaction(account, trxType, trxDate, glitem, amount, lineNoUtil, null);
+      String trxType, Date trxDate, GLItem glitem, BigDecimal amount, LineNumberUtil lineNoUtil,
+      String description) {
+    return createTransaction(account, trxType, trxDate, glitem, amount, lineNoUtil, null,
+        description);
   }
 
   private static FIN_FinaccTransaction createTransaction(FIN_FinancialAccount account,
       String trxType, Date trxDate, GLItem glitem, BigDecimal amount, LineNumberUtil lineNoUtil,
-      FIN_FinaccTransaction sourceTrx) {
+      FIN_FinaccTransaction sourceTrx, String description) {
     FIN_FinaccTransaction trx = OBProvider.getInstance().get(FIN_FinaccTransaction.class);
 
     trx.setAccount(account);
@@ -226,13 +262,24 @@
     } else {
       trx.setPaymentAmount(amount);
     }
-    trx.setOrganization(account.getOrganization());
+    // If the user has access to the Organization of the Financial Account, the Transaction is
+    // created for it. If not, the Organization of the context is used instead
+    if (OBContext.getOBContext().getWritableOrganizations()
+        .contains(account.getOrganization().getId())) {
+      trx.setOrganization(account.getOrganization());
+    } else {
+      trx.setOrganization(OBContext.getOBContext().getCurrentOrganization());
+    }
 
     Long line = lineNoUtil.getNextLineNumber(account);
     trx.setLineNo(line);
 
     trx.setAprmFinaccTransOrigin(sourceTrx);
-    trx.setDescription(OBMessageUtils.messageBD("FundsTransfer"));
+    if (StringUtils.isNotEmpty(description)) {
+      trx.setDescription(description);
+    } else {
+      trx.setDescription(OBMessageUtils.messageBD("FundsTransfer"));
+    }
 
     OBDal.getInstance().save(trx);
 
@@ -245,48 +292,6 @@
     }
   }
 
-  private JSONObject createPopUpError(String message, boolean retry) {
-    JSONObject result = new JSONObject();
-
-    try {
-      result.put("retryExecution", retry);
-      JSONObject msg = new JSONObject();
-      msg.put("severity", JsonConstants.RESPONSE_ERROR);
-      msg.put("text", message);
-      result.put("message", msg);
-    } catch (JSONException ignore) {
-      log.error(ERROR_IN_PROCESS, ignore);
-    }
-
-    return result;
-  }
-
-  private JSONObject createResponse(String type, String title, String message, boolean refresh) {
-    JSONObject result = new JSONObject();
-    JSONArray responseActions = new JSONArray();
-
-    try {
-      JSONObject showMessage = new JSONObject();
-      JSONObject msg = new JSONObject();
-      msg.put("msgType", type);
-      msg.put("msgTitle", title);
-      msg.put("msgText", message);
-      showMessage.put("showMsgInProcessView", msg);
-      responseActions.put(showMessage);
-
-      if (refresh) {
-        JSONObject refreshGrid = new JSONObject();
-        refreshGrid.put("refreshGrid", new JSONObject());
-        responseActions.put(refreshGrid);
-      }
-
-      result.put("responseActions", responseActions);
-    } catch (JSONException ignore) {
-      log.error(ERROR_IN_PROCESS, ignore);
-    }
-    return result;
-  }
-
   /**
    * This class exists because TransactionsDao.getTransactionMaxLineNo does not take into account
    * not flushed transactions
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/GLItemSelectorFilterExpression.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/GLItemSelectorFilterExpression.java	Tue Apr 24 06:49:23 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-2015 Openbravo SLU 
+ * All portions are Copyright (C) 2012-2018 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -22,32 +22,56 @@
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
+import org.codehaus.jettison.json.JSONException;
+import org.codehaus.jettison.json.JSONObject;
 import org.openbravo.client.application.FilterExpression;
-import org.openbravo.client.kernel.RequestContext;
 import org.openbravo.dal.core.OBContext;
-
 import org.openbravo.erpCommon.utility.Utility;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class GLItemSelectorFilterExpression implements FilterExpression {
-  final static String FINANCIAL_ACCOUNT_WINDOW = "94EAA455D2644E04AB25D93BE5157B6D";
+  private static final String INPAD_ORG_ID_PARAM = "inpadOrgId";
+  private static final String AD_ORG_ID_PARAM = "ad_org_id";
+  private static final Logger log = LoggerFactory.getLogger(GLItemSelectorFilterExpression.class);
 
   @Override
   public String getExpression(Map<String, String> requestMap) {
-    if (!FINANCIAL_ACCOUNT_WINDOW.equals(requestMap.get("inpwindowId"))) {
-      return "";
+    try {
+      final JSONObject context = new JSONObject(requestMap);
+      final String orgId = getOrganizationIdFromContext(context);
+      String orgList = Utility.getInStrSet(OBContext.getOBContext()
+          .getOrganizationStructureProvider().getNaturalTree(orgId));
+      if (!orgList.isEmpty()) {
+        StringBuilder whereClause = new StringBuilder();
+        whereClause.append("e.organization.id in (" + orgList + ")");
+        return whereClause.toString();
+      } else {
+        return "";
+      }
+    } catch (Exception e) {
+      log.error("Error trying to get organization where clause for GL Item: ", e);
+      return null;
     }
-    StringBuilder whereClause = new StringBuilder();
-    String orgId = (String) RequestContext.get().getSession()
-        .getAttribute(FINANCIAL_ACCOUNT_WINDOW + "|AD_ORG_ID");
-    if(StringUtils.isEmpty(orgId)) {
-    	orgId = requestMap.get("inpadOrgId");
+  }
+
+  private String getOrganizationIdFromContext(final JSONObject context) throws JSONException {
+    if (contextHasADOrgIDParam(context)) {
+      return context.getString(AD_ORG_ID_PARAM);
+    } else if (contextHasInpADOrgIDParam(context)) {
+      return context.getString(INPAD_ORG_ID_PARAM);
+    } else {
+      return null;
     }
-    String orgList = Utility.getInStrSet(OBContext.getOBContext()
-        .getOrganizationStructureProvider().getNaturalTree(orgId));
-    if (!orgList.isEmpty()) {
-      whereClause.append("e.organization.id in (" + orgList + ")");
-    }
-    return whereClause.toString();
+  }
+
+  private boolean contextHasInpADOrgIDParam(final JSONObject context) throws JSONException {
+    return context.has(INPAD_ORG_ID_PARAM) && context.get(INPAD_ORG_ID_PARAM) != JSONObject.NULL
+        && StringUtils.isNotEmpty(context.getString(INPAD_ORG_ID_PARAM));
+  }
+
+  private boolean contextHasADOrgIDParam(final JSONObject context) throws JSONException {
+    return context.has(AD_ORG_ID_PARAM) && context.get(AD_ORG_ID_PARAM) != JSONObject.NULL
+        && StringUtils.isNotEmpty(context.getString(AD_ORG_ID_PARAM));
   }
 }
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ImportBankFile.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ImportBankFile.java	Tue Apr 24 06:49:23 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-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -67,7 +67,8 @@
       BankFileFormat bff = OBDal.getInstance().get(BankFileFormat.class, strBankFileFormat);
       FIN_BankStatementImport bsi = null;
       try {
-        bsi = (FIN_BankStatementImport) Class.forName(bff.getJavaClassName()).newInstance();
+        bsi = (FIN_BankStatementImport) Class.forName(bff.getJavaClassName())
+            .getDeclaredConstructor().newInstance();
       } catch (Exception e) {
         log4j.error("Error while creating new instance for FIN_BankStatementImport - " + e, e);
       }
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java	Tue Apr 24 06:49:23 2018 +0000
@@ -86,6 +86,7 @@
 /**
  * @deprecated
  */
+@Deprecated
 public class MatchTransaction extends HttpSecureAppServlet {
   private static final long serialVersionUID = 1L;
   VariablesSecureApp vars = null;
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java	Tue Apr 24 06:49:23 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-2017 Openbravo SLU
+ * All portions are Copyright (C) 2010-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -544,12 +544,11 @@
 
         OBContext.setAdminMode();
         try {
-          // on error close popup
+          // on error close popup and rollback
           if (pinstance.getResult() == 0L) {
-            OBDal.getInstance().commitAndClose();
-            final PInstanceProcessData[] pinstanceData = PInstanceProcessData.select(this,
-                pinstance.getId());
-            myMessage = Utility.getProcessInstanceMessage(this, vars, pinstanceData);
+            OBDal.getInstance().rollbackAndClose();
+            myMessage = Utility.translateError(this, vars, vars.getLanguage(), pinstance
+                .getErrorMsg().replaceFirst("@ERROR=", ""));
             log4j.debug(myMessage.getMessage());
             vars.setMessage(strTabId, myMessage);
 
@@ -557,6 +556,7 @@
             if (strWindowPath.equals(""))
               strWindowPath = strDefaultServlet;
             printPageClosePopUp(response, vars, strWindowPath);
+
             return;
           }
         } finally {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/FundsTransferGLItemDefaultValueExpression.java	Tue Apr 24 06:49:23 2018 +0000
@@ -0,0 +1,121 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html 
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License. 
+ * The Original Code is Openbravo ERP. 
+ * The Initial Developer of the Original Code is Openbravo SLU 
+ * All portions are Copyright (C) 2018 Openbravo SLU 
+ * All Rights Reserved. 
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+ */
+package org.openbravo.advpaymentmngt.filterexpression;
+
+import java.util.Map;
+
+import org.apache.commons.lang.StringUtils;
+import org.codehaus.jettison.json.JSONException;
+import org.codehaus.jettison.json.JSONObject;
+import org.hibernate.Query;
+import org.openbravo.client.application.FilterExpression;
+import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.model.common.enterprise.Organization;
+import org.openbravo.model.financialmgmt.gl.GLItem;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * This class returns the default value for the GL Item Parameter of the Funds Transfer Process in
+ * Financial Account Window
+ */
+
+public class FundsTransferGLItemDefaultValueExpression implements FilterExpression {
+  private static final String INPAD_ORG_ID_PARAM = "inpadOrgId";
+  private static final String AD_ORG_ID_PARAM = "ad_org_id";
+  private static final Logger log = LoggerFactory
+      .getLogger(FundsTransferGLItemDefaultValueExpression.class);
+
+  @Override
+  public String getExpression(Map<String, String> requestMap) {
+    try {
+      final JSONObject context = new JSONObject(requestMap.get("context"));
+      final String organizationID = getOrganizationIdFromContext(context);
+      if (organizationID == null || StringUtils.isBlank(organizationID)) {
+        return null;
+      } else {
+        return getDefaultGLItemForOrganization(organizationID);
+      }
+    } catch (Exception e) {
+      log.error("Error trying to get default value of the Default GL Item: " + e.getMessage(), e);
+      return null;
+    }
+  }
+
+  private String getDefaultGLItemForOrganization(final String organizationId) {
+    OBContext.setAdminMode(true);
+    try {
+      final Organization organization = OBDal.getInstance().get(Organization.class, organizationId);
+      if (organization == null) {
+        return null;
+      }
+
+      if (organization.getAPRMGlitem() != null) {
+        return organization.getAPRMGlitem().getId();
+      } else {
+        return getDefaultGLItemFromOrganizationTree(organization);
+      }
+    } catch (Exception e) {
+      log.error("Impossible to get default GL Item for Funds Transfer\n" + " of organization id "
+          + organizationId, e);
+      return null;
+    } finally {
+      OBContext.restorePreviousMode();
+    }
+  }
+
+  private String getDefaultGLItemFromOrganizationTree(final Organization organization) {
+    StringBuilder hql = new StringBuilder("");
+    hql.append(" select p.aPRMGlitem ");
+    hql.append(" from OrganizationTree t ");
+    hql.append(" join t.parentOrganization p ");
+    hql.append(" join t.organization o ");
+    hql.append(" where o.id = :organizationId ");
+    hql.append(" and p.aPRMGlitem is not null ");
+    hql.append(" order by t.levelno asc ");
+
+    Query query = OBDal.getInstance().getSession().createQuery(hql.toString());
+    query.setParameter("organizationId", organization.getId());
+    query.setMaxResults(1);
+    final GLItem glItem = (GLItem) query.uniqueResult();
+    return glItem != null ? glItem.getId() : null;
+  }
+
+  private String getOrganizationIdFromContext(final JSONObject context) throws JSONException {
+    if (contextHasADOrgIDParam(context)) {
+      return context.getString(AD_ORG_ID_PARAM);
+    } else if (contextHasInpADOrgIDParam(context)) {
+      return context.getString(INPAD_ORG_ID_PARAM);
+    } else {
+      return null;
+    }
+  }
+
+  private boolean contextHasInpADOrgIDParam(final JSONObject context) throws JSONException {
+    return context.has(INPAD_ORG_ID_PARAM) && context.get(INPAD_ORG_ID_PARAM) != JSONObject.NULL
+        && StringUtils.isNotEmpty(context.getString(INPAD_ORG_ID_PARAM));
+  }
+
+  private boolean contextHasADOrgIDParam(final JSONObject context) throws JSONException {
+    return context.has(AD_ORG_ID_PARAM) && context.get(AD_ORG_ID_PARAM) != JSONObject.NULL
+        && StringUtils.isNotEmpty(context.getString(AD_ORG_ID_PARAM));
+  }
+
+}
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java	Tue Apr 24 06:49:23 2018 +0000
@@ -550,7 +550,7 @@
       if (vars != null) {
         DecimalFormat generalQtyRelationFmt = Utility.getFormat(vars, "generalQtyEdition");
         finTxnConvertRate = finTxnConvertRate.setScale(
-            generalQtyRelationFmt.getMaximumFractionDigits(), BigDecimal.ROUND_HALF_UP);
+            generalQtyRelationFmt.getMaximumFractionDigits(), RoundingMode.HALF_UP);
       }
     }
 
@@ -1391,7 +1391,7 @@
 
     BigDecimal overdueAmount = calculateOverdueAmount(invoicePaymentSchedule);
     invoice.setPercentageOverdue(overdueAmount.multiply(new BigDecimal("100"))
-        .divide(invoice.getGrandTotalAmount(), 2, BigDecimal.ROUND_HALF_UP).longValue());
+        .divide(invoice.getGrandTotalAmount(), 2, RoundingMode.HALF_UP).longValue());
 
     if (firstDueDate != null)
       invoice.setDaysTillDue(FIN_Utility.getDaysToDue(firstDueDate));
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java	Tue Apr 24 06:49:23 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-2017 Openbravo SLU
+ * All portions are Copyright (C) 2010-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -88,14 +88,16 @@
       else if ("CONSTANT".equals(parameter.getParameterType()))
         dao.getNewPaymentRunParameter(paymentRun, parameter, parameter.getDefaultTextValue());
     try {
-      this.paymentExecutionProcess = (FIN_PaymentExecutionProcess) Class.forName(
-          executionProcess.getJavaClassName()).newInstance();
+      this.paymentExecutionProcess = (FIN_PaymentExecutionProcess) Class
+          .forName(executionProcess.getJavaClassName()).getDeclaredConstructor().newInstance();
     } catch (InstantiationException e) {
       throw new NoExecutionProcessFoundException(e);
     } catch (IllegalAccessException e) {
       throw new NoExecutionProcessFoundException(e);
     } catch (ClassNotFoundException e) {
       throw new NoExecutionProcessFoundException(e);
+    } catch (ReflectiveOperationException e) {
+      throw new NoExecutionProcessFoundException(e);
     }
 
   }
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java	Tue Apr 24 06:49:23 2018 +0000
@@ -179,7 +179,7 @@
         grandTotalAmount = BigDecimal.ONE;
       }
       invoice.setPercentageOverdue(amounts.get("overdue").multiply(new BigDecimal(100))
-          .divide(grandTotalAmount, BigDecimal.ROUND_HALF_UP).longValue());
+          .divide(grandTotalAmount, RoundingMode.HALF_UP).longValue());
       invoice.setLastCalculatedOnDate(new Date());
 
       OBDal.getInstance().save(invoice);
@@ -426,10 +426,10 @@
       // payment amount * (generatedPaymentPaidAmount / generatedPaymentTotalAmount)
       BigDecimal paidAmountTmp = payment.getAmount().subtract(payment.getWriteoffAmount())
           .multiply(generatedPaymentPaidAmount)
-          .divide(generatedPaymentTotalAmount, BigDecimal.ROUND_HALF_UP);
+          .divide(generatedPaymentTotalAmount, RoundingMode.HALF_UP);
       // set scale of the currency using standard precision
       paidAmount = paidAmount.add(paidAmountTmp.setScale(payment.getCurrency()
-          .getStandardPrecision().intValue(), BigDecimal.ROUND_HALF_UP));
+          .getStandardPrecision().intValue(), RoundingMode.HALF_UP));
       // Add payment's write off amount to the paid amount
       paidAmount = paidAmount.add(getConvertedAmt(payment.getWriteoffAmount(), payment
           .getCurrency().getId(), strCurrencyTo, conversionDate, payment.getClient().getId(),
@@ -506,7 +506,7 @@
       }
       // payment amount * (generatedPaymentOverdueAmount / generatedPaymentTotalAmount)
       BigDecimal overdueAmountTmp = payment.getAmount().multiply(generatedPaymentOverdueAmount)
-          .divide(generatedPaymentTotalAmount, BigDecimal.ROUND_HALF_UP);
+          .divide(generatedPaymentTotalAmount, RoundingMode.HALF_UP);
       // set scale of the currency using standard precision
       overdueAmount = overdueAmount.add(overdueAmountTmp.setScale(payment.getCurrency()
           .getStandardPrecision().intValue(), RoundingMode.HALF_UP));
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java	Tue Apr 24 06:49:23 2018 +0000
@@ -252,7 +252,7 @@
         }
         bankStatementLine.setBusinessPartner(businessPartner);
         bankStatementLine.setGLItem(glItem);
-        bankStatementLine.setLineNo(new Long((counter + 1) * 10));
+        bankStatementLine.setLineNo((counter + 1) * 10L);
         OBDal.getInstance().save(bankStatementLine);
         counter++;
       } else {
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_MatchingTransaction.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_MatchingTransaction.java	Tue Apr 24 06:49:23 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-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -33,7 +33,8 @@
   public FIN_MatchingTransaction(String _algorithm) throws NoAlgorithmFoundException {
     try {
       if (_algorithm != null && !_algorithm.equals(""))
-        this.algorithm = (FIN_MatchingAlgorithm) Class.forName(_algorithm).newInstance();
+        this.algorithm = (FIN_MatchingAlgorithm) Class.forName(_algorithm).getDeclaredConstructor()
+            .newInstance();
       else
         throw new NoAlgorithmFoundException(
             "No algorithm has been defined to match bank statement lines");
@@ -43,6 +44,8 @@
       throw new NoAlgorithmFoundException(e);
     } catch (ClassNotFoundException e) {
       throw new NoAlgorithmFoundException(e);
+    } catch (ReflectiveOperationException e) {
+      throw new NoAlgorithmFoundException(e);
     }
   }
 
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java	Tue Apr 24 06:49:23 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-2017 Openbravo SLU
+ * All portions are Copyright (C) 2010-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -144,7 +144,7 @@
    * 
    * @param _strSelectedIds
    *          Identifiers string list with the following structure: ('ID', 'ID', 'ID')
-   * @return Map<K,V> using the ID as key and value <ID,ID> for each identifier.
+   * @return Map&lt;K,V&gt; using the ID as key and value &lt;ID,ID&gt; for each identifier.
    */
   public static Map<String, String> getMapFromStringList(String _strSelectedIds) {
     String strSelectedIds = _strSelectedIds;
@@ -277,9 +277,7 @@
    * @return the Document Type
    */
   public static DocumentType getDocumentType(Organization org, String docCategory) {
-    DocumentType outDocType = null;
     Client client = null;
-
     if ("0".equals(org.getId())) {
       client = OBContext.getOBContext().getCurrentClient();
       if ("0".equals(client.getId())) {
@@ -291,28 +289,30 @@
 
     OBContext.setAdminMode(false);
     try {
-      StringBuilder whereOrderByClause = new StringBuilder();
-      whereOrderByClause.append(" as dt where dt.organization.id in (");
-      whereOrderByClause.append(Utility.getInStrSet(new OrganizationStructureProvider()
-          .getParentTree(org.getId(), true)));
-      whereOrderByClause.append(") and dt.client.id = '" + client.getId()
-          + "' and dt.documentCategory = '" + docCategory + "' order by ad_isorgincluded('"
-          + org.getId() + "', dt.organization.id, '" + client.getId()
-          + "') , dt.default desc, dt.id desc");
+      StringBuilder where = new StringBuilder();
+      where.append(" as dt");
+      where.append(" where dt.organization.id in (:orgIdList)");
+      where.append(" and dt.client.id = :clientId");
+      where.append(" and dt.documentCategory = :docCategory");
+      where.append(" order by ad_isorgincluded(:orgId, dt.organization.id, :clientId)");
+      where.append(" , dt.default desc");
+      where.append(" , dt.id desc");
+
       OBQuery<DocumentType> dt = OBDal.getInstance().createQuery(DocumentType.class,
-          whereOrderByClause.toString());
+          where.toString());
       dt.setFilterOnReadableClients(false);
       dt.setFilterOnReadableOrganization(false);
       dt.setMaxResult(1);
+      dt.setNamedParameter("orgIdList",
+          new OrganizationStructureProvider().getParentTree(org.getId(), true));
+      dt.setNamedParameter("clientId", client.getId());
+      dt.setNamedParameter("docCategory", docCategory);
+      dt.setNamedParameter("orgId", org.getId());
 
-      List<DocumentType> dtList = dt.list();
-      if (dtList != null && !dtList.isEmpty()) {
-        outDocType = dtList.get(0);
-      }
+      return dt.uniqueResult();
     } finally {
       OBContext.restorePreviousMode();
     }
-    return outDocType;
   }
 
   /**
@@ -1050,8 +1050,23 @@
    * @return Formatted string.
    */
   public static String formatNumber(BigDecimal number) {
+    return formatNumber(number, "euro", "Edition");
+  }
+
+  /**
+   * Formats a number using the provided formatId and qualifier (see Format.xml) format.
+   * 
+   * @param number
+   *          Number to be formatted.
+   * @param formatId
+   *          euro, price, qty, etc.
+   * @param qualifier
+   *          Edition, Relation, etc,
+   * @return Formatted string.
+   */
+  public static String formatNumber(BigDecimal number, String formatId, String qualifier) {
     final UIDefinitionController.FormatDefinition formatDef = UIDefinitionController.getInstance()
-        .getFormatDefinition("euro", "Edition");
+        .getFormatDefinition(formatId, qualifier);
 
     String formatWithDot = formatDef.getFormat();
     DecimalFormatSymbols dfs = new DecimalFormatSymbols();
--- a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-fundsTransfer.js	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-fundsTransfer.js	Tue Apr 24 06:49:23 2018 +0000
@@ -34,5 +34,11 @@
     OB.RemoteCallManager.call('org.openbravo.advpaymentmngt.actionHandler.FundsTransferOnChangeDepositToActionHandler', {
       accountID: item.getValue()
     }, {}, callback);
+  },
+  onLoad: function (view) {
+    var form = view.theForm,
+        description = form.getItem('description');
+
+    description.setValue(OB.I18N.getLabel('FundsTransfer'));
   }
 };
\ No newline at end of file
--- a/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml	Tue Apr 24 06:49:23 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.33194]]></VERSION>
+<!--8A098711BB324335A19833286BDB093D-->  <VERSION><![CDATA[1.0.33768]]></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[PR18Q1.2]]></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	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Apr 24 06:49:23 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.33194]]></STARTVERSION>
+<!--1467C397BC5F4999A5606F39CD6FF8A4-->  <STARTVERSION><![CDATA[2.1.33768]]></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.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/ConnectionInitializerInterceptor.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/ConnectionInitializerInterceptor.java	Tue Apr 24 06:49:23 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-2017 Openbravo SLU
+ * All portions are Copyright (C) 2014-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -38,7 +38,8 @@
 public class ConnectionInitializerInterceptor extends JdbcInterceptor implements
     PoolInterceptorProvider {
 
-  private static final String INITIALIZED = "OB_INITIALIZED";
+  private static final String SESSION_CONFIG_APPLIED = "OB_INITIALIZED";
+  private static final String SESSION_INFO_APPLIED = "SESSION_INFO_INITIALIZED";
 
   String rbdms = (String) OBPropertiesProvider.getInstance().getOpenbravoProperties()
       .get("bbdd.rdbms");
@@ -51,11 +52,8 @@
   public void reset(ConnectionPool parent, PooledConnection con) {
     if (con != null) {
       HashMap<Object, Object> attributes = con.getAttributes();
-      Boolean connectionInitialized = (Boolean) attributes.get(INITIALIZED);
-      if (connectionInitialized == null || connectionInitialized == false) {
-        if (!isReadOnlyPool(parent)) {
-          SessionInfo.initDB(con.getConnection(), rbdms);
-        }
+      Boolean sessionInfoApplied = (Boolean) attributes.get(SESSION_CONFIG_APPLIED);
+      if (sessionInfoApplied == null || !sessionInfoApplied) {
         PreparedStatement pstmt = null;
         try {
           final Properties props = OBPropertiesProvider.getInstance().getOpenbravoProperties();
@@ -73,7 +71,24 @@
             throw new OBException(e);
           }
         }
-        attributes.put(INITIALIZED, true);
+        attributes.put(SESSION_CONFIG_APPLIED, true);
+      }
+
+      Boolean sessionInfoInitialized = (Boolean) attributes.get(SESSION_INFO_APPLIED);
+      if (sessionInfoInitialized == null || !sessionInfoInitialized) {
+        boolean initialized = false;
+        if (isReadOnlyPool(parent)) {
+          initialized = true;
+        } else {
+          // SessionInfo will be initialized when the SessionListener ServletContextListener is
+          // invoked. That listener will check if there are audited tables and notify SessionInfo,
+          // from then on SessionInfo will know whether the ad_context_info table should be created
+          if (SessionInfo.isInitialized()) {
+            SessionInfo.initDB(con.getConnection(), rbdms);
+            initialized = true;
+          }
+        }
+        attributes.put(SESSION_INFO_APPLIED, initialized);
       }
     }
   }
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Tue Apr 24 06:49:23 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.33194]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.33768]]></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[PR18Q1.2]]></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	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Apr 24 06:49:23 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.33194]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.33768]]></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.base.weld/src-test/org/openbravo/base/weld/test/ParameterCdiTestRule.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/ParameterCdiTestRule.java	Tue Apr 24 06:49:23 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 Openbravo SLU
+ * All portions are Copyright (C) 2015-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -63,19 +63,21 @@
   private void evaluateParamsToTarget(Statement base, Object target, FrameworkMethod method)
       throws Throwable {
     Field targetField = getTargetField(target);
-    if (!targetField.isAccessible()) {
+
+    // replace isAccesible() with canAccess() when JDK9 becomes the minimum supported version
+    @SuppressWarnings("all")
+    boolean isAccesible = targetField.isAccessible();
+    if (!isAccesible) {
       targetField.setAccessible(true);
     }
 
     for (Object param : params) {
       targetField.set(target, param);
 
-      log.info(
-          "============================================================================================================");
+      log.info("============================================================================================================");
       log.info("   Paremeterized test {}.{} ", target.getClass().getName(), method.getName());
       log.info("       {}: {}", targetField.getName(), param);
-      log.info(
-          "============================================================================================================");
+      log.info("============================================================================================================");
 
       base.evaluate();
     }
Binary file modules/org.openbravo.client.application/lib/runtime/httpclient-4.0.jar has changed
Binary file modules/org.openbravo.client.application/lib/runtime/httpclient-4.5.5.jar has changed
Binary file modules/org.openbravo.client.application/lib/runtime/httpcore-4.0.1.jar has changed
Binary file modules/org.openbravo.client.application/lib/runtime/httpcore-4.4.9.jar has changed
Binary file modules/org.openbravo.client.application/lib/runtime/httpmime-4.1.jar has changed
Binary file modules/org.openbravo.client.application/lib/runtime/httpmime-4.5.5.jar has changed
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Tue Apr 24 06:49:23 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.33194]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.33768]]></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[PR18Q1.2]]></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	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Apr 24 06:49:23 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.33194]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.33768]]></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.33194]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.33768]]></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.33194]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.33768]]></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.33194]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.33768]]></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/DisplayLogicAtServerLevelTest.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/DisplayLogicAtServerLevelTest.java	Tue Apr 24 06:49:23 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) 2016 Openbravo SLU
+ * All portions are Copyright (C) 2016-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -145,8 +145,10 @@
     Class<?> clazz = field.getClass();
     Method evaluateDisplayLogicAtServerLevel;
     try {
-      evaluateDisplayLogicAtServerLevel = clazz
-          .getDeclaredMethod("evaluateDisplayLogicAtServerLevel", String.class, String.class);
+      evaluateDisplayLogicAtServerLevel = clazz.getDeclaredMethod(
+          "evaluateDisplayLogicAtServerLevel", String.class, String.class);
+      // replace isAccesible() with canAccess() when JDK9 becomes the minimum supported version
+      @SuppressWarnings("all")
       boolean originallyAccessible = evaluateDisplayLogicAtServerLevel.isAccessible();
       evaluateDisplayLogicAtServerLevel.setAccessible(true);
       boolean evaluatedDisplayLogic = (boolean) evaluateDisplayLogicAtServerLevel.invoke(field,
--- a/modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/GenerateTypesJSTest.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/GenerateTypesJSTest.java	Tue Apr 24 06:49:23 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) 2009-2011 Openbravo SLU 
+ * All portions are Copyright (C) 2009-2018 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -30,6 +30,8 @@
 import org.openbravo.client.kernel.ComponentProvider;
 import org.openbravo.userinterface.smartclient.SmartClientComponentProvider;
 import org.openbravo.userinterface.smartclient.TypesComponent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Test the {@link TypesComponent} and its template.
@@ -37,6 +39,7 @@
  * @author mtaal
  */
 public class GenerateTypesJSTest extends WeldBaseTest {
+  private static final Logger log = LoggerFactory.getLogger(GenerateTypesJSTest.class);
 
   @Inject
   @ComponentProvider.Qualifier(SmartClientComponentProvider.QUALIFIER)
@@ -53,7 +56,7 @@
         TypesComponent.SC_TYPES_COMPONENT_ID, new HashMap<String, Object>());
 
     final String output = ComponentGenerator.getInstance().generate(component);
-    System.err.println(output);
+    log.debug(output);
   }
 
 }
\ No newline at end of file
--- a/modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/MenuTemplateTest.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/MenuTemplateTest.java	Tue Apr 24 06:49:23 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-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -27,6 +27,8 @@
 import org.openbravo.client.application.MainLayoutComponent;
 import org.openbravo.client.kernel.JSCompressor;
 import org.openbravo.client.kernel.JSLintChecker;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Tests the generating of the menu through a template, menu is part of the MainLayoutComponent, so
@@ -35,6 +37,7 @@
  * @author mtaal
  */
 public class MenuTemplateTest extends WeldBaseTest {
+  private static final Logger log = LoggerFactory.getLogger(MenuTemplateTest.class);
 
   @Inject
   private MainLayoutComponent mainLayoutComponent;
@@ -43,7 +46,7 @@
   public void testApplication() throws Exception {
     setTestAdminContext();
     final String javascript = mainLayoutComponent.generate();
-    System.err.println(javascript);
+    log.debug(javascript);
 
     // do jslint check
     JSLintChecker.getInstance().check(mainLayoutComponent.getId(), javascript);
@@ -55,6 +58,6 @@
     assertTrue(compressed.length() < javascript.length());
     assertTrue(!compressed.equals(javascript));
     assertTrue(compressed.length() > 0);
-    System.err.println(compressed);
+    log.debug(compressed);
   }
 }
--- a/modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/MenuTest.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/MenuTest.java	Tue Apr 24 06:49:23 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-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -26,6 +26,8 @@
 import org.openbravo.base.weld.test.WeldBaseTest;
 import org.openbravo.client.application.MenuManager;
 import org.openbravo.client.application.MenuManager.MenuOption;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Tests the reading of the menu in memory
@@ -33,6 +35,7 @@
  * @author iperdomo
  */
 public class MenuTest extends WeldBaseTest {
+  private static final Logger log = LoggerFactory.getLogger(MenuTest.class);
 
   @Inject
   private MenuManager menuManager;
@@ -43,9 +46,7 @@
   @Test
   public void testSystemAdministratorMenu() throws Exception {
     setSystemAdministratorContext();
-    final long time = System.currentTimeMillis();
     final MenuManager.MenuOption rootMenuOption = menuManager.getMenu();
-    System.err.println((System.currentTimeMillis() - time));
     dumpMenuOption(rootMenuOption, 0);
     assertFalse(menuManager.getSelectableMenuOptions().isEmpty());
   }
@@ -62,13 +63,16 @@
   }
 
   private void dumpMenuOption(MenuOption menuOption, int level) {
+    if (!log.isDebugEnabled()) {
+      return;
+    }
     final StringBuilder sb = new StringBuilder();
     for (int i = 0; i < level; i++) {
       sb.append(">");
     }
     sb.append(menuOption.getLabel());
     sb.append(" (" + menuOption.getType() + "): " + menuOption.getId());
-    System.err.println(sb.toString());
+    log.debug(sb.toString());
     for (MenuOption childOption : menuOption.getChildren()) {
       dumpMenuOption(childOption, level + 1);
     }
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java	Tue Apr 24 06:49:23 2018 +0000
@@ -41,7 +41,8 @@
 
 /**
  * Parses a dynamic expressions and extracts information, e.g. The expression is using a field or an
- * auxiliary input, etc. <br/>
+ * auxiliary input, etc.
+ * <p>
  * The transformation of @Expression@ is the following:
  * <ul>
  * <li>@ColumnName@ are transformed into property name, e.g. @DocStatus@ into <b>documentStatus</b></li>
@@ -250,7 +251,8 @@
 
   /**
    * Gets a JavaScript expression based on the dynamic expression, e.g @SomeColumn@!'Y' results in
-   * currentValues.someColumn !== true.<br/>
+   * currentValues.someColumn !== true.
+   * <p>
    * Note: Field comparison with <b>'Y'</b> or <b>'N'</b> are transformed in <b>true</b> or
    * <b>false</b>
    * 
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ExtraWindowSettingsInjector.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ExtraWindowSettingsInjector.java	Tue Apr 24 06:49:23 2018 +0000
@@ -35,7 +35,7 @@
    * method.
    * 
    * Using the WindowSettingsActionHandler.EXTRA_CALLBACK key it is possible to return a
-   * List<String> with JavaScript functions that are executed on the callback of the
+   * List&lt;String&gt; with JavaScript functions that are executed on the callback of the
    * WindowSettingsActionHandler execution. These functions only receive the "data" object as
    * argument.
    * 
@@ -46,7 +46,7 @@
    *          the parameters Map of the current WindowSettingsActionHandler execution.
    * @param json
    *          the JSONObject instance of the response of the WindowSettingsActionHandler.
-   * @return A Map<String, Object> with all the extra settings desired to be included in the
+   * @return A Map&lt;String, Object&gt; with all the extra settings desired to be included in the
    *         WindowSettingsActionHandler response.
    * @throws OBException
    */
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java	Tue Apr 24 06:49:23 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-2017 Openbravo SLU
+ * All portions are Copyright (C) 2010-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -483,13 +483,6 @@
       return menu;
     }
 
-    /**
-     * @deprecated Use instead setMenu(Menu menu, String userLanguageId)
-     */
-    public void setMenu(Menu menu) {
-      setMenu(menu, OBContext.getOBContext().getLanguage().getId());
-    }
-
     public void setMenu(Menu menu, String userLanguageId) {
       this.menu = menu;
       for (MenuTrl menuTrl : menu.getADMenuTrlList()) {
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/OBBindings.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/OBBindings.java	Tue Apr 24 06:49:23 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-2017 Openbravo SLU
+ * All portions are Copyright (C) 2010-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -30,8 +30,10 @@
 import org.openbravo.base.util.Check;
 import org.openbravo.base.util.OBClassLoader;
 import org.openbravo.base.weld.WeldUtils;
+import org.openbravo.client.application.window.ApplicationDictionaryCachedStructures;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
+import org.openbravo.model.ad.ui.Window;
 import org.openbravo.service.json.JsonUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -107,8 +109,8 @@
   /**
    * Checks if is a Sales Order transaction, based on the parameters of the HTTP request
    * 
-   * @return null if there is no request parameters, or the inpissotrx request parameter is not
-   *         available
+   * @return null if there is no request parameters, or if both the inpissotrx and inpwindowId
+   *         request parameters are not available
    */
   public Boolean isSalesTransaction() {
     if (requestMap == null) {
@@ -130,10 +132,23 @@
       return "Y".equalsIgnoreCase(value) || "true".equalsIgnoreCase(value);
     }
 
-    value = (String) httpSession.getAttribute(getWindowId() + "|ISSOTRX");
+    String windowId = getWindowId();
+    if (windowId == null) {
+      return null;
+    }
+
+    value = (String) httpSession.getAttribute(windowId + "|ISSOTRX");
     if (value != null) {
       return "Y".equalsIgnoreCase(value) || "true".equalsIgnoreCase(value);
     }
+
+    ApplicationDictionaryCachedStructures adcs = WeldUtils
+        .getInstanceFromStaticBeanManager(ApplicationDictionaryCachedStructures.class);
+
+    Window w = adcs.getWindow(windowId);
+    if (w != null) {
+      return w.isSalesTransaction();
+    }
     return null;
   }
 
@@ -271,7 +286,8 @@
             .forName(className));
       } catch (IllegalArgumentException e) {
         // try with OBClassLoader in case package is excluded by Weld
-        expr = (FilterExpression) OBClassLoader.getInstance().loadClass(className).newInstance();
+        expr = (FilterExpression) OBClassLoader.getInstance().loadClass(className)
+            .getDeclaredConstructor().newInstance();
       }
       return expr.getExpression(requestMap);
     } catch (Exception e) {
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ParameterUtils.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ParameterUtils.java	Tue Apr 24 06:49:23 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-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -24,8 +24,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
@@ -34,6 +32,7 @@
 import org.apache.log4j.Logger;
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
+import org.openbravo.base.expression.OBScriptEngine;
 import org.openbravo.base.model.Entity;
 import org.openbravo.base.model.ModelProvider;
 import org.openbravo.base.model.domaintype.BasePrimitiveDomainType;
@@ -59,6 +58,7 @@
  * @author iperdomo
  */
 public class ParameterUtils {
+
   private static Logger log = Logger.getLogger(ParameterUtils.class);
 
   public static void setParameterValue(ParameterValue parameterValue, JSONObject requestValue) {
@@ -269,16 +269,15 @@
   @SuppressWarnings("rawtypes")
   public static Object getJSExpressionResult(Map<String, String> parameters, HttpSession session,
       String expression) throws ScriptException {
-    final ScriptEngineManager manager = new ScriptEngineManager();
-    final ScriptEngine engine = manager.getEngineByName("js");
 
+    Map<String, Object> bindings = new HashMap<>();
     if (session != null) {
-      engine.put("OB", new OBBindings(OBContext.getOBContext(), parameters, session));
+      bindings.put("OB", new OBBindings(OBContext.getOBContext(), parameters, session));
     } else {
-      engine.put("OB", new OBBindings(OBContext.getOBContext(), parameters));
+      bindings.put("OB", new OBBindings(OBContext.getOBContext(), parameters));
     }
 
-    Object result = engine.eval(expression);
+    Object result = OBScriptEngine.getInstance().eval(expression, bindings);
     if (result instanceof Map) {
       // complex js object, convert it into a JSON
       result = new JSONObject((Map) result);
@@ -304,7 +303,7 @@
   }
 
   /**
-   * Returns a Map<String, String> with all parameters in the servlet request.
+   * Returns a Map&lt;String, String&gt; with all parameters in the servlet request.
    * 
    * @param request
    *          request taken in the servlet.
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ViewComponent.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ViewComponent.java	Tue Apr 24 06:49:23 2018 +0000
@@ -248,7 +248,6 @@
   @Override
   public String getETag() {
     String etag = super.getETag();
-
     return etag + "_" + getViewVersionHash();
   }
 
@@ -306,14 +305,14 @@
         viewVersions.append(t.getTable().isFullyAudited()).append("|");
       }
       viewVersions.append(getLastGridConfigurationChange(window)).append("|");
-      viewVersions.append(getLastSystemPrefrenceChange(window)).append("|");
+      viewVersions.append(getLastSystemPreferenceChange(window)).append("|");
       return DigestUtils.md5Hex(viewVersions.toString());
     } finally {
       OBContext.restorePreviousMode();
     }
   }
 
-  private String getLastSystemPrefrenceChange(Window window) {
+  private String getLastSystemPreferenceChange(Window window) {
     Set<String> preferences = new HashSet<String>();
 
     Pattern p = Pattern.compile(DynamicExpressionParser.REPLACE_DISPLAY_LOGIC_SERVER_PATTERN);
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachImplementationManager.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachImplementationManager.java	Tue Apr 24 06:49:23 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-2017 Openbravo SLU
+ * All portions are Copyright (C) 2015-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.math.BigDecimal;
+import java.nio.file.Files;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -67,7 +68,6 @@
 import org.openbravo.model.ad.utility.AttachmentMethod;
 import org.openbravo.model.common.enterprise.Organization;
 import org.openbravo.service.json.JsonUtils;
-import org.openbravo.utils.FileUtility;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -254,17 +254,15 @@
         throw new OBException(OBMessageUtils.messageBD("OBUIAPP_NoMethod"));
       }
       File file = handler.downloadFile(attachment);
-      FileUtility fileUt = null;
       if (file.exists()) {
-        fileUt = new FileUtility(file.getParent(), attachment.getName(), false, true);
+        Files.copy(file.toPath(), os);
       } else {
         throw new OBException(OBMessageUtils.messageBD("OBUIAPP_NoAttachmentFound"));
       }
 
-      fileUt.dumpFile(os);
       boolean isTempFile = handler.isTempFile();
       if (isTempFile) {
-        fileUt.deleteFile();
+        file.delete();
       }
 
     } catch (IOException e) {
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/ElementValueEventHandler.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/ElementValueEventHandler.java	Tue Apr 24 06:49:23 2018 +0000
@@ -115,7 +115,7 @@
     if (nodes.size() > 0) {
       TreeNode node = nodes.get(0);
       node.setReportSet(!isNumber ? rootNode : parent_ID);
-      node.setSequenceNumber(new Long(seqNo));
+      node.setSequenceNumber(Long.valueOf(seqNo));
       OBDal.getInstance().save(node);
     } else {
       TreeNode treeElement = OBProvider.getInstance().get(TreeNode.class);
@@ -123,7 +123,7 @@
       treeElement.setNode(account.getId());
       treeElement.setTree(account.getAccountingElement().getTree());
       treeElement.setReportSet(!isNumber ? rootNode : parent_ID);
-      treeElement.setSequenceNumber(new Long(seqNo));
+      treeElement.setSequenceNumber(Long.valueOf(seqNo));
       OBDal.getInstance().save(treeElement);
     }
 
@@ -176,7 +176,7 @@
     OBCriteria<TreeNode> obc = OBDal.getInstance().createCriteria(TreeNode.class);
     obc.add(Restrictions.eq(TreeNode.PROPERTY_TREE, tree));
     obc.add(Restrictions.eq(TreeNode.PROPERTY_REPORTSET, parentID));
-    obc.add(Restrictions.ge(TreeNode.PROPERTY_SEQUENCENUMBER, new Long(seqNo)));
+    obc.add(Restrictions.ge(TreeNode.PROPERTY_SEQUENCENUMBER, Long.valueOf(seqNo)));
     obc.setFilterOnReadableClients(false);
     obc.setFilterOnReadableOrganization(false);
     for (TreeNode node : obc.list()) {
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/ReorderCascadingChildDeletionsHandler.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/ReorderCascadingChildDeletionsHandler.java	Tue Apr 24 06:49:23 2018 +0000
@@ -39,13 +39,13 @@
  * child tables to not run into problems with the hibernate cascading delete order and the various
  * triggers attached to those tables.
  * 
- * So far this class has special handling for deletions of c_order & c_invoice. As explained in
+ * So far this class has special handling for deletions of c_order &amp; c_invoice. As explained in
  * issue 17199 there are triggers attached to c_orderlinetax which in some cases delete c_ordertax
  * entries attached to same order. As hibernate already scheduled deletion for those also, the
  * following deletion fails as the record is not longer present. This class works around that by
  * explicitely deleting c_ordertax entries on delete of c_order. (Same for c_invoicetax)
  * 
- * {@link "https://issues.openbravo.com/view.php?id=17199"}
+ * @see <a href="https://issues.openbravo.com/view.php?id=17199">Issue 17199</a>
  * 
  * @author shuehner
  */
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/RoleInfo.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/RoleInfo.java	Tue Apr 24 06:49:23 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-2017 Openbravo SLU
+ * All portions are Copyright (C) 2010-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -118,10 +118,10 @@
     orgWarehouses.setString("clientId", clientId);
     for (Object entry : orgWarehouses.list()) {
       RoleWarehouseInfo warehouseInfo = new RoleWarehouseInfo((Object[]) entry);
-      for (String orgId : organizationWarehouses.keySet()) {
-        Set<String> naturalTree = getOrganizationStructureProvider().getNaturalTree(orgId);
+      for (Map.Entry<String, List<RoleWarehouseInfo>> ow : organizationWarehouses.entrySet()) {
+        Set<String> naturalTree = getOrganizationStructureProvider().getNaturalTree(ow.getKey());
         if (naturalTree.contains(warehouseInfo.getWarehouseOrganizationId())) {
-          organizationWarehouses.get(orgId).add(warehouseInfo);
+          ow.getValue().add(warehouseInfo);
         }
       }
     }
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java	Tue Apr 24 06:49:23 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-2017 Openbravo SLU
+ * All portions are Copyright (C) 2010-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -215,11 +215,12 @@
   }
 
   /**
-   * The request map is <String, Object> because includes the HTTP request and HTTP session, is not
+   * The request map is &lt;String, Object&gt; because includes the HTTP request and HTTP session, is not
    * required to handle process parameters
    * 
    * @deprecated use {@link BaseProcessActionHandler#fixRequestMap(Map, JSONObject)}
    */
+  @Deprecated
   protected Map<String, String> fixRequestMap(Map<String, Object> parameters) {
     return fixRequestMap(parameters, null);
   }
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ApplicationDictionaryCachedStructures.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ApplicationDictionaryCachedStructures.java	Tue Apr 24 06:49:23 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-2018 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -29,7 +29,6 @@
 import org.hibernate.Hibernate;
 import org.hibernate.Query;
 import org.openbravo.base.exception.OBException;
-import org.openbravo.base.secureApp.VariablesSecureApp;
 import org.openbravo.client.application.Parameter;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.dal.service.OBQuery;
@@ -45,7 +44,6 @@
 import org.openbravo.model.ad.ui.Field;
 import org.openbravo.model.ad.ui.Tab;
 import org.openbravo.model.ad.ui.Window;
-import org.openbravo.service.db.DalConnectionProvider;
 import org.openbravo.userinterface.selector.Selector;
 import org.openbravo.userinterface.selector.SelectorField;
 import org.slf4j.Logger;
@@ -368,28 +366,6 @@
   }
 
   /**
-   * @deprecated use {@link #getComboTableData(Field)}
-   */
-  public ComboTableData getComboTableData(VariablesSecureApp vars, String ref, String colName,
-      String objectReference, String validation, String orgList, String clientList) {
-    String comboId = ref + colName + objectReference + validation + orgList + clientList;
-    if (useCache() && comboTableDataMap.get(comboId) != null) {
-      return comboTableDataMap.get(comboId);
-    }
-    ComboTableData comboTableData;
-    try {
-      comboTableData = new ComboTableData(vars, new DalConnectionProvider(false), ref, colName,
-          objectReference, validation, orgList, clientList, 0);
-    } catch (Exception e) {
-      throw new OBException("Error while computing combo table data for column " + colName, e);
-    }
-    if (useCache() && comboTableData.canBeCached()) {
-      comboTableDataMap.put(comboId, comboTableData);
-    }
-    return comboTableData;
-  }
-
-  /**
    * Returns the combo for the given field from cache if present, if not it also gets cached if
    * applicable.
    */
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java	Tue Apr 24 06:49:23 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-2017 Openbravo SLU 
+ * All portions are Copyright (C) 2010-2018 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -22,6 +22,7 @@
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -133,8 +134,6 @@
       tabId = readParameter(parameters, "TAB_ID");
       // The ID of the record. Only relevant on EDIT, CHANGE and SETSESSION modes
       rowId = readParameter(parameters, "ROW_ID");
-      // The IDs of the selected records in case more than one
-      String multipleRowIds[] = (String[]) parameters.get("MULTIPLE_ROW_IDS");
       // The column changed by the user. Only relevant on CHANGE mode
       String changedColumn = readParameter(parameters, "CHANGED_COLUMN");
       Tab tab = getTab(tabId);
@@ -295,10 +294,11 @@
       long t7 = System.currentTimeMillis();
       List<JSONObject> attachments = new ArrayList<JSONObject>();
       int attachmentCount = 0;
-      if (multipleRowIds != null) {
-        attachmentCount = computeAttachmentCount(tab, multipleRowIds, true);
+      if (jsContent.has("MULTIPLE_ROW_IDS")) {
+        attachmentCount = computeAttachmentCount(tab,
+            convertJSONArray(jsContent.getJSONArray("MULTIPLE_ROW_IDS")), true);
       } else {
-        attachmentCount = computeAttachmentCount(tab, new String[] { rowId }, false);
+        attachmentCount = computeAttachmentCount(tab, Arrays.asList(rowId), false);
       }
 
       // Notes information
@@ -397,7 +397,7 @@
    *          flag to not return the actual count just 1 or 0
    * @return count of attachment found for the given records.
    */
-  private int computeAttachmentCount(Tab tab, String[] recordIds, boolean doExists) {
+  private int computeAttachmentCount(Tab tab, List<String> recordIds, boolean doExists) {
     String tableId = tab.getTable().getId();
     OBCriteria<Attachment> attachmentFiles = OBDao.getFilteredCriteria(Attachment.class,
         Restrictions.eq("table.id", tableId), Restrictions.in("record", recordIds));
@@ -424,15 +424,15 @@
   }
 
   private List<String> convertJSONArray(JSONArray jsonArray) {
-    List<String> visibleProperties = new ArrayList<String>();
+    List<String> elements = new ArrayList<String>(jsonArray.length());
     for (int i = 0; i < jsonArray.length(); i++) {
       try {
-        visibleProperties.add(jsonArray.getString(i));
+        elements.add(jsonArray.getString(i));
       } catch (JSONException e) {
         throw new OBException("Error while reading the visible properties JSON array");
       }
     }
-    return visibleProperties;
+    return elements;
   }
 
   private JSONObject buildJSONObject(String mode, Tab tab, Map<String, JSONObject> columnValues,
@@ -1484,7 +1484,7 @@
           calloutObject = calloutInstances.get(calloutClassName);
           isCalloutInitialized = true;
         } else {
-          calloutObject = calloutClass.newInstance();
+          calloutObject = calloutClass.getDeclaredConstructor().newInstance();
           calloutInstances.put(calloutClassName, calloutObject);
         }
 
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java	Tue Apr 24 06:49:23 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-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -28,14 +28,13 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
+import org.openbravo.base.expression.OBScriptEngine;
 import org.openbravo.base.model.Entity;
 import org.openbravo.base.model.ModelProvider;
 import org.openbravo.base.model.Property;
@@ -1575,14 +1574,12 @@
       String translatedDisplayLogic = DynamicExpressionParser
           .replaceSystemPreferencesInDisplayLogic(displayLogicEvaluatedInTheServer);
 
-      final ScriptEngineManager manager = new ScriptEngineManager();
-      final ScriptEngine engine = manager.getEngineByName("js");
       boolean result;
 
       DynamicExpressionParser parser = new DynamicExpressionParser(translatedDisplayLogic, tab);
 
       try {
-        result = (Boolean) engine.eval(parser.getJSExpression());
+        result = (Boolean) OBScriptEngine.getInstance().eval(parser.getJSExpression());
       } catch (ScriptException e) {
         log.error(
             "Error while evaluating the Display Logic at Server Level. Error in field with id: "
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js	Tue Apr 24 06:49:23 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-2017 Openbravo SLU
+ * All portions are Copyright (C) 2010-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -690,9 +690,8 @@
 }(OB, isc));
 
 isc.ClassFactory.defineClass('OBUIAPP_RegistrationView', isc.Layout).addProperties({
-  initWidget: function () {
+  showsItself: true,
+  show: function () {
     OB.Layout.ClassicOBCompatibility.Popup.openRegistration();
-
-    this.Super('initWidget', arguments);
   }
 });
\ No newline at end of file
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js	Tue Apr 24 06:49:23 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-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -66,6 +66,7 @@
     // the value for the filter and the display are the same: the identifier
     this.displayField = this.criteriaDisplayField || OB.Constants.IDENTIFIER;
     this.valueField = this.criteriaDisplayField || OB.Constants.IDENTIFIER;
+    this.keyProperty = this.keyProperty || OB.Constants.ID;
     // if this field was being filtered by its id before being recreated, reset its filter type an its filterAuxCache
     if (this.grid && this.grid.sourceWidget && this.grid.sourceWidget.filterByIdFields && this.grid.sourceWidget.filterByIdFields.contains(this.name)) {
       this.filterType = 'id';
@@ -733,17 +734,17 @@
     }
 
     for (i = 0; i < records.length; i++) {
-      recordIds.add(records[i][OB.Constants.ID]);
+      recordIds.add(records[i][this.keyProperty]);
     }
     return recordIds;
   },
 
-  getRecordIdentifierFromId: function (id) {
-    var recordIdentifier;
-    if (this.pickList && this.pickList.data.find(OB.Constants.ID, id)) {
-      recordIdentifier = this.pickList.data.find(OB.Constants.ID, id)[OB.Constants.IDENTIFIER];
-    } else if (this.filterAuxCache && this.filterAuxCache.find(OB.Constants.ID, id)) {
-      recordIdentifier = this.filterAuxCache.find(OB.Constants.ID, id)[OB.Constants.IDENTIFIER];
+  getRecordIdentifierFromId: function (keyValue) {
+    var recordIdentifier, keyProperty = this.keyProperty || OB.Constants.ID;
+    if (this.pickList && this.pickList.data.find(keyProperty, keyValue)) {
+      recordIdentifier = this.pickList.data.find(keyProperty, keyValue)[OB.Constants.IDENTIFIER];
+    } else if (this.filterAuxCache && this.filterAuxCache.find(keyProperty, keyValue)) {
+      recordIdentifier = this.filterAuxCache.find(keyProperty, keyValue)[OB.Constants.IDENTIFIER];
     }
     return recordIdentifier;
   },
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree.js	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree.js	Tue Apr 24 06:49:23 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-2017 Openbravo SLU
+ * All portions are Copyright (C) 2013-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -299,7 +299,7 @@
       var target = window[dsRequest.componentId];
       dsRequest.params = dsRequest.params || {};
       dsRequest.params._startRow = 0;
-      dsRequest.params._endRow = OB.Properties.TreeDatasourceFetchLimit;
+      dsRequest.params._endRow = OB.Properties.TreeDatasourceFetchLimit || OB.Constants.TREE_DS_DEFAULT_FETCH_LIMIT;
       dsRequest.params.treeReferenceId = target.treeItem.treeReferenceId;
       var contextInfo = target.treeItem.form.view.getContextInfo(false, true);
       isc.addProperties(dsRequest.params, contextInfo);
@@ -544,7 +544,7 @@
               contextInfo;
           dsRequest.params = dsRequest.params || {};
           dsRequest.params._startRow = 0;
-          dsRequest.params._endRow = OB.Properties.TreeDatasourceFetchLimit;
+          dsRequest.params._endRow = OB.Properties.TreeDatasourceFetchLimit || OB.Constants.TREE_DS_DEFAULT_FETCH_LIMIT;
           dsRequest.params.treeReferenceId = target.treeItem.treeReferenceId;
           contextInfo = target.treeItem.form.view.getContextInfo(false, true);
           isc.addProperties(dsRequest.params, contextInfo);
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js	Tue Apr 24 06:49:23 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-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -1023,7 +1023,7 @@
     var filterField, criterion, filterLength = criteria.criteria.length,
         fkFilterAuxCache = [],
         innerCache = [],
-        filterEditForm, cacheElement, i, j;
+        filterEditForm, cacheElement, i, j, keyProperty;
     if (!this.filterEditor || !this.filterEditor.getEditForm()) {
       return fkFilterAuxCache;
     }
@@ -1033,18 +1033,19 @@
       filterField = filterEditForm.getField(criterion.fieldName);
       innerCache = [];
       if (filterField && filterField.filterType === 'id') {
+        keyProperty = this.getKeyProperty(criterion.fieldName);
         if (criterion.criteria) {
           for (j = 0; j < criterion.criteria.length; j++) {
             cacheElement = {};
             cacheElement.fieldName = criterion.criteria[j].fieldName;
-            cacheElement[OB.Constants.ID] = criterion.criteria[j].value;
+            cacheElement[keyProperty] = criterion.criteria[j].value;
             cacheElement[OB.Constants.IDENTIFIER] = filterField.getRecordIdentifierFromId(criterion.criteria[j].value);
             innerCache.add(cacheElement);
           }
         } else {
           cacheElement = {};
           cacheElement.fieldName = criterion.fieldName;
-          cacheElement[OB.Constants.ID] = criterion.value;
+          cacheElement[keyProperty] = criterion.value;
           cacheElement[OB.Constants.IDENTIFIER] = filterField.getRecordIdentifierFromId(criterion.value);
           innerCache.add(cacheElement);
         }
@@ -1057,6 +1058,15 @@
     return fkFilterAuxCache;
   },
 
+  getKeyProperty: function (fieldName) {
+    var keyProperty = OB.Constants.ID,
+        field = this.getFieldByName(fieldName);
+    if (field && field.filterEditorProperties && field.filterEditorProperties.keyProperty) {
+      keyProperty = field.filterEditorProperties.keyProperty;
+    }
+    return keyProperty;
+  },
+
   setNewRecordFilterMessage: function () {
     var showMessageProperty, showMessage;
 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Tue Apr 24 06:49:23 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-2017 Openbravo SLU
+ * All portions are Copyright (C) 2010-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -1215,7 +1215,7 @@
   // loads the foreign key filter auxiliary cache of all the filter fields that were using the 'id' filter type when the view was saved
   loadFilterAuxiliaryCache: function (filterAuxCache) {
     var i, cacheElement, filterField;
-    if (!filterAuxCache || !isc.isA.Array(filterAuxCache) || filterAuxCache.length === 0) {
+    if (!this.canLoadFilterAuxiliaryCache(filterAuxCache)) {
       return;
     }
     for (i = 0; i < filterAuxCache.length; i++) {
@@ -1228,6 +1228,10 @@
     }
   },
 
+  canLoadFilterAuxiliaryCache: function (filterAuxCache) {
+    return filterAuxCache && isc.isA.Array(filterAuxCache) && filterAuxCache.length > 0 && this.filterEditor && this.filterEditor.getEditForm();
+  },
+
   // overridden to also store the group mode
   // http://forums.smartclient.com/showthread.php?p=93877#post93877
   getGroupState: function () {
@@ -2673,7 +2677,7 @@
         }
       }
     }
-    if (this.filterEditor) {
+    if (this.filterEditor && this.filterEditor.getEditForm()) {
       this.filterEditor.getEditForm().setValue(this.getCheckboxField().name, newValue);
       this.filterEditor.getEditForm().getField(this.getCheckboxField().name).defaultValue = newValue;
     }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Tue Apr 24 06:49:23 2018 +0000
@@ -1750,7 +1750,7 @@
         // session attributes of the form
         contextInfo = this.getContextInfo(false, true, true);
         this.addPreferenceValues(contextInfo, tabViewPane);
-        if (tabViewPane.showTabIf && !(tabViewPane.showTabIf(contextInfo))) {
+        if (!this.isOpenedByDirectLink() && tabViewPane.showTabIf && !(tabViewPane.showTabIf(contextInfo))) {
           this.childTabSet.tabBar.members[i].hide();
           tabViewPane.hidden = true;
         } else {
@@ -1792,6 +1792,10 @@
     }
   },
 
+  isOpenedByDirectLink: function () {
+    return this.standardWindow.directTabInfo;
+  },
+
   //This function returns true if it is a new record and it is being edited
   isEditingNewRecord: function () {
     var form = this.isShowingForm ? this.viewForm : this.viewGrid.getEditForm();
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js	Tue Apr 24 06:49:23 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-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -921,6 +921,7 @@
       return;
     }
     contextInfo = isc.addProperties({}, this.view.parentWindow.activeView.getContextInfo(false, true, true, true));
+    isc.addProperties(contextInfo, this.viewProperties.standardProperties);
     record = isc.addProperties({}, this.getRecord(rowNum), this.getEditValues(rowNum));
     fields = this.viewProperties.fields;
     len = fields.length;
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js	Tue Apr 24 06:49:23 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-2017 Openbravo SLU
+ * All portions are Copyright (C) 2010-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):   Sreedhar Sirigiri (TDS), Mallikarjun M (TDS)
  ************************************************************************
@@ -1342,13 +1342,13 @@
             ROW_ID: currentValues.id
           };
           multipleSelectedRowIds = [];
+          allProperties = currentContext.getContextInfo(false, true, false, true);
           if (selectedRecords.size() > 1) {
             for (i = 0; i < selectedRecords.size(); i++) {
               multipleSelectedRowIds[i] = selectedRecords[i].id;
             }
-            requestParams.MULTIPLE_ROW_IDS = multipleSelectedRowIds;
+            allProperties.MULTIPLE_ROW_IDS = multipleSelectedRowIds;
           }
-          allProperties = currentContext.getContextInfo(false, true, false, true);
           if (currentContext.viewGrid && currentContext.viewGrid.fields) {
             len = currentContext.viewGrid.fields.length;
             for (i = 0; i < len; i++) {
@@ -1374,6 +1374,7 @@
         TAB_ID: this.view.tabId
       };
       multipleSelectedRowIds = [];
+      allProperties = this.view.getContextInfo(false, true, false, true);
       if (selectedRecords.size() >= 1) {
         for (i = 0; i < selectedRecords.size(); i++) {
           if (i === 0) {
@@ -1382,10 +1383,9 @@
           multipleSelectedRowIds[i] = selectedRecords[i].id;
         }
         if (selectedRecords.size() > 1) {
-          requestParams.MULTIPLE_ROW_IDS = multipleSelectedRowIds;
+          allProperties.MULTIPLE_ROW_IDS = multipleSelectedRowIds;
         }
       }
-      allProperties = this.view.getContextInfo(false, true, false, true);
       OB.RemoteCallManager.call('org.openbravo.client.application.window.FormInitializationComponent', allProperties, requestParams, function (response, data, request) {
         var attachmentExists = data.attachmentExists,
             auxInputs = data.auxiliaryInputValues,
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Tue Apr 24 06:49:23 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.33194]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.33768]]></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[PR18Q1.2]]></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	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Apr 24 06:49:23 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.33194]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.33768]]></STARTVERSION>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Tue Apr 24 06:49:23 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.33194]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.33768]]></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[PR18Q1.2]]></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	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Apr 24 06:49:23 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.33194]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.33768]]></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.33194]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.33768]]></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.33194]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.33768]]></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/KernelConstants.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelConstants.java	Tue Apr 24 06:49:23 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) 2009-2017 Openbravo SLU 
+ * All portions are Copyright (C) 2009-2018 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -50,15 +50,8 @@
   /**
    * @deprecated use {@link #SKIN_PARAMETER}
    */
+  @Deprecated
   public static final String SKIN_VERSION_PARAMETER = "_skinVersion";
-  /**
-   * @deprecated use {@link #SKIN_DEFAULT}
-   */
-  public static final String SKIN_VERSION_300 = "3.00";
-  /**
-   * @deprecated use {@link #SKIN_CLASSIC}
-   */
-  public static final String SKIN_VERSION_CLASSIC = "2.50_emulation";
 
   public static final String SKIN_PARAMETER = "_skinVersion";
   public static final String SKIN_DEFAULT = "Default";
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/TemplateResolver.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/TemplateResolver.java	Tue Apr 24 06:49:23 2018 +0000
@@ -31,7 +31,7 @@
  * the dependencies etc.) and also takes care of using overriding templates. So each template is
  * replaced by its overriding template in the result list. Templates are returned in dependency
  * order. This means the following.
- * <p/>
+ * <p>
  * Say there is dependency tree: A depends on B and C, B depends on D and E, C depends on F and G
  * 
  * Then the returned result is computed depth-first: D, E, B, F, G, C, A
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java	Tue Apr 24 06:49:23 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-2017 Openbravo SLU 
+ * All portions are Copyright (C) 2010-2018 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -83,10 +83,21 @@
         append = append + ", showFkDropdownUnfiltered: " + showFkDropdownUnfiltered.toString();
       }
     }
+    if (field != null) {
+      Property keyProperty = getKeyProperty(field);
+      if (keyProperty != null) {
+        append = append + ", keyProperty: '" + keyProperty.getName() + "'";
+      }
+    }
 
     return super.getFilterEditorPropertiesProperty(field) + append;
   }
 
+  private Property getKeyProperty(Field field) {
+    return KernelUtils.getInstance().getPropertyFromColumn(field.getColumn())
+        .getReferencedProperty();
+  }
+
   @Override
   public String getGridFieldProperties(Field field) {
     final Property prop = KernelUtils.getInstance().getPropertyFromColumn(field.getColumn());
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinitionController.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinitionController.java	Tue Apr 24 06:49:23 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) 2009-2016 Openbravo SLU 
+ * All portions are Copyright (C) 2009-2018 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -184,7 +184,7 @@
         if (uiDefinition.isActive()) {
           final Class<?> clz = OBClassLoader.getInstance().loadClass(
               uiDefinition.getImplementationClassname());
-          return (UIDefinition) clz.newInstance();
+          return (UIDefinition) clz.getDeclaredConstructor().newInstance();
         }
       }
     }
@@ -194,7 +194,7 @@
     }
     // the default
     log.warn("No user interface definition found for reference " + reference);
-    return StringUIDefinition.class.newInstance();
+    return StringUIDefinition.class.getDeclaredConstructor().newInstance();
   }
 
   private synchronized Map<String, FormatDefinition> setInitializeComputeFormatDefinitions() {
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl	Tue Apr 24 06:49:23 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) 2009-2017 Openbravo SLU
+ * All portions are Copyright (C) 2009-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -73,7 +73,8 @@
         ERROR : 'error',
         IS_PICK_AND_EDIT : '_isPickAndEdit',
         SELECTED_PROPERTIES : '_selectedProperties',
-        EXTRA_PROPERTIES : '_extraProperties'
+        EXTRA_PROPERTIES : '_extraProperties',
+        TREE_DS_DEFAULT_FETCH_LIMIT : 200
     },
 
     Styles : {
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Tue Apr 24 06:49:23 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.33194]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.33768]]></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[PR18Q1.2]]></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	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Apr 24 06:49:23 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.33194]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.33768]]></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.33194]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.33768]]></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.myob/src/org/openbravo/client/myob/MyOpenbravoComponent.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponent.java	Tue Apr 24 06:49:23 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-2017 Openbravo SLU
+ * All portions are Copyright (C) 2010-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -141,6 +141,7 @@
     hql.append("SELECT widgetClassAccess.widgetClass.id ");
     hql.append("FROM OBKMO_WidgetClassAccess widgetClassAccess ");
     hql.append("WHERE widgetClassAccess.role.id=:roleId ");
+    hql.append("AND widgetClassAccess.active=true ");
     if (!StringUtils.isEmpty(additionalWhereClause)) {
       hql.append(additionalWhereClause);
     }
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Tue Apr 24 06:49:23 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.33194]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.33768]]></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[PR18Q1.2]]></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	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Apr 24 06:49:23 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.33194]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.33768]]></STARTVERSION>
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Tue Apr 24 06:49:23 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.33194]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.33768]]></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[PR18Q1.2]]></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	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Apr 24 06:49:23 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.33194]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.33768]]></STARTVERSION>
 <!--FF8080812D842086012D845002070046-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080812D842086012D845002070046-->  <DEPENDANT_MODULE_NAME><![CDATA[Workspace & Widgets]]></DEPENDANT_MODULE_NAME>
 <!--FF8080812D842086012D845002070046-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Tue Apr 24 06:49:23 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.33194]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.33768]]></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[PR18Q1.2]]></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	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Apr 24 06:49:23 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.33194]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.33768]]></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.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java	Tue Apr 24 06:49:23 2018 +0000
@@ -1007,8 +1007,8 @@
           Utility.messageBD(readOnlyCP, "No", vars.getLanguage()));
     }
 
-    parameters.put("ONE_ASTERISK_SHOW", new Boolean(showAsterisk(data, "*")));
-    parameters.put("TWO_ASTERISK_SHOW", new Boolean(showAsterisk(data, "**")));
+    parameters.put("ONE_ASTERISK_SHOW", showAsterisk(data, "*"));
+    parameters.put("TWO_ASTERISK_SHOW", showAsterisk(data, "**"));
 
     if (data != null) {
       renderJR(vars, response, strReportName, strOutput, parameters, data, null);
--- a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java	Tue Apr 24 06:49:23 2018 +0000
@@ -11,7 +11,7 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2009-2017 Openbravo SL 
+ * All portions are Copyright (C) 2009-2018 Openbravo SL 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -20,6 +20,7 @@
 package org.openbravo.financial.paymentreport.erpCommon.ad_reports;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -969,14 +970,14 @@
                   data,
                   "BASE_AMOUNT",
                   transAmount.multiply(convRate.getMultipleRateBy())
-                      .setScale(stdPrecission, BigDecimal.ROUND_HALF_UP).toString());
+                      .setScale(stdPrecission, RoundingMode.HALF_UP).toString());
             } else {
               FieldProviderFactory.setField(data, "TRANS_AMOUNT", transAmount.negate().toString());
               FieldProviderFactory.setField(
                   data,
                   "BASE_AMOUNT",
                   transAmount.multiply(convRate.getMultipleRateBy())
-                      .setScale(stdPrecission, BigDecimal.ROUND_HALF_UP).negate().toString());
+                      .setScale(stdPrecission, RoundingMode.HALF_UP).negate().toString());
             }
           } else {
             String message = transCurrency.getISOCode() + " -> " + baseCurrency.getISOCode() + " "
@@ -1020,7 +1021,7 @@
         if (convRate != null) {
           final int stdPrecission = convRate.getToCurrency().getStandardPrecision().intValue();
           balance = balance.multiply(convRate.getMultipleRateBy()).setScale(stdPrecission,
-              BigDecimal.ROUND_HALF_UP);
+              RoundingMode.HALF_UP);
         }
         FieldProviderFactory.setField(data, "BALANCE", balance.toString());
 
@@ -1077,13 +1078,13 @@
                     previousRow,
                     "BASE_AMOUNT",
                     amountSum.multiply(previousConvRate.getMultipleRateBy())
-                        .setScale(stdPrecission, BigDecimal.ROUND_HALF_UP).toString());
+                        .setScale(stdPrecission, RoundingMode.HALF_UP).toString());
               } else {
                 FieldProviderFactory.setField(
                     previousRow,
                     "BASE_AMOUNT",
                     amountSum.multiply(previousConvRate.getMultipleRateBy())
-                        .setScale(stdPrecission, BigDecimal.ROUND_HALF_UP).negate().toString());
+                        .setScale(stdPrecission, RoundingMode.HALF_UP).negate().toString());
               }
             }
 
@@ -1178,13 +1179,13 @@
                 previousRow,
                 "BASE_AMOUNT",
                 amountSum.multiply(previousConvRate.getMultipleRateBy())
-                    .setScale(stdPrecission, BigDecimal.ROUND_HALF_UP).toString());
+                    .setScale(stdPrecission, RoundingMode.HALF_UP).toString());
           } else {
             FieldProviderFactory.setField(
                 previousRow,
                 "BASE_AMOUNT",
                 amountSum.multiply(previousConvRate.getMultipleRateBy())
-                    .setScale(stdPrecission, BigDecimal.ROUND_HALF_UP).negate().toString());
+                    .setScale(stdPrecission, RoundingMode.HALF_UP).negate().toString());
           }
         }
 
@@ -1372,7 +1373,7 @@
             transactionData,
             "BASE_AMOUNT",
             transAmount.multiply(convRate.getMultipleRateBy())
-                .setScale(stdPrecission, BigDecimal.ROUND_HALF_UP).toString());
+                .setScale(stdPrecission, RoundingMode.HALF_UP).toString());
       } else {
         String message = transaction.getCurrency().getISOCode() + " -> "
             + baseCurrency.getISOCode() + " " + strConversionDate;
@@ -2140,20 +2141,26 @@
 
   public java.util.List<Invoice> getInvoicesUsingCredit(final FIN_Payment payment) {
     final StringBuilder sql = new StringBuilder();
-    final java.util.List<Invoice> result = new ArrayList<Invoice>();
+    final java.util.List<Invoice> result = new ArrayList<>();
 
-    sql.append(" select distinct(pdv.invoicePaymentPlan.invoice.id) ");
-    sql.append(" from FIN_Payment_Credit pc, FIN_Payment p0, ");
-    sql.append("      FIN_Payment p1, FIN_Payment_Detail_V pdv  ");
-    sql.append(" where p0.id=pc.creditPaymentUsed ");
-    sql.append(" and pc.payment=p1.id ");
-    sql.append(" and pdv.payment=p1.id ");
-    sql.append(" and p0.id = '" + payment.getId() + "' ");
+    sql.append(" select distinct(psiv.invoice.id) ");
+    sql.append(" from FIN_Payment_Sched_Inv_V psiv ");
+    sql.append(" where exists (");
+    sql.append("   select 1 ");
+    sql.append("   from FIN_Payment_Credit pc");
+    sql.append("   , FIN_Payment_Detail pd");
+    sql.append("   , FIN_Payment_ScheduleDetail psd");
+    sql.append("   where pc.payment.id = pd.finPayment.id");
+    sql.append("   and pd.id = psd.paymentDetails.id");
+    sql.append("   and pc.creditPaymentUsed.id = :paymentId");
+    sql.append("   and psd.invoicePaymentSchedule.id = psiv.id");
+    sql.append(" )");
 
     try {
       OBContext.setAdminMode(true);
       final Session session = OBDal.getReadOnlyInstance().getSession();
       final Query query = session.createQuery(sql.toString());
+      query.setParameter("paymentId", payment.getId());
       for (final Object o : query.list()) {
         result.add(OBDal.getReadOnlyInstance().get(Invoice.class, o));
       }
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Tue Apr 24 06:49:23 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.33194]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.33768]]></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[PR18Q1.2]]></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	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Apr 24 06:49:23 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.33194]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.33768]]></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.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped_data.xsql	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped_data.xsql	Tue Apr 24 06:49:23 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) 2009-2016 Openbravo SLU
+ * All portions are Copyright (C) 2009-2018 Openbravo SLU
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -23,29 +23,22 @@
   <SqlMethod name="select" type="preparedStatement" return="multiple">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
-    <![CDATA[SELECT ORG.NAME AS ORGNAME, BP.NAME AS BPNAME, 
+    <![CDATA[SELECT ORGNAME, BPNAME, DOCUMENTNO, POREFERENCE,
+       DATEORDERED, DATEPROMISED, DELIVERYRULE, DELIVERYLOCATION,
+       PRODNAME, M_ATTRIBUTESETINSTANCE_ID, ORDEREDQTY, PENDINGQTY,
+       STOCKVALUE || ' ' || UOMSYMBOL AS QTYINSTOCK, AUMQTY,
+       (SELECT UOMSYMBOL FROM C_UOM WHERE C_UOM_ID = AUM) AS AUMSYMBOL, AUM,
+       M_PRODUCT_ID, ORDEREDVALUE, PENDINGVALUE, STOCKVALUE
+    FROM
+    (
+    SELECT ORG.NAME AS ORGNAME, BP.NAME AS BPNAME,
     O.DOCUMENTNO, O.POREFERENCE, TO_DATE(O.DATEORDERED) AS DATEORDERED, TO_DATE(O.DATEPROMISED) AS DATEPROMISED, 
     REFLISTV.NAME AS DELIVERYRULE, COALESCE(DLOC.NAME, BPADD.NAME) AS DELIVERYLOCATION,
     PR.NAME || ' ' || COALESCE(TO_CHAR(ASI.DESCRIPTION), '') AS PRODNAME, OL.M_ATTRIBUTESETINSTANCE_ID,
     OL.QTYORDERED || ' ' || COALESCE(TO_CHAR(UO.UOMSYMBOL), '') AS ORDEREDQTY, 
     (OL.QTYORDERED-OL.QTYDELIVERED) || ' ' || COALESCE(TO_CHAR(UO.UOMSYMBOL), '') AS PENDINGQTY, 
-    (
-      SELECT SUM(SD.QTYONHAND)
-      FROM M_STORAGE_DETAIL SD
-      WHERE SD.M_PRODUCT_ID = OL.M_PRODUCT_ID
-      AND SD.C_UOM_ID = OL.C_UOM_ID
-      AND COALESCE(SD.M_ATTRIBUTESETINSTANCE_ID, '0') = COALESCE(OL.M_ATTRIBUTESETINSTANCE_ID, SD.M_ATTRIBUTESETINSTANCE_ID, '0')
-      AND COALESCE(SD.M_PRODUCT_UOM_ID,'-1') = COALESCE(OL.M_PRODUCT_UOM_ID, '-1')
-      AND EXISTS (
-        SELECT 1
-        FROM M_LOCATOR LOC
-        WHERE LOC.M_LOCATOR_ID = SD.M_LOCATOR_ID
-        AND LOC.M_WAREHOUSE_ID = OL.M_WAREHOUSE_ID
-      )
-    ) || ' ' || COALESCE(TO_CHAR(UO.UOMSYMBOL), '') AS QTYINSTOCK,
-    OL.AUMQTY,
-    (CASE WHEN COALESCE(OL.C_AUM,'0') = '0' THEN (SELECT UOMSYMBOL FROM C_UOM WHERE C_UOM_ID = M_GET_DEFAULT_AUM_FOR_DOCUMENT(OL.M_PRODUCT_ID, O.C_DOCTYPE_ID)) ELSE (SELECT UOMSYMBOL FROM C_UOM WHERE C_UOM_ID = OL.C_AUM) END ) AS AUMSYMBOL,
-    (COALESCE (OL.C_AUM, M_GET_DEFAULT_AUM_FOR_DOCUMENT(OL.M_PRODUCT_ID, O.C_DOCTYPE_ID))) AS AUM, 
+    COALESCE(TO_CHAR(UO.UOMSYMBOL), '') AS UOMSYMBOL,
+    OL.AUMQTY, (COALESCE (OL.C_AUM, M_GET_DEFAULT_AUM_FOR_DOCUMENT(OL.M_PRODUCT_ID, O.C_DOCTYPE_ID))) AS AUM,
     OL.M_PRODUCT_ID, OL.QTYORDERED AS ORDEREDVALUE, (OL.QTYORDERED-OL.QTYDELIVERED) AS PENDINGVALUE,
     (
       SELECT SUM(SD.QTYONHAND)
@@ -77,14 +70,9 @@
     AND REFLISTV.AD_LANGUAGE = ?
     AND O.AD_CLIENT_ID IN ('1')
     AND O.AD_ORG_ID IN ('1')
-    AND EXISTS (
-      SELECT 1
-      FROM C_ORDERLINE ORDL
-      WHERE ORDL.C_ORDER_ID = O.C_ORDER_ID
-      AND ORDL.QTYORDERED <> ORDL.QTYDELIVERED
-    )
+    AND O.ISDELIVERED = 'N'
     AND 1=1
-    ORDER BY ORGNAME, BPNAME, DOCUMENTNO]]></Sql>
+    ) A ORDER BY ORGNAME, BPNAME, DOCUMENTNO]]></Sql>
     <Parameter name="adLanguage"/>
     <Parameter name="adUserClient" type="replace" optional="true" after="O.AD_CLIENT_ID IN (" text="'1'"/>
     <Parameter name="adUserOrg" type="replace" optional="true" after="O.AD_ORG_ID IN (" text="'1'"/>    
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Tue Apr 24 06:49:23 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.33194]]></VERSION>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.33768]]></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[PR18Q1.2]]></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	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Apr 24 06:49:23 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.33194]]></STARTVERSION>
+<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.33768]]></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.33194]]></STARTVERSION>
+<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.33768]]></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.33194]]></STARTVERSION>
+<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.33768]]></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.33194]]></STARTVERSION>
+<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.33768]]></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.33194]]></STARTVERSION>
+<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.33768]]></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/BaseDataSourceService.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/BaseDataSourceService.java	Tue Apr 24 06:49:23 2018 +0000
@@ -83,14 +83,6 @@
     return template;
   }
 
-  /**
-   * @deprecated returned class {@link DataSourceJavaScriptCreator} is deprecated
-   */
-  @Deprecated
-  protected DataSourceJavaScriptCreator getJavaScriptCreator() {
-    return new DataSourceJavaScriptCreator();
-  }
-
   public String getName() {
     return name;
   }
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/CheckTreeOperationManager.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/CheckTreeOperationManager.java	Tue Apr 24 06:49:23 2018 +0000
@@ -28,11 +28,9 @@
  * the checkNodeMovement method must be implemented to determine whether a node movement is valid.
  * Also this annotations must be added for the class to be used using dependency injection:
  * 
- * <code>
+ * <code>&#64;ApplicationScoped</code>
  * <p>
- * &#64;ApplicationScoped
- * <p>
- * &#64;Qualifier("entityName"), entityName being the name of the DAL entity associated with the tree
+ * <code>&#64;Qualifier("entityName"), entityName being the name of the DAL entity associated with the tree
  * </code>
  * 
  */
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceJavaScriptCreator.java	Wed Apr 18 12:21:14 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,236 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2009-2012 Openbravo SLU 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
- */
-package org.openbravo.service.datasource;
-
-import java.math.BigDecimal;
-import java.sql.Timestamp;
-import java.util.Date;
-import java.util.List;
-import java.util.regex.Pattern;
-
-import org.openbravo.base.exception.OBException;
-import org.openbravo.base.model.Entity;
-import org.openbravo.base.model.Property;
-import org.openbravo.dal.core.DalUtil;
-import org.openbravo.service.datasource.DataSourceProperty.RefListEntry;
-import org.openbravo.service.json.JsonConstants;
-import org.openbravo.service.web.BaseWebServiceServlet;
-
-/**
- * A utility class to create javascript for the datasource of a certain {@link Entity}. The
- * properties of the entity ({@link Entity#getProperties()}) are translated into datasource fields.
- * 
- * @deprecated class should not be used and is not used
- * @author mtaal
- */
-@Deprecated
-public class DataSourceJavaScriptCreator extends BaseWebServiceServlet {
-
-  private static final long serialVersionUID = 1L;
-  private static final Pattern QUOTE_PATTERN = Pattern.compile("\"");
-
-  /**
-   * Create javascript to create a datasource on the client.
-   * 
-   * @param name
-   *          the name of the datasource
-   * @param entityProperties
-   *          the properties of this entity are used for the data source fields
-   * @return the javascript string
-   */
-  public String doCreateJavaScript(String name, List<Property> entityProperties, String dataUrl) {
-    final StringBuilder sb = new StringBuilder();
-    sb.append("if (isc.DataSource.get('" + name + "') == null) {");
-
-    // TODO: move the data url to a config parameter
-    sb.append("isc.DataSource.registerDataSource(isc.RestDataSource.create({ID:'" + name + "'");
-    sb.append(", dataURL:'" + dataUrl + name + "'");
-    sb.append(", recordXPath: '/response/data', dataFormat: 'json'");
-
-    sb.append(", operationBindings:  [");
-    sb.append("{operationType: 'fetch', dataProtocol: 'getParams'}");
-    sb.append(", {operationType: 'add', dataProtocol: 'postMessage'}");
-    sb.append(", {operationType: 'remove', dataProtocol: 'getParams', requestProperties:{httpMethod: 'DELETE'}}");
-    sb.append(", {operationType: 'update', dataProtocol: 'postMessage', requestProperties:{httpMethod: 'PUT'}}");
-    sb.append("]");
-
-    sb.append(", fields:[ ");
-    boolean fieldAdded = false;
-    for (Property prop : entityProperties) {
-      if (prop.isOneToMany()) {
-        continue;
-      }
-      if (fieldAdded) {
-        sb.append(", ");
-      }
-      sb.append(getFieldFromProperty(prop));
-      fieldAdded = true;
-    }
-    sb.append("]");
-
-    sb.append("}));");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  private String getFieldFromProperty(Property property) {
-    final StringBuilder sb = new StringBuilder("{");
-    sb.append("name: \"" + property.getName() + "\"");
-    sb.append(", type: \"" + getTypeFromProperty(property) + "\"");
-
-    if (property.isId()) {
-      sb.append(", hidden: true");
-      sb.append(", primaryKey: true");
-    }
-
-    // note boolean can not be mandatory for SC as it gives a
-    // client-side validation error when not set (so only checked
-    // booleans are allowed).
-    if (property.isMandatory() && property.isUpdatable() && !property.isAuditInfo()
-        && !property.isBoolean()) {
-      sb.append(", required: true");
-    }
-
-    if (!property.isUpdatable() || property.isAuditInfo()) {
-      sb.append(", canSave: false");
-    }
-
-    if (property.getFieldLength() > 0 && !property.isId()) {
-      sb.append(", length: " + property.getFieldLength());
-    }
-
-    // note: this one should actually never be used as it is
-    // not translated
-    sb.append(", title: \"" + property.getName() + "\"");
-
-    // an enum
-    if (property.getAllowedValues() != null && property.getAllowedValues().size() > 0) {
-      sb.append(", valueMap: {");
-      boolean multipleValue = false;
-      final List<RefListEntry> allowedValues = DataSourceProperty.createValueMap(
-          property.getAllowedValues(), property.getDomainType().getReference().getId());
-      for (RefListEntry entry : allowedValues) {
-        final String label = entry.getLabel();
-
-        if (multipleValue) {
-          sb.append(", ");
-        }
-        sb.append("\"" + escape(entry.getValue()) + "\": \"" + escape(label) + "\"");
-        multipleValue = true;
-      }
-      sb.append("}");
-    }
-
-    if (!property.isPrimitive()) {
-      if (!property.isId()) {
-        sb.append(", hidden: true");
-      }
-      sb.append(", foreignKey: \"" + property.getTargetEntity().getName() + ".id\"");
-    }
-    sb.append("}");
-
-    if (!property.isPrimitive()) {
-      sb.append(", " + getReferenceProperty(property, JsonConstants.ID));
-      sb.append(", " + getReferenceProperty(property, JsonConstants.IDENTIFIER));
-    }
-
-    return sb.toString();
-  }
-
-  protected String getReferenceProperty(Property property, String subPropName) {
-    final StringBuilder sb = new StringBuilder("{");
-    sb.append("name: \"" + property.getName() + DalUtil.FIELDSEPARATOR + subPropName + "\"");
-    sb.append(", type: \"text\"");
-    sb.append(", hidden: true");
-    if (property.isMandatory()) {
-      sb.append(", required: true");
-    }
-
-    if (!property.isUpdatable() || property.isAuditInfo()) {
-      sb.append(", canSave: false");
-    }
-
-    if (subPropName.equals(JsonConstants.IDENTIFIER)) {
-      // sb.append(", editorType: 'comboBox'");
-      // sb.append(", editorProperties: {displayField: '" + JsonConstants.IDENTIFIER
-      // + "', valueField: '" + JsonConstants.ID + "'");
-      // sb.append(", optionDataSource: '" + property.getTargetEntity().getName()
-      // + "', fetchDelay: 300, autoFetchData: false, selectOnFocus: true, dataPageSize : 15}");
-      // sb.append(", filterEditorProperties: {displayField: '" + JsonConstants.IDENTIFIER
-      // + "', valueField: '" + JsonConstants.IDENTIFIER + "', editorType: 'comboBox'");
-      // sb.append(", required: false, optionDataSource: '" + property.getTargetEntity().getName()
-      // + "', fetchDelay: 300, autoFetchData: false, selectOnFocus: true, dataPageSize : 15}");
-    } else if (subPropName.equals(JsonConstants.ID)) {
-      // sb.append(", editorType: 'comboBox'");
-      // sb.append(", editorProperties: {displayField: '" + JsonConstants.IDENTIFIER
-      // + "', valueField: '" + JsonConstants.ID + "'");
-      // sb.append(", optionDataSource: '" + property.getTargetEntity().getName()
-      // + "', fetchDelay: 300, autoFetchData: false, selectOnFocus: true, dataPageSize : 15}");
-      // sb.append(", filterEditorProperties: {displayField: '" + JsonConstants.IDENTIFIER
-      // + "', valueField: '" + JsonConstants.ID + "', editorType: 'comboBox'");
-      // sb.append(", required: false, optionDataSource: '" + property.getTargetEntity().getName()
-      // + "', fetchDelay: 300, autoFetchData: false, selectOnFocus: true, dataPageSize : 15}");
-    } else {
-      // sb.append(", filterEditorProperties: {required: false}");
-    }
-
-    sb.append(", valueXPath: \"" + property.getName() + "/" + subPropName + "\"");
-    sb.append(", title: \"" + property.getName() + "\"");
-    sb.append("}");
-
-    return sb.toString();
-  }
-
-  protected String getTypeFromProperty(Property property) {
-    if (property.isBoolean()) {
-      return "boolean";
-    }
-
-    if (!property.isPrimitive()) {
-      return "text";
-    }
-
-    if (property.getPrimitiveObjectType() == String.class) {
-      return "text";
-    } else if (property.getPrimitiveObjectType() == BigDecimal.class) {
-      return "float";
-    } else if (property.isNumericType()) {
-      return "integer";
-    } else if (property.getAllowedValues() != null && property.getAllowedValues().size() > 0) {
-      return "enum";
-    } else if (property.getPrimitiveObjectType() == Date.class) {
-      return "date";
-    } else if (property.getPrimitiveObjectType() == Timestamp.class) {
-      return "datetime";
-    } else if (property.getPrimitiveObjectType() == byte[].class
-        || property.getPrimitiveObjectType() == Byte[].class) {
-      return "image";
-    }
-    throw new OBException("Type of property " + property + " not supported, primitive object type "
-        + property.getPrimitiveObjectType());
-  }
-
-  // private void handleException(Throwable t, HttpServletResponse response) {
-  // t.printStackTrace(System.err);
-  // }
-
-  private String escape(String value) {
-    return QUOTE_PATTERN.matcher(value).replaceAll("\\\"");
-  }
-}
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceProperty.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceProperty.java	Tue Apr 24 06:49:23 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-2018 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -204,7 +204,7 @@
   private static DomainType getDomainType(Reference reference) {
     try {
       final Class<?> clz = OBClassLoader.getInstance().loadClass(reference.getModelImpl());
-      final DomainType domainType = (DomainType) clz.newInstance();
+      final DomainType domainType = (DomainType) clz.getDeclaredConstructor().newInstance();
       // can't be set
       // note for our purpose this not need to be set
       // domainType.setReference(reference);
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/HQLDataSourceService.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/HQLDataSourceService.java	Tue Apr 24 06:49:23 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-2018 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -240,15 +240,20 @@
    * @return the table whose data is being fetched
    */
   private Table getTableFromParameters(Map<String, String> parameters) {
-    String tableId = parameters.get("tableId");
-    String tabId = parameters.get("tabId");
     Table table = null;
-    if (tableId != null) {
-      table = OBDal.getInstance().get(Table.class, tableId);
-    } else if (tabId != null) {
-      Tab tab = null;
-      tab = OBDal.getInstance().get(Tab.class, tabId);
-      table = tab.getTable();
+    try {
+      OBContext.setAdminMode(true);
+      String tableId = parameters.get("tableId");
+      String tabId = parameters.get("tabId");
+      if (tableId != null) {
+        table = OBDal.getInstance().get(Table.class, tableId);
+      } else if (tabId != null) {
+        Tab tab = null;
+        tab = OBDal.getInstance().get(Tab.class, tabId);
+        table = tab.getTable();
+      }
+    } finally {
+      OBContext.restorePreviousMode();
     }
     return table;
   }
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/LinkToParentTreeDatasourceService.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/LinkToParentTreeDatasourceService.java	Tue Apr 24 06:49:23 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-2017 Openbravo SLU
+ * All portions are Copyright (C) 2013-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -261,6 +261,7 @@
     final OBQuery<BaseOBObject> query = OBDal.getInstance().createQuery(entity.getName(),
         whereClause.toString());
 
+    query.setFilterOnActive(false);
     query.setParameters(queryParameters);
 
     final DataToJsonConverter toJsonConverter = OBProvider.getInstance().get(
@@ -428,6 +429,7 @@
     }
     final OBQuery<BaseOBObject> query = OBDal.getInstance().createQuery(entity.getName(),
         whereClause.toString());
+    query.setFilterOnActive(false);
 
     final List<Object> parameters = new ArrayList<Object>();
     parameters.add(nodeIdStr);
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Tue Apr 24 06:49:23 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.33194]]></VERSION>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.33768]]></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[PR18Q1.2]]></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	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Apr 24 06:49:23 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.33194]]></STARTVERSION>
+<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.33768]]></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.33194]]></STARTVERSION>
+<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.33768]]></STARTVERSION>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Tue Apr 24 06:49:23 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.33194]]></VERSION>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.33768]]></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[PR18Q1.2]]></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	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Apr 24 06:49:23 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.33194]]></STARTVERSION>
+<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.33768]]></STARTVERSION>
 <!--FF8080813141B198013141B8B21B0006-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813141B198013141B8B21B0006-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813141B198013141B8B21B0006-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Tue Apr 24 06:49:23 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.33194]]></VERSION>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.33768]]></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[PR18Q1.2]]></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	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Apr 24 06:49:23 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.33194]]></STARTVERSION>
+<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.33768]]></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	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java	Tue Apr 24 06:49:23 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) 2009-2017 Openbravo SLU 
+ * All portions are Copyright (C) 2009-2018 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -766,7 +766,7 @@
         }
       }
     } else if (!useProperty.isPrimitive()) {
-      clause = clause + ".id";
+      clause = clause + "." + getReferencedPropertyName(useProperty);
     } else if (tableReference && useProperty.isTranslatable()
         && OBContext.hasTranslationInstalled()) {
       // filtering by table reference translatable field: use translation table
@@ -785,6 +785,10 @@
     return clause;
   }
 
+  private String getReferencedPropertyName(Property property) {
+    return property.getReferencedProperty().getName();
+  }
+
   private String buildValueClause(Property property, String operator, Object value)
       throws JSONException {
     Object localValue = value;
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonToDataConverter.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonToDataConverter.java	Tue Apr 24 06:49:23 2018 +0000
@@ -72,20 +72,20 @@
  * found then the database is search. if not found there then a new BaseOBObject is created.If the
  * object has an id then it is put in the key-to-object map so that it can be found if later objects
  * refer to it.
- * <p/>
+ * <p>
  * Then the next step is to convert/set the values. the logic walks through the properties of the
  * object (the properties are defined by the entity of the object (see
  * {@link BaseOBObject#getEntity()} and {@link Entity#getProperties()}. For primitive values, the
  * property name ({@link Property#getName()}) is used to search a value in the JSONObject. The value
  * is retrieved converted and then set in the business object.
- * <p/>
+ * <p>
  * Reference/foreign key properties are handled differently. In this case the property name is
  * appended with the ".id" postfix and this name is used to search for a value in the JSONObject. If
  * there is no such value present then the property name is used. The id value is used to search in
  * the key-to-object map and in the database (in this order). If not found then a new object is
  * created as it may be present later in the overall json string. The system later tracks that there
  * are no such maverick objects present (call {@link #getErrors()} to check this).
- * <p/>
+ * <p>
  * This class also handles a special type of property/keys. It can handle setting values in related
  * objects also. For example say that the json object represents a sales order and has these keys
  * (and their values):
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Tue Apr 24 06:49:23 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.33194]]></VERSION>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.33768]]></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[PR18Q1.2]]></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	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Apr 24 06:49:23 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.33194]]></STARTVERSION>
+<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.33768]]></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.33194]]></STARTVERSION>
+<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.33768]]></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.33194]]></STARTVERSION>
+<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.33768]]></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.33194]]></STARTVERSION>
+<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.33768]]></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.33194]]></STARTVERSION>
+<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.33768]]></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.33194]]></STARTVERSION>
+<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.33768]]></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/SelectorDefaultFilterActionHandler.java	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDefaultFilterActionHandler.java	Tue Apr 24 06:49:23 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-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -23,8 +23,6 @@
 import java.util.Map;
 
 import javax.enterprise.context.ApplicationScoped;
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
 import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
@@ -32,6 +30,7 @@
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
 import org.hibernate.criterion.Restrictions;
+import org.openbravo.base.expression.OBScriptEngine;
 import org.openbravo.base.model.Entity;
 import org.openbravo.base.model.ModelProvider;
 import org.openbravo.base.model.Property;
@@ -93,9 +92,9 @@
         return result;
       }
 
-      final ScriptEngineManager manager = new ScriptEngineManager();
-      final ScriptEngine engine = manager.getEngineByName(SelectorConstants.JS);
-      engine.put(
+      Map<String, Object> bindings = new HashMap<>();
+
+      bindings.put(
           "OB",
           new OBBindings(OBContext.getOBContext(), params, (HttpSession) parameters
               .get(KernelConstants.HTTP_SESSION)));
@@ -107,7 +106,7 @@
       JSONArray idFilters = new JSONArray();
       for (SelectorField f : selFields) {
         try {
-          exprResult = engine.eval(f.getDefaultExpression());
+          exprResult = OBScriptEngine.getInstance().eval(f.getDefaultExpression(), bindings);
           Object bobId = null;
 
           if (exprResult != null && !exprResult.equals("") && !exprResult.equals("''")) {
@@ -146,12 +145,12 @@
       if (idFilters.length() > 0) {
         result.put(SelectorConstants.PARAM_ID_FILTERS, idFilters);
       }
-
       // Obtaining the filter Expression from Selector. Refer issue
       // https://issues.openbravo.com/view.php?id=21541
       Object dynamicFilterExpression = null;
       if (sel.getFilterExpression() != null) {
-        dynamicFilterExpression = engine.eval(sel.getFilterExpression());
+        dynamicFilterExpression = OBScriptEngine.getInstance().eval(sel.getFilterExpression(),
+            bindings);
         result.put(SelectorConstants.PARAM_FILTER_EXPRESSION, dynamicFilterExpression.toString());
       }
 
--- a/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js	Tue Apr 24 06:49:23 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-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -393,12 +393,15 @@
       isc.addProperties(data, this.view.getUnderLyingRecordContext(false, true));
     } else if (this.view && this.view.sourceView && this.view.sourceView.getContextInfo) {
       isc.addProperties(data, this.view.sourceView.getContextInfo(false, true));
+    } else if (this.selector && this.selector.view && this.selector.view.getUnderLyingRecordContext) {
+      // selector in a param window
+      isc.addProperties(data, this.selector.view.getUnderLyingRecordContext(false, true, null, this.selector.isComboReference));
     }
 
     callback = function (resp, data, req) {
       selectorWindow.fetchDefaultsCallback(resp, data, req);
     };
-    OB.RemoteCallManager.call('org.openbravo.userinterface.selector.SelectorDefaultFilterActionHandler', data, data, callback);
+    OB.RemoteCallManager.call('org.openbravo.userinterface.selector.SelectorDefaultFilterActionHandler', data, null, callback);
   },
 
   fetchDefaultsCallback: function (rpcResponse, data, rpcRequest) {
--- a/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Tue Apr 24 06:49:23 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.33194]]></VERSION>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.33768]]></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[PR18Q1.2]]></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	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Apr 24 06:49:23 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.33194]]></STARTVERSION>
+<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.33768]]></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.skin.250to300Comp/web/org.openbravo.userinterface.skin.250to300Comp/skins/250to300Comp/loginStyles.css	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/web/org.openbravo.userinterface.skin.250to300Comp/skins/250to300Comp/loginStyles.css	Tue Apr 24 06:49:23 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) 2017 Openbravo SLU
+ * All portions are Copyright (C) 2017-2018 Openbravo SLU
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -597,12 +597,33 @@
 }
 
 .Login_Home_Logo_Icon {
-  height: 217;
-  width: 608;
+  display: block;
+  margin: auto;
+  padding: 50px 0px 0px 0px;
+  width: 520px;
+  height: 120px;
+  background: url(../../../../../utility/ShowImageLogo?logo=yourcompanybig) no-repeat center center;
+}
+
+.error-text {
   margin: 0 auto;
-  background-repeat: no-repeat;
-  background-position: center center;
-  background-image: url(../../../../../utility/ShowImageLogo?logo=yourcompanybig);
+  padding: 50px 0px 0px 0px;
+  text-align: center;
+  font-family: lucida sans unicode;
+  font-size: 28px;
+  color: red;
+}
+
+@media all and (max-width: 650px) {
+  .Login_Home_Logo_Icon {
+    padding: 7.5vw 0px 0px 0px;
+    width: 82%;
+  }
+
+  .error-text {
+    padding: 7.5vw 0px 0px 0px;
+    font-size: 4.3vw;
+  }
 }
 
 /*
--- a/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Tue Apr 24 06:49:23 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.33194]]></VERSION>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.33768]]></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[PR18Q1.2]]></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	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Apr 24 06:49:23 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.33194]]></STARTVERSION>
+<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.33768]]></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.33194]]></STARTVERSION>
+<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.33768]]></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.33194]]></STARTVERSION>
+<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.33768]]></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	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js	Tue Apr 24 06:49:23 2018 +0000
@@ -774,18 +774,42 @@
       delete target.view.isRefreshing;
       target.view.toolBar.updateButtonState();
     }
+
+    // in case of response timeout, show the error in the view if possible
+    if (this.isServerTimeoutResponse(response) && this.canShowErrorMessage(target)) {
+      target.view.setErrorMessageFromResponse(response, response.data, request);
+    }
+
     if (!request.willHandleError) {
       this._originalhandleError(response, request);
     }
   },
 
+  isServerTimeoutResponse: function (response) {
+    return response.status === isc.RPCResponse.STATUS_SERVER_TIMEOUT;
+  },
+
+  canShowErrorMessage: function (target) {
+    return target && target.view && isc.isA.Function(target.view.setErrorMessageFromResponse);
+  },
+
   _originalEvalResult: isc.RPCManager.evalResult,
   evalResult: function (request, response, results) {
-    // if the response contains an error status, call the errorCallback
-    if (response.status !== isc.RPCResponse.STATUS_SUCCESS && isc.isA.Function(request.errorCallback)) {
-      request.errorCallback(request, response);
+    if (response.status !== isc.RPCResponse.STATUS_SUCCESS) {
+      if (isc.isA.Function(request.errorCallback)) {
+        // if the response contains an error status, call the errorCallback
+        request.errorCallback(request, response);
+      } else {
+        // try to handle the error in the standard way
+        this.handleError(response, request);
+      }
     }
-    return this._originalEvalResult(request, response, results);
+
+    return this._originalEvalResult(request, response, this.sanitizeResults(results));
+  },
+
+  sanitizeResults: function (results) {
+    return isc.isA.Object(results) ? JSON.stringify(results) : results;
   },
 
   // Escape characters that are not properly handled in JavaScript's eval. See issue #36788.
--- a/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml	Tue Apr 24 06:49:23 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.33194]]></VERSION>
+<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION><![CDATA[1.0.33768]]></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[PR18Q1.2]]></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	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Apr 24 06:49:23 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.33194]]></STARTVERSION>
+<!--86EBD30DEB8045508185B457896C9F6D-->  <STARTVERSION><![CDATA[2.1.33768]]></STARTVERSION>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Tue Apr 24 06:49:23 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.33194]]></VERSION>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.33768]]></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[PR18Q1.2]]></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	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Apr 24 06:49:23 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.33194]]></STARTVERSION>
+<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.33768]]></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.33194]]></STARTVERSION>
+<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.33768]]></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.33194]]></STARTVERSION>
+<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.33768]]></STARTVERSION>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <DEPENDANT_MODULE_NAME><![CDATA[Orders Awaiting Delivery]]></DEPENDANT_MODULE_NAME>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Tue Apr 24 06:49:23 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.33194]]></VERSION>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.33768]]></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[PR18Q1.2]]></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	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Apr 24 06:49:23 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.33194]]></STARTVERSION>
+<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.33768]]></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.33194]]></STARTVERSION>
+<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.33768]]></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.33194]]></STARTVERSION>
+<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.33768]]></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.33194]]></STARTVERSION>
+<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.33768]]></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.33194]]></STARTVERSION>
+<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.33768]]></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.33194]]></STARTVERSION>
+<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.33768]]></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.33194]]></STARTVERSION>
+<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.33768]]></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.33194]]></STARTVERSION>
+<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.33768]]></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.33194]]></STARTVERSION>
+<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.33768]]></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.33194]]></STARTVERSION>
+<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.33768]]></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.33194]]></STARTVERSION>
+<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.33768]]></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.33194]]></STARTVERSION>
+<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.33768]]></STARTVERSION>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Tue Apr 24 06:49:23 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.33194]]></VERSION>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.33768]]></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[PR18Q1.2]]></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	Wed Apr 18 12:21:14 2018 +0000
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Apr 24 06:49:23 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.33194]]></STARTVERSION>
+<!--48D556894CE54CF998DC97882E904CBD-->  <STARTVERSION><![CDATA[1.0.33768]]></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.33194]]></STARTVERSION>
+<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.33768]]></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.33194]]></STARTVERSION>
+<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.33768]]></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.33194]]></STARTVERSION>
+<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.33768]]></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.33194]]></STARTVERSION>
+<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.33768]]></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.33194]]></STARTVERSION>
+<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.33768]]></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.33194]]></STARTVERSION>
+<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.33768]]></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.33194]]></STARTVERSION>
+<!--FEF6E40F244A4061B7C62CB755663712-->  <STARTVERSION><![CDATA[1.0.33768]]></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.33194]]></STARTVERSION>
+<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.33768]]></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.33194]]></STARTVERSION>
+<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.33768]]></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.33194]]></STARTVERSION>
+<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.33768]]></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_CLIENTINFO.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/referencedata/sampledata/F_B_International_Group/AD_CLIENTINFO.xml	Tue Apr 24 06:49:23 2018 +0000
@@ -6,8 +6,8 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:45:47.729]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:47.729]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2018-02-20 11:21:20.277]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <ISDISCOUNTLINEAMT><![CDATA[Y]]></ISDISCOUNTLINEAMT>
   <ACCT2_ACTIVE><![CDATA[N]]></ACCT2_ACTIVE>
   <ACCT3_ACTIVE><![CDATA[N]]></ACCT3_ACTIVE>
@@ -22,7 +22,7 @@
   <CHECKINOUTORG><![CDATA[Y]]></CHECKINOUTORG>
   <GROUPACCTINVLINES><![CDATA[N]]></GROUPACCTINVLINES>
   <YOUR_COMPANY_MENU_IMAGE><![CDATA[3E31C143DA28413AB1E4E4EC2A1FCB61]]></YOUR_COMPANY_MENU_IMAGE>
-  <YOUR_COMPANY_BIG_IMAGE><![CDATA[9BAA424C195C4CB3A160D5532A83E9D6]]></YOUR_COMPANY_BIG_IMAGE>
+  <YOUR_COMPANY_BIG_IMAGE><![CDATA[FA0CD9C5BD34491D97C537D8B6ED08D2]]></YOUR_COMPANY_BIG_IMAGE>
   <YOUR_COMPANY_DOCUMENT_IMAGE><![CDATA[B188EDFE47BA4B62B63038E3203A4D48]]></YOUR_COMPANY_DOCUMENT_IMAGE>
   <AD_TREE_CAMPAIGN_ID><![CDATA[E6F78105DC5640BD95FDEF74DD6CC3AD]]></AD_TREE_CAMPAIGN_ID>
   <AD_TREE_ASSET_ID><![CDATA[EC4DD43EB9824ADCA2CDF480F44FB47D]]></AD_TREE_ASSET_ID>
--- a/referencedata/sampledata/F_B_International_Group/AD_IMAGE.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/referencedata/sampledata/F_B_International_Group/AD_IMAGE.xml	Tue Apr 24 06:49:23 2018 +0000
@@ -161,22 +161,6 @@
 </AD_IMAGE>
 
 <AD_IMAGE>
-  <AD_IMAGE_ID><![CDATA[9BAA424C195C4CB3A160D5532A83E9D6]]></AD_IMAGE_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:45.589]]></CREATED>
-  <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:45.589]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-  <NAME><![CDATA[Image]]></NAME>
-  <BINARYDATA><![CDATA[iVBORw0KGgoAAAANSUhEUgAAAmAAAADZCAYAAACHMYxEAAAACXBIWXMAAAsTAAALEwEAmpwYAAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAAWUdJREFUeNrsnXtcVNe5939zYYAZRREEFRABL0BArSiiidgo1dC0GrXJqU1JcnI1aa2tbVqrnvftOVGT06Y2ia0xPZ60kbamTdVXm9aEanqiPYqKRgVFjYIIXriJogzDwMy8f8DartmzZ2bvPRcGeL6fz/4MDOzL2uvZa/32s571LA38h8bLdxqVxyAIgiAIgvAHDoX/41B5DK/o/Si4NB5El8bD/5PwIgiCIAiit4SYQ+JvDpliTLUg0/i4j8aN0JISXhoSZARBEARBhLjg8vSzWJjJEWg+CzCxQJISXUo2KSFGIowgCIIgiGCIL3cCS8kmPo5sISZX5Gi8CC+tm591br73JsRIhBEEQRAE4U/xJVd42bmfbW6+t3sRYl5FmJwYME+eLq3Ep67nk980op+lBJkn0UVCjCAIgiAIX4UXJISXWFjZRT+zzcb9TSOxL39sjTcR5k3YePJ2SYku/pMXYjoJQaZUhBEEQRAEQfgqyLyJL15ssZ9tou9tIqHmySsmiV6G+NJynxq4erd0bja9hCDTwdUrJjUcSRAEQRAEEQgRJiXAxGKLF1pdou9tPfqF/Y+m5xPcsTTcp0OJANNIiDCNhPDSS3zym/hvnrxhUp4wgiAIgiAIfwkwqXgvsderSyS8ukQb+07b88lj7/meF1+SIkzvRXxpJMQXL6p0AMJ6fnf3yX6WK8JAIowgCIIgCD+LLygQX52c4OqU+NT2fGokhBgvwuBOhHnygInjvrSQ9nSF9WwG0Sf/s9grppMQYYD3/GAEQRAEQRBKRBdE4gsS4ovfeKFl7fnkf+adR11wdh51ccfXeLgWFwEm5f0Sx3rx3i0msMJ7fmaf/CYWYuL4MHdeMBJhBEEQBEH4Q3zxAkzK+8UPLfJiy8ptYQA64BrP7kloufWCyR2C5L1eTEjxoottEaLfw0VCjPeG8V4wdh6AYsEIgiAIgvCvGBN7vxxw9n7xw4288OoQbVITCj2d120cmN6D8BLHffEijBdfkT3CK0L0cwQnyMQeMb2bQpD4IgiCIAgikCJMatZjF1w9Xh0ALNwWJtIu3s7h4MSXWJC5HYIUp4rgBZhBJL4iARh7tkjx9vDDDyc/9thjGZMnT07S6/X6xMTEoRqNhgQWQRAEQRChoc4cDkddXd2trq6urpMnT9b+6U9/qvzrX/9aA6C9ZxM7kDRuxJc4rQUTajaIvGBS6zuKvV58QD3zZvEiy9Qjvpw+V61aNeW55557YPjw4VFUtQRBEARB9CUaGxtb33333UPr168vA2AG0Cbx2c5tzGvGB+7zOcWcsuaLBZi7gHt3Xi9TzzaoZzPl5uYmvvvuu4tHjx49nKqPIAiCIIi+zJUrVxqffvrpnUePHq3rEV13e7Y2TowxEcYEGBNhXW5EGHSc+JKa+cinmeAD7ZkAY8JrMIDBzzzzTPa777779ZiYGPJ6EQRBEATR5xkyZIjpsccem3jz5s1bn3322e2er6VmU7obhhRPAoCUABOnneCHH3kPmNj7NfiZZ57Jfv3115cYDAY9VRdBEARBEP0FvV6v+9KXvpTR1NTU/Nlnn7XAdaFu8fqR7taHdEgJMKllhvghSLH3SxBf999/f/Kvf/3rxwwGQxhVE0EQBEEQ/Q2tVquZPXt22uHDhy/X1taa4ZrAVUqUSYkvpxgwubMdBdEFIArAUABDTp8+/fyYMWPiqHoIgiAIgujPXL58uWHixIm/BnCb2+7gXlyYVDyYOBbMITUE6W72Y4SEEBu0Zs2avK985SuTqEoIgiAIgujvDB061KTVas0HDx68DtdFuqW8YTa4DkdKZp/XwDlBqnhGpFMw/tNPPz2TqoMgCIIgiIFCj/ZhyeeZLnKXaF4nobMkE7FK5QOTWng7/Omnn54QFxdHMx4JgiAIghgwxMXFRT399NMT3n333c/gfrlFj2tda0XiSyzCdHAeknQKyp83b944qgaCIAiCIAYaPRooHM5Z8sNE2kksvjS8ANNIbFq45gPj48LCAISlp6ePoCogCIIgCGKg0aOBwkQbGzUU6ygXrSVeTNLdECQvwgQv2MiRI4dQFRAEQRAEMdDo0UDiNSL1Iu0kawhSjghzigcLDw+nvF8EQRAEQQw4ejSQVNyXV/ElJcA8DUXqRAJMr9PptFQFBEEQBEEMNHo0kF4kwHTwPPQoKcDEQWJaSOcH438mCIIgCIIYsDpMQhuJ9ZNGQmd5HYLUiFSclgQYQRAEQRCEiwDTSugmWUOQGolPTzMjafiRIAiCIIiBjJQ2khJekmkopNDAc3oKDQkwgiAIgiBIgHn0ekl6v6QEmDcvGEQnIgiCIAiCGMgCTCtDN0EsxPQSX2okRJmkmtNoNHTrCYIgCIIYyMjxernoLK2XAyo5OEEQBEEQBIkvaS3lhNaD6IIXkUUCjCAIgiCIgS7A5P5NViZ8X05IEARBEARBIszD/2gVHoyEF0EQBEEQhI/aiWYyEgRBEARBBBm5QfhyvicIgiAIghiIKNZM5AEjCIIgCIIIMnq6BQRBEARB+AKfF9RbjlCHwyH5MwkwlTecIAiCIIiBLbrk6gImvAayGCMPGEEQBEEQqsSXRqOBRqOBVqsVfpYrwMSblEAjAUYQBEEQBCESXzqdDlqtFlqtFlfvVKPu9iU0t9ej2VyP5vYbTvvFRI5AjDEeMZHxSByShoTBKbDb7QAAu90Oh8MhfGo0mn4vwkiAEQRBEAShWITpdDq0drXgr+eLcar+EMzWu172Ou30m9EwCJPiZ2LSiJmYGJ8Hu90OrVYLu90uCDOg/3rDSIARBEEQBOFRbImFEBtuvGm+gcO1JaqOa7bexeHaEhyuLUGMMR4zkuZhTuoiGHQR0Gq1sNlssNvt/dYbRmkoCIIgCIJwEV3imC6p3/1Fs7keH54vxtr9T+CjS9uh0+mg1+uh0+kUxZaRACMIgiAIos+KLwDQarXQ6XTCFgwRZLbexYfni/FvnzyJ6201wrmVBvn3BSgNBUEQBEEQAiyoXqvt9tHsOvdfiAwbhHkp/+IUJB9Ims31WP/pi/jKhCIUjv2GIL742LA+f5/J1AiCIAiCEIsvq8OCrSfWYX/VLgDKc335gw/PF+N3p3/h4gnrD1AQPkEQBEEQQj4vJr42HnoZdbcvOf29NwLiD9eWoLn9BpZN+wkMuggA99JW9GmxSyZHEARBECS+PImv3uZC02l8ULFFuMb+4AUjDxhBEARBkAATxM0Hp7aElPhisHQX35z4PeG7vhwTRh4wgiAIgiDxBa1Wi39c3q06r1ewRNjRq/udlj/qq5AHjCAIgiAGMEx8Xbt7GR9UvO23485ImocZSV8Sfq9trULd7Uu40HwKzeZ61cf94OwWjIudhKGGGDgcDthsNhJgBEEQBEH0HfjFtD8487Zfjx1jjMe4mIkAuocK06KzBMH3efNpHK79uypvm9l6F3+ueBvPT/0/fTpTPg1BEgRBEMQAFV/M+3Wkbh8uNJ2WLdiUDP3xC23b7XbYbDakDr0PRZNWYuXMnyFxSJriaz954xAu3izv00H5JMAIgiAIYgCKL16AfXihOKDnczgcwsaEGPOKrZz5M8xImqf4mB9eKCYBRhAEQRBE3xRhp+tLfYrJ8io0uOSu/MLeTIQZNBF4YvL3FYuwC02ncfFmuSqvXChAMWAEQRAEMQDFFxNFpQGa9Vh3+xL+euF3AIDEqDQkDklDdHiskyeMX9boicnfR3vnXZy8cUj2OQ7X/h1p0Vl90gNGAowgCIIgBpj4YpvFZlYkeJRw8sYhl2MnDknDY/ctEwLy+fgwAHjiCz9A7acvyvbInao/hCLNyl7L0u8LNARJEARBEAOUU9cPBfV8dbcvYeOhl7Gz8tdOC34zr1i4NhKP3vei7OOZrXdxur60Tw5DkgAjCIIgiAEGEysXmk/3yvn3V+3C3ot/cBJNzBs2acQMRTMjP28+1SfrgAQYQRAEQQww8cW40Ivi5cPzxbhlbRa8YEyE2e12zE1ZJPs4ta2X+qQHTO+vSiQIgiAIom8IMDYjUcnsR3Gf7w8N8NfzxfjmxO9Bq9UKcWAOhwOTRs4ETso7xoWm00KZ+KD+UIc8YARBEAQxgMQXEygXb5b3+vWcqj/kJJhYEH2EzqhoGNJiM7uUjwQYQRAEQRCEBGbrXdy0NDoJJybCjGEm2cepu32pz5WdBBhBEARBDDBCyUt003zD5TuHw4HxMZP6bJnkQHnACIIIaCPXFxfJJQii9xgobQYJMIIgFAkvJTEWfENKQowg+kc7wJ7lQD3TA2WCHwkwgiBkw2ZO8WLMk/DilxwhCCJ0UCqems31ks/7MOMIn69FKti+O0fZqYCWiQQYQRB94q2XbZ2dnbh69arsfceMGeMSXEsQRN+itvWS00sXe7kaFjEcRsMgmK13VR03xhiPCJ0RNptNaB/YOZSkyFAyY5IEGEEQfVKEXb16FW+//bbs/X7605/2uTXaCKK/woQTAIwdli17v7rbl2CxmWHQRLgMQ06Kn4nDKhf0njxiplPbwMTXTUujIgEWoTMKmfT7SltDiVgJgpAtvtQ8830xQzVBDBRijPHyF76+fgi5CXNd8nY9PKEIp+oPKfaCGQ2D8GDqYifPF9tOKVggfHzsxD6pTSgNBUEQBEEMMJinKClK/tDd4boSpzhQdozo8Fg8mrlM8TU8mrkM0eGxwnHYcbVaLT6p2in7OElRaX3K80UCjCAIgiAGuAgbFys/19aFptP4vPm0IMJ4IZebMBdPTv6B7GM9OfkHyE2Y6yScmPgqrf27ouHHcTGT+mSIAwkwgiAIghiA4gsAJo2YqWi/906+DovN7JK5nomwlTN/5jIkyDN5xEysnPkzSfGl0WhgsZnxwdktiq6JnY9mQRIEQRAEEdLii4mnYRHDMT52Ii40nZa1b7O5Hts+ex0vTPu/kvnAUofeh+/m/RQWm9lleaDEIWkuwfLiocctR36iKJZs8oiZwjH7mggjDxhBEARBDEARxnL0zUicp2jfkzcOYdvJn0On00Gr1UKr1boc06CJQOrQ+5AWnYW06CykDr0PBk2Ey0xFtr9Op8O2kz+XLQQZc1IX9bnZjyTACIIgCGKAizAAmJ5YgBhjvKJ9D9eWYNvJn6PD3u4y05kXQ+5+5vfpsLfjnWP/rjiVRYwxXkilQTFgBEEQBEH0CfHFe6y+Mr5I8TEO15Zg46GXcamlwml2pLu0M+K/a7VaXGqpwPpPX8RJBWknGI/e96LLcGZfgmLACIIgCGIACzGNRoPpiQXYX73LJW7LG3W3L2HjoZcxI2ke5qQuQmJUqkcxxMTX582ncbj276oTuI6PnYiJ8XmCAOuLkAAjCIIgiAEqvtin3W7HY/ctw8ZDL6s61uHaEhyuLUGMMR6TR8xEYlSay7BmbWsV6m5fwoXmU4rSTEjR171fJMAIgiAIgoQYNBoN0qKz8JUJRfjwfLHqYzWb67G/aldAr/fRrBcxatCYPiu8/CLAaGkRghgY+LqUEC1FRBChL8IA4MvjHseF5lOKZyMGixlJ8/DgmIUuQ499sX2hIHyCIAiCGODii9+WTfsJEoekhdx1Jg5Jw6NZy1yut69CAowgCIIgSIQJW7g2Eitn/iykRFjikDSsnPkzhGsj+4X4IgFGEARBEISLEIvQGUNGhEmJr/4ACTCCIAiCIFxygzFP2Iykeb12TTOS5mFN/mYXz1d/EGE0C5IgCIIgCEGE8YRrI1E0aSUSh6ThrxeKFa3T6AtGwyA8MekHmBifB5vN5pJRvz9AAqwHTzMo+ktluysjla9vl7G/l68/22ggyzUQngfqgwIrwviFsh8csxCTRszEX88Xq06eKpcZSfPwaNYyhGsj+3yuLxJgMoyeN36NRuMyvVVc8aFuCOKH2dPDTeXrG42xuzJKla8vdrSeUlX0Zxv1tRxKbKU376XSNAH+vqbePn9f64PEx7fb7YgOj0XRpJV4eEJRQITYjKR5eHhCEYZFDHcZbuyPLw4DWoCJ16wSPwC8EYp/D8VOQOr6vXUC3soXSmXs7+Xz1Bi7K2NfK5+aZ7G/2ai/OnulttKb91IsruWKUX9dS2+fvy/3QVLeMF6InbpxCIdrSxQvYcQYHzsRk0bcjxlJX0KEzijEn/XHIUcSYBKGr9VqcfFmueT/RYYNclrbir2JiD9700D4h9ddB6DRaFDXWoX2Tufx+8QhaYjUmyTLJzb83iqj3PK1d7Wh7pZzIzDMOAIxkXEhXT5x2dw1xmz9NDHjYiY6lY9vLEPFRuU+i9XV1S5/HzZsGIYNG9Y/bLS9HVevXgUAJCQkwGAwKL52ubZy9epVtLe3O+2bkJCAyMjIoN5LTyIjGN653j6/3D6oqqpKug+KjMSoUaN6tQ+SuicajQZDDTH4YvICPDhmISw2My40nUZd6yXU3b4Ec5d0rFhM5AjEGOMxPmYiEoekCaKLF17sHP19uHxACjDe8KtunZG19lXikDQkRaVhfMxETBo508lo+Ac3mAbjriHWaDQ4XV+Kz5tPobb1Eupaq7wGTrLyJQ5Jw6QRMwUXsFSj1BuuefHPV+9U40LzaXze1F1Gb+uKGQ3dQnp8zCSMj5mIscOyXcoXCnXINovNjFPXDuFC82k0t9+QlZV6fOxExESOwPiYiRgXO8nJjd9bNqqUt99+2+3foqOjMWzYMKSlpSErK0volHqzDj3Z6LVr13Dp0iVcvHgR165dQ0tLi9O+L774IlJSUny3FYvF6TyXLnn3RIwaNQqjRo1CQkIC7rvvPkHg+vt5569z3759svdLS0tzujdqr0Es7uXcG0ZBQUHA2jzxfSkpKZFVZ2PHjsXYsWORmpqKiIiIoD/fnoS7QROB7LjpyI6bruh4drvdRXANlDhFCsKXSd3tblV/uLYEOAlMHjETc1IXCR15MN3CUo2wRqPBxZvlqleXZ+VDLfBBxdtIHJKGGUnznNzCwXxAxGXTaDS4aWlEac+Cr0oXcjVb7+JC02lByBgNgzApvrsOEwanhEwdHqnbh1M3DuHkjUOKj9ldttNC/Y+PnYgZifMwPbGgTwgxb0N1LS0taGlpwaVLl1BSUoKIiAhMmzYN+fn5iI6O7pU6FG8tLS04duwYjh075iK45Hpc5NrKmTNncPToUZw5c0bxtV+7dg3Xrl1DWVkZdu/ejVGjRmHatGmYNm2aU8fuz+ddjshgzJs3T5E4lQOzGzUCLBRgdXbgwAFEREQgKysLubm5SE1NDbrtSwl03pa9PcvuBP5AmyDS7wSYkllGvqwddbKnk4wxxuPJyT9wEmKBFClSjf7p+lJ8cOZtn1eXFwuyD26/jb9eKMaclEWYk7oIETqj8LYSyDdDvpxarRY3LY1+D/g0W+/icI+YGx87EV8ZX9SrdXikbh8+vFDs1zpkgvODs1swJ2URvjzu8aA31P4SX1JYLBYcPHgQBw8eRFpaGhYuXOg0VBOoOpS00Zs3UVJSgrKyMlXHc3eNUrZy7NgxlJSUyBJ4Sjr33bt34+OPP0Z+fj7y8/MRERHht+ddTf3KEaeheP5g9EEWiwVlZWUoKytDWloa5s+f7yTEgvWi7O74Ss47kGfl9hsB5i54191D5K+FO5vN9dh46GWMj52IJya/jOjw2IAZl8vbdkcTtp38WUAXTTVb7+LD88X4pHoXHh5fhAfHLAzYQy7V2fzt89/jk+pdAc09c6HpNDY2vYzJI2biiS/8AOHayIDUoVTHffFmOd47+bpfhZe7OjxcWxLUl4VgcunSJWzcuBGzZs3C/PnzER4eHrA6FG8lJSWKPCtqbYWJJCXDaGo69pKSEhw4cAALFy7EtGnTfLYVXxdxD8Qs0UCcv7f6oEuXLmHz5s3IysrC17/+9YDZPgkp/9MvMuHzjZTgnm86Bq1W61dD99aJbzjwIo5e3e90Hf44t7jB12q1OHp1PzYceDFoK9abrXfxQcXbeKP0h+iwt7tck7/LeO3uZWw4+C18eD54if9O3jiEtfufQHnDkYDVoVarFbYdZ9/BxkMvB1R8Sb0s7Dj7TkDqMBQ4ePAg1q1bh6qqqoA/h9evX8fGjRsDIr7EtnLw4EFs3LgxoOJLLMT++Mc/4je/+Q06Ojr6pa0Eug86f/58UPugiooKrFu3DpWVlX63fYIEmKxG0eqwYOuJdfikemfQDJ8XKe+dfB3Fpzb67QFg+/KNcfGpjXjv5OtBEyZiobl2/xO4dveyX8vIN2DlDUfwi8Mvq57W7Gsdbjn2E/zt898HpHwajQYd9na8UfpD7K/a1SvPzP6qXdh46GV02Nv7ZUNtsVjw9ttv4+DBgwGz0bNnz2Lz5s24du1aQNuzjo4OvP/++9i9e3ev3MszZ87g5z//Oa5fv06dutw+yGrFG2+8gU8//TTofZDFYsG7776LkpISqi8SYMF9ADrs7dh46GUhgLm3jO5wbQl+XfYfsDosfnkA2IPEOu5AZyGWI1J+cfhlnK4v9fkhF3dsR+r2Ycuxn/SKuOT58HyxX4S0uHzMRoPluXRH3e1LWLv/CVy9U91vG+rdu3fj/fff93sdHjt2DL/5zW9gsVgC2551dGDz5s2q4sr8SUtLiyA2qVP3bBs3btxwEua9dY9KSkr8YvsECTBZxs86NrHXpLeM7uSNQ9hy7Cc+PQBS5evtjlvsKTpSt091GaXE13snXw8Z+zpcW+JXEWaxmSVttLeF9NU71b3eQAcqfqSsrMynjkhKfP3xj38MSNnFnq9AeNh88ayQCPNsI7du3cKvfvUrlzrrrXvkq+0TJMBkN4xKO7ZgBAxeaDqtugMXu7W3ffZ6yHTcPB+c3aKqAw918eUPESbnBSFURJg4Jqy/iTA1QzK9Jb60Wm1IiS8pEUaduatgfvfddxV5RYPRB5WVlWHPnj0kwkiABU58/fnMFlUdWzAegMO1JfjH5d2qO24WrK0mL1Sod+B8UtUPzm4JWXs7XFuCI3X7fBLQW479JCQFNKvDjYdeDplA67S0NKfNH5SUlODMmTOqXxTYDMRAt2tarRbbt28POfHFizCpwPyBLL40Gg3ef/99VXUWjD7owIEDOHv2LImvEETf1x+A0/WlPgczJw5Jw+QRM5EYlQZjmEn4vtlcj7rWSzjffNqnzvODircxPmYiRg0a43ENtkCUjyVUTYpKFZas4c/R3N6AutuXcOrGIZyqP6Qq9ooNR34376eSa/h58wz5MqGAJVSdNGImEoekCcsO8ef6vPk0LjSfVpXAlfHeydeROCRNcR1qtVr87fPf+zR0PHnETIyL7c7gz5bF4s9R11ol1KFaoV53+xJ2nH0HSzJfcFoOJNier5/+9KdCuXhbuXnzJi5evIiysjLVMwG3b9+O73//+xg6dKjXOhR7N3yJ+WJJM7OzszFq1CinpLFiD9iZM2d8ivliCVVZ1nSX5725GZcuXcKlS5dUn6elpQXbt2/Hv/7rv8p63vuzCNNqtfjnP/+JiooKv7x0JCYmIiIiQvj+5s2buHbtGioqKnDz5k3Vx//DH/6AH/zgBxgyZIjs9osIgg31bLoeMWYAEA4gAoCxZxsEIArAEADRAIYBiAEQa7FYHu8t4aXT6WCxteHZ3XPQZm11+b+s+Fy88uB7sNvtkh2KVD4fT+draLuGv5z/LfZX7ZI8nzdSojPwi4d2OV2Pu9wwcsrnjaz4XCzNXo6suFyX9bX4c/ENibnzDvacew97zr+n6pzP5qzBV8YXwWazeezEmTtcp9Ph3c9exZ5z7yk+l8kQhaXZyzE3dRGMYYNll7Gi4Si2Ht+A6pbKoNRhze0L+O7ehapsPS+xAM/krEGcaZTs8jW0XcP75Zuwv2qnqnOuLyhGZuxU2Gw2F4HAZuGeO3cO69atk33M3/3ud26fQ6n7JlU2/hrOnj2LHTt2oLJSeR1mZGRg7dq1QvnEiUalbLS4uBgfffSR8pcDoxFLlixBYWGhk+AS1yMrl8ViwXe+8x2YzWZV5XrhhRcQFxcn/3k3m7F3717s2LFDla288MILyM/P9/i883bzzW9+U/axlyxZgkWLFsmyGzkiSavVYteuXYrK6s5u+ef75s2bWLVqlWSdZWZmYvXq1X7rg2pqarB3714cOHBA1b3IzMzEmjVrvNo+ofgF6/cAmgA0A7gJoAXAbQCtAO4CMPdsFgAdAKwAugDYfPKAtba2BrWgGo0Ger0eYWFhiIiIwPbyTR6Fgs1mg8ViQWdnJ2w2m9sH09MDwP5vaFgs/nXyKnx1wlP47+PrUVq3T9G1V7dU4sMLxXgodSk6OjqEaxI/2ErK500IdXZ2wmw2OzWQ/Fpe/DCnTqeDXh+Of8n6FuakLsaGAy8pFinbyzdhbuoi6OwGdHR0oKury+W+d59Hj/DwcNzsaFAlvrLic7EmfzMidCZ0dXUpKuP4oZPxi4d24Y8Vv8L28k2K6/Af1f8Ps5K+IrsOt55Yr0pcrsh7DbkJcxTX4dCwWCyfvgFfnfAkNhx4CQ1tVxWde+vxDfj5vB2wWq3o7OxEV1cXHA4HdDqdUCaleHoOvQkwqTKOHTsWa9euxUcffYTi4mJF11JZWYnjx48jOztblo3W1dWpEl8ZGRn4/ve/D4PBAIvFApvN5tTxMZth9zU8PBzbtm1TLL6MRiOKioqQn5+v4nnXY/HixcjJycE777yDmpoaRecuLi7GtGnToNPpPN7LQNuNJ/x9fvHz7a3O/NkHjRw5Es8//zy+9rWvYcuWLTh79qyi8pw9exYnTpxAVlaW2/oigkufigFjxqrX69FsqVfVefPucrvdDpvNhq6uLnR2drrdrFYrLBYL2tvbMTQsFqtm/RLP5qxRfM7t5ZvQCQt0Op3w0Pm7fKvzN+PLYx+HxWJBR0eHU0fKNlZmtrEydnR0wGKxYFh4HDYUFGNu6mJF526ztmLPufeg1+uh0+ncdqis8X+z9EeKyzc3dTHWzy2G3hGO9vZ2WCwWVWV8NPNFrMh7TfH5t57YILsOK5uPo6L+qGLxtX5uMaaO/KJPdTg6ahze/PJupERnKBaZn9bsgV6vF8oSLNgzyTZvZZw3bx5eeOEFxefZtm0bwsLCJOtQbKNKBR4A5OfnY+3atdDr9ZJ1yAQSO59Op0Nzc7Niz4bRaMTatWvxwAMP+GQrSUlJWLt2LZKTkxWdn3nQ3D3v/bLD5J7vCxcu+DRcrLYPioqKwpo1a7BkyRK/2j5BAszr2zFrGN9X6L2Q2+CLN3HDxRqtL499XHEH3mZtxf6qXULn5qnhV1O+FXmvYerIL7pt8KXWABQ3AKxhDkMEvpP3KrLicxVdw57z76HDbnbbubG372ZLvWJxkpdYgOXTN6Cjo0PwQPGdjNIyzk5eoKoOS2v3yapDpR42Jr5GR43zSx2Ga43YUFCMOFOC4heFUOpUPZXxgQceUCzCmpqacOLECUmRydtobW2t4mHO/Px8vPDCCy42yuqPr0PeVnbuVDZkzMRXUlKSX2wlIiJClQjbu3cvLBbLgOjQxc/33r17e7UPeuSRR7Bs2TJF52tsbMRnn33WKy9YRB8XYMxgOuxmxUOAvj4k/urA95z7rVNjJY7LUFu+pdnLMTt5gVOjryR2gjUE/EPe2dmJNfmbYTJEKRaZ3gSYUoEZZ0rAihmvCfefF15qy2i1WvFgyiNYkP6kYoHiqQ51Oh2utH6uWGCuyHtNEF/+qsNwrRGr8zcruo6Gtqu40vp5SHaqUnWYn5+PnJwcRcf59NNPJUUmX4dKhx5jY2NRVFQkeC08iSH+eWcLKythyZIlgvjyl61ERETghRdegNFoVOQFKysrGzACjNlGS0tLUBPkuuuD7r//fsWesIHmtSQB5scHQKfTobR2n6rYqEA0/ko78Ia2q6i5fcGtQFFTvjhTAv4l61sucTtKA1fFb8hWqxUGTSSenbJa0XH2V+10ESji+BOlAnPFjNdg0EQK4osXXuJ183Q6nduNv+esrEuzlysSme7qkC8fWwpLiXcvN2GOX+rQ4XA42eiYoRMUi8y/nH8vZDtVVka+Q1q2bJki4XD8+HFYLBbJGBxWh0o72GXLliE8PFzSRj21Z2VlZYpivzIyMvDQQw8FxFaSk5NRWFio6DgfffSR5AtJfxZgvbU6gVQftHjxYmRmZso+xtmzZ9HS0uJk+wQJMNkesCNB9H7JafyVduCfVEsLFLXlW5q93OmNW01jzCMeppiTukjRMFZ1SyWa2m+4lJE1XmebyhQJzKz4XNw3fJoQyCoexuGDisPCwmRt/LUZwwZjwQRlAoVfAYBdB38t5Qq9X8/krPFbHfrDRsvrj4R0p8q/LHR2diIyMlKxcCgrK3MroM+dO6dYFGVkZEjaqLf2TI33K5C2UlhYqEjM1tTU9PthSPHzzdZ57KsvIMxrSeKLBJgi8aXT6VDecLRXr0fc+EfoTIq8ROX1RyXFiZryxZkS8GDKIx6HO3wtY1dXFxakP6Vo/4r6I26D8JUOzS2Y8JRLhyPuMNlMsoiICFlbeHg4DAYDdDpd9zkUeojKG464eE/YtVhsbYpmkOYlFmC4caRf61DKRvMSC1R7+UIRsY3m5+cr2r+yslJyGFmj0SiO/SosLJS0UTntmZJzxcbGIiMjI7C2EhGhWMz290SfTs+3xaJ4xmig+6Bhw4YpqrOzZ8+SBywE0PcV42cPwOVb53tl+NFb45+XVICtJ6JkXVt1SyUstjbodGHQarXCNHE15ctLKpAM8PV3+aYnFmDrcfkpFapvVeKBxIeF+uMbsfKGI7KPYzJEITdhDtrb2916v/R6PdpwG598vtOnMseZEmSnbajgRLRWq4XdbhfsVKn3a3pigd8FtLs6VJIfrLqlEqOMKSHdsTK77+rqQmxsLJKTk2V3jjU1NW7j+JRM8TcajcjJyZG0UW/tWU1NjSJP2+zZs4NiKzk5OYpyZp09exYTJ07s152lWnEerD5o9uzZsuvs7NmzLu0XJWbtYwIsWI0y/8aoJoFmoDoQ3hUcGTEIeQo6uKqWSowfOlkQYKx8SvM2ZcVNdxElgXjIhxtHIiU6Q/b9r2qpdMltc68Oz8k+fzaXSFZcRv6ttKG1TvGsQ1+5fOs8RkaOETxE7HqU2mhWfODqkLfR3IQ5ivZtaLvq1yHIQD+HdrsdU6dOVSzA2MY/h0o8HBkZGW5t1Ft71tTUpKis/LkCaSvJycmIjY2VfX01NTVOwtKf1+eL3fjr/Hy9Xb58OST7oJiYGGRmZsp6eTCbzWhubsagQYOcRBgRXPpcEL5SgRLMN5DpCoZ4qlvOSWb6Vtp5Z8fnBuzthU/kaLfbkaogp5RYZPGNsxIPX0p0hscYF3bM3qCts1VSoLR1yi+fyRCF4caRfvdoiG2UbUrSiijxVIbKs6g0jYJYhPFZ4uUyZswYVXFYLLu5UgEWLFsZPny47H3VZO/va30PbzOhZvesH5o6darsfRsbG2kIkgSYMuNX4wEL1gOgJOmlv4ZRI/WD/D786E6IKQnE58vHv/E3mq8rOrcnASYWsMGGF9E8VQpsNCU63SVreSDrcFBYFPob/L1TEojMhAMvvLRaLRobGxWLIiV1p9ZeY2Njg2orSmbWhZIoCTShJjb5PkjJCwjzWhIkwGRzt7M1JI3fZrNhuHFkUM+dEp0R1AZZySw6cYdzb63COkX7mgyDQ9YW/SWiA1l34nMozYzvrxeoQDf0rHxKvDbi62M2qnRY0BeUDGcNHz48qLZC9L2XECX239bW5vNLAeEberoF/hViwcRkGBzUxjIlOp0qegB1eEpi9XpTgPEvIGoEGN8BBbsjUupNIXFEeLL/2NhYuiF9iH69DsFAyPJLDTIRKPzl4fO22DBBUB9EkADrR7D4nGDP1OzPqPWI8IH8caZEeuoGGE1NTQHNOcSLOyXpI0IBpTFr1KEHRwQpnczRm/XF2/9AisUjAdYLxMvswNusrUF58+ZTIVy+db5fN2BqPSJ8kKjSODlPQpp5/nrLAxhnShhw3kc15Q3GbCtfnvFAx1B6YsyYMbL/l0/1QCi3DSXxdkqFsRSXL18OmveXHV9J/CI/XE+jKL1Dn8gDxp9LyUy8M43HMG7IJOh0uoDFaPFrD1YozGDPG70v9zKQ8St846EkBQirJ77hUVMHDW11LutJisvdawJsUN+oQ39dm9qZho2NjRg3bpxLjih/PoNqPQDJycl+y1mlpA7VnIvN2OTzlgXC9v1tx731XIjXiFUzuUKqHHLjrFiurcGDBwe8D2KbEg8wm9Th6wsM0UsCLNhv3kpncR2p24f0YVOcGmh/NljiJWgq6uXnTWKddyi/eYiXSSpXWD539ZgVnyt7OaKqlkqXJX94zxebgZoanYH1BcVBvT+p0RmwddoGRAJDds/V5NqqrKzEAw88EHAPgNIEqszTYbFYYLfbgxpCwJ59NfcyLS2NspcrFGBms1mRbUil4FAz0aOsrAwFBQUBHX7nl7VSsq4oe/mgOGISYLIaK6UCbH/VLjwzZbXfFqmWMn7m/Wo0X0epgkW07xs+DRaLJaSNX5y/S4kHLDtuukvnzcoab0pEBeQJsIr6o2jvugud1iDZ6TgcDnR1dUEPPcYNmaToTc7d/3mrDyH7dGd3At6B0njxQ8lKsqTz6875WziIvRxKOqBAJjWV256NHj1a0b5lZWUYP348JdBUYBs6nQ6lpaWK9uXFibjOMjMzZS/5s3fvXsyfPz8gTgDe9vV6Pc6dOyc7h93w4cMRGRkp9EFE79BnYsDYcguxkSNkD0O2WVvxl/PboNfrodfr/dpoiY3/fQXL4GTF5/ZKw6/W+6XT6XBEgbgEpBOost+z4nIVHau0dp/L4uViQdDZ2Qmr1Qqr1YqOjg6vG/s/q9WKrq4uYevs7PR6LPa3zs5O4fwDBXbPlSTpbGpqwvHjx4Vn0F/PofgZPH78uKK0DsnJyU7PYLBFmM1mQ2xsrKIh3bKyMslngfDcfikR5u68Q8z209Plp+NpbGzEuXPnoNfrnerNn30Q69/27t2r+uWDRBgJMFlvjHa7Hdnx02Xvu718E6yOdr8+APyDrdfr0dR+Q9Eix3mJXwppw2eNFyufXq/HnnO/VXQMfokk8ZaloP4AYM/599zWn3g5KCagPG1MbPFeUXfH5I/Ni7RALIjcV55Bh8OBjAxlCV337t0r2JJOp/OLePClAwKAqVOnCnXdWx4wtn6lGjHr7w69P3q+9Ho9Ghsbcfz4cdn7x8bGIiYmRmgf+DpTs+TPli1b/G77/IsH834pEZmZmZkkvkiAKX/zttlsmJO6SPZ+bdZWvHl4FcLCwvzSaIkf7rCwMGw48JKiY0xPLHBaPiiUHgCx+AoLC8Nfzm9TNPyYl1iAcK1RcriQeTFTFK0rWYkjdfuFOmSNj7hD49ex87Yx0aXT6eDQd+GauRphYWHCOcS2Ig5EF9fdQBJhSkUD0B27dPz4cafn0JeOSNwBVVZWorJS/hJQRqMR6enpAQlNUNqeKb2XO3bs8HuH3t88X/zL4zvvvKNYmEutMKLW/hsbG/G73/3OL7Yv9vqGhYXBarViy5YtimyflZHiCPuwABPPTgvkxjdambFTFc2GLK3bhw8vFMNgMMBgMLjtYD1tvOjS6/XCsTYdWa1ofcqs+FzERo4Qhq38MUXZX/dY/GAbDAY0td/AdgXDq0xguvMOsTpcMOFJRcd8s3QVOuxmQSSx2Du59SdVj6yMbx5ehe/uXYhlH34Jm8v+DScb/4mIiAhEREQgPDwc4eHhMBgMkiLe3QzNUHyW/HFtQHcgfmRkJPLz8xUdZ8uWLbBYLE73UjzBQm796XQ6wRY6OjoUdUAAkJ+f72Sf/vLIqWnPpkyZomgYsqamBjt37vTpPgbDVoL9XEi1XwcOHFAkzAHgoYceEtovsW0wETZ16lRFdbZ371787//+r1MfpLT94oPtWfnCwsKwceNGReuXTp06FREREZJ9EG3Be1b6nAeM93IsSH9K0f5bj6/H/1zeLfkAePKIiQ2fF1+/PLpG0dAjACyY8BS6urpC7u2D79zYw91hN2PDgZcU5f8yGaLwxTELJQUY/9afl1SgaG3JNmsr1h94yclLpcSbKdV5GwwG/PXz3wmTJxrarmJ/1U5sOPASHt+Ri18dW4uDtR/CprUiPDxcEH4DNf6Gf/66uroUCzCz2Yx169Y5iTC1dcg62bCwMKxbt05xioHCwsJejYERt2eFhYWKvWAnTpxweiEZqMORUuIrLCwMV65cUez9ysjIQGxsrFvPKPPiR0REYPbs2YpfQKREmLe6cycuOzs7sWXLFsXJhwsLC0OyDyIPWB/pAGw2G+amLlK8OPSbpauw6chqdGk6nLwa7CHgHwbxd8zow8PD0aXpwGsHv61YfKVEZ2DaqAeDHjsk16PAi8sOuxmr9xUp8u51C8wn3cZHCbMHbTaEa42KvWAV9UfxVumP0QmLIIjEjRgvjvjZcVJl/J/Lu7H1+Hq3gm9/1U68WboKSz+Yiv/853L8s+6vuOu4NaDjbvhnMD09XXEsWE1NjZMIE3dEfD2K644XXuHh4bBarXjllVcUp57Iz8/HsGHDem34UepeFhYWKs6vtmXLFpw/f95jhx6It/agdU4iO/BkF7xH1GAw4Pz581i3bp3icy5ZssStOBG/gKits127dgl1JmX/nvogZvu3bt3CK6+8ggMHDig6f2ZmJpKSkgZU/CoJMD83WF1dXTBoIvHslNWKj7G/aidW/G0hKpuPCyKMdeasQ+c/mcGz//u0Zg+e3T1HUcoJxrM5q4MevC0ltPjOjH+jYlvN7QtY8beFisVXnCkBj933ktfhR9bpLEh/UrGI3l+1E6v3FaHZUi/Ui3h4kB9i5uuRF9CbjqzGm6WrZJ+3tG4f3ixdheqWygEdcyOe9FBUVKT4GDU1Nfjxj3+Mc+fOOdmd+LkTP5Ps/8LDw1FbW4t169YpHl5inSyz0d7shJxeSMLDFXvBmEdR3KGL4xjFHXtfsV+x8HBnF+I2eteuXVi3bp3ihc5zcnKEuEB3dsHb/7BhwxTXGfNerl69GhcvXhRCHJT0QSUlJVi1apWqZYeWLVs24CYQhTL6vnSxvNu+q6sLD6Y8gv3VO2Un9WQ0tF3Fmn1FSInOwIIJTyIvqQCREYOchiN44dJovo4jdfuw59xvFQWj8+QlFiAzdio6OjqCKr74N0a+4ZXyEjWar+P945sUe/buCcw1Xh9uJxFt6BbRSoQQ0B2U/9zuB7E0eznmpC7GcONIpwB7T/fgk6pd2F6+SVU95iUWIGfEbHR0dAzohouvw8TERCxZskR2XiRGU1MT1q1bh/z8fDz00ENOKSHE95a31aamJuzYsUPxmz8vvqKjo2G1Wnu9AxK/kBQWFuLTTz9VPJy6Y8cOlJWVYcmSJcjJyXGZbCIVRN5Xhp8MBoNTPJY7uzCbzSgrK8OOHTtUZbw3Go144oknZLdf7AWksLAQBw4cUBSDxV5CXnnlFWRmZiI/Px9Tp05FZGSk2z6oubkZn376qapz8bY/dOhQt7YvnglOhLgA6623KPbW2NnZiWenrMGa/UWq1imsbqnEm6Wr8GZp9/BgvCnBaXZedUslqloqVYsuhskQhRUzXhNc2+KlT3xdboNvjKTEh06nA8JsqGqpRGbsVOH/upOr1qGi/ihK6/Yp9njxzE1djGmjHnQSJ54SnbIG7MGUR3Ckbp8qj+L28k3YXr4JeYkFyIqfjpTodMSZEhFnGtXtIei8011/d6+ioqG7jGrXs2R1KCXwAlmH/hLi/r42vg4XL16MsrIyVW/kBw4cwIEDB5CcnIyMjAwkJye7ZBpvbGxETU0NKisrfVpsODk5GYsXL0ZHR4dTigHxi4mv91jpMe69kBiwcuVKrF6t3LNfU1ODjRs3IjY2FlOnTkVmZiaMRqMwROxwOHDlypVuT3VcnNtO1t+2ovZ4jY2NsmKbKisrcfnyZVRWVir2ePEUFRU5CXNv18zX2bJly/DKK6+oOu/Zs2eFciYnJ7vYf2VlJRobG1WLLk+2z9eTVqtFW1sbKisr0dTUBI1Gg/T0dIwePdplGJYYoB4w/g2EPSBJg8eq8qJIibHqlkpVQsAbq/N/BYMmEtZOq1PDHwwPGJuS/XlLBdbsKwrIeVKiM4ThVTlv1vzQS2dnJ1bMeA1Vf1uoWuiWqhRwfaEOQ/k55Otw5cqV+PGPf6y6E6ypqfFJXMnxcKxcuRKdnZ29Hvvl6T4mJSWhqKgIxcXqltVqamrCRx99hI8++kjy7xkZGfjhD38Iu93u96XZ/AkT5sEgPz8fDzzwgGzbENfZ+PHjVXmBg/UMGI1GLFu2TLJ8TIBdvnwZW7duxejRozF69Gi0tbXhv/7rv5Ceno5HHnkEkZGRkh4ySn/iG9q+eNHiB2B28gIsSH8yJK91Rd5ryIjJ6bWGn3nBAoXJEIXV+Zth0EQ6JTeVI6KZB8WgicTq/M2K48EGSh2G8osQq8Po6GisXbtWcVByMDAajVi7di2io6NDMv6Fv5ednZ2YN2+e4hmmihp9St7qJEhfeOEFIcmyXLsQ19kjjzwS0DrzhRdffBEJCQlOts+/oDc1NWHr1q1YtGgRZs2aheTkZOTk5OA//uM/AABbt251sReyoQEswKQegKcm/QhzUxeHXMc9O3mB0HH3VqMfqAfFZIjC+rnFiImIVyxOxCJ6dNQ4rJ9bHHIiLFTqsC+8CDHvTaiJr2XLliEpKSlkBTR/H9lKC88991zAOnTqOLtJTk4WvKK8+FLafgWjztSybNkyTJ482aP36+OPP8b8+fPR1NSEjz/+GDU1Nfj973+PkpISfOMb3wAA/POf/3QSbQQJMJcH4FvT1oWMCOM77kAtBt6bxJkSsH5uMUZHjVMtTsQiOtREWH+vw0C8CD3wwAMh4wljnq8vfOELIS+g+0qH3l/IycnB2rVrYTAYVHtFQ73Oli1bhvvvv9+r7Z84cQI5OTkAuj2C8+fPR3p6Oq5cuQKNRoNZs2bh3LlzHgU9CTN19MkgfDEsIBIAvjVtHbLicn2OCfPFK7Qi7zVMHflFpzcrT/fM35nK/XVcd6REZ2BDQTEMmkjZZZRbf0yEsZQPA70O/eXxCPS18XU4YcIErF27Fhs3blQ1I80fxMbGYuXKlYLny1sd+jsTvr/as+eeew7JycmqY8KC3WaIjxuKHfOSJUuwePFiYW1Ym83mc58mrrPhw4f7HBPmy4vHv/3bvyExMdGt7fPlNJvNwgvTwYMH8fHHH2P06NF47rnnhONJxXa6aweJAeABE7+FsAeAxYS9Ubhb0XJF/hImbxTuRs6I2arc2n2BpdnL8YuHdiEMEX4po1T9JQ0eiw0FxchLLAh6+bLic/t9HQbjGUxMTMSrr74qvFkH27vx6quvunRAfaEOpe7lvHnzsHbtWsTGxpKx+SjK165di0ceeQRWq9VvXm2pOnvkkUfw/e9/P+ie4MzMTLz11ltISEjwaPv876NHjxZmyM6aNQurV6/GlStXhJenK1euYPTo0eTxIgGmrBN/88u7sTR7eVA8Js/mrMEvHtqFaMPwftlxM2HyaOaLsFqtfi2jVP3pHeH40QObsDp/c1CENKvDdXO29ds6DPYzGBYWhu9973tYuXJlUMQD62C/973vISwsrM/WodS9HD9+PF599VUsWbKEjE2FR6ioqAhvvPEGxo4d69J++WNYWqrOJk2ahLfeektVslY1ZVy2bBnWrFmj2PZzcnJw8OBBp+do/vz52LVrF8xmMw4ePIhZs2aR6AoA+v5SEGZg7AFwOBzQ68Lx2H0vYU7qYrxfrj7BqKdOe8GEJ7Eg/UmEa42wWrtTFPBvVaEy1d0X4bU0ezkyY6eiq6tLKKO/OzW+/vhkkVPi8/HOVx/En85sxv6qnT7nZPNUhwZNpM91qNYLGKp2oKbs4jqcNGkS3njjDRw8eFB1okxvwmvJkiWYNWsWbDabpI3KLYfauvB3HUq1Z2FhYVi0aBHy8/OF5Ktq0n7IDTL353F7ox3MycnB1KlT/WIXqvsgvR6PP/44CgsL8ec//9nvqTWMRiMKCwtRWFgIg8GguP3SaDTIz8/HL37xC0F4AcD8+fORkZGBN998E7NmzXL7AkXJW3tRgIWqGmbj3awTiDYMx7dz1+PZnNXYX7UL+6t2+hRfxGfQj9CZhABkKWEid5HhQMWAqXkw4kwJyEsqwJyUxUgeMl5ovKSyzfvbBqQ6cZvNhiXpL+Cx+17CsWv/wCdVO33O+5WXWIDpiQV4MOURod46uzolM4jLrUM19zrelCiZENSfqL02fh8l1+auDmfOnIlZs2bhxIkTKCsrUy0gWMczdepUTJ06FVOmTHGxUXHn4+3afblHau+T2vZs6NCheP755/HEE0/g2LFjOHDggKIlmTxdq79txdf7qsQeWCLTzMxMZGZmIiIiwme78FedDRkyBM8//zy+9rWv+ZzRHoBg+0xc2u12dHaqa7+MRiO++93vYteuXVi5ciWSk5PR1tYGs9mMRYsWYcqUKX1aD4Qymp5N1yPGDADCAUQAMPZsgwBEARgCIBrAMAAxAGJv3br1eMgWTLTgNL+AK1t2p6L+CKpvVQrZ0qW8K3GmBMQNSkB23HSkRGcgOz4XkfpBQqfCixL+oVMCv8r9nyu3YHv5JtneqX+f/RvJQEt2D9h6atfbL0uuGJAVnwsASI3OQMrQDGTFTxeW9hGXL9hePW91eKbxGCrqj6Kh7Srq2+ok65DVX7wpEXGmBGTF5+K+4dOcloBhjSSf5FdpGcX3uq1TXsb9OFMionTDnN5aA3Ef2bW12m6ioa1O9r5joyb6dG3e6pDPcM86JLGYYNncWZZwljHfnzbK3yObzaYoIWZycrKwXyDr0NN9NJvNwr28fPkyzGYzGhsbXbyN+fn5eOqpp9xeK38f7ty5o0gkpKamuhyXP15VVZXf78vw4cMRGxvrVO/ullzqjRyMnuqsubkZZ8+eFRKwsnqTsi+TyYSMjAyMGTMGGRkZiIiIcLF/Ne2XOEek2WzG5cuXYTKZnOK+QsmzGWoMHTr09wCaADQDuAmgBcBtAK0A7gIw92wWAB0ArAC6ANj6rQCTegjYg8B/KlHt/IPNf/r6cAdSgPHLEbEGINjlC5U6FJdP/LMvDYrSe83ekvlGNFD3OBSuLVB16C8bVXOPglmH/riPcq7V37ai9r4qsQWp+nf3fX/qg8TPgNoXR61WK6yMoPQYJMB8E2D6/n5z+IVNWWMhNVVarqG5e9hDtey8O9zTGmehXD5/1GGgy6fkXouvJ9AddyhcW6jXofgesfxOnpbrCWYd+nof5V5roGyF/zuf9sHX+pKyAbGQ6O04pUD3Qf6yfV6Uefo7/zvFgPlGv4wBk2vESsvgblFSf+QP8tdblqe3VG/nClT5QqUOg1U+OfdaTsMXCELl2kKxDvlniHWY3jq63qhDuR2lt/vlzRPlrszuyii+f1LnkhJO/hIO4nPx16JWsHgSs6HSBynJx+XORsRCiv9d/BIi/pvUPkQQBFhf9ooNJNXeH8sbqmUK5XsdatcWqveKHx4KpaEsKbHjLScTXwZ3+7qrF/HQltwEq1ICg7+fgYjJ4uOsdDqdixjkh0jl2pvUPfK3xzUQti9Vv756iz15usjzRQKMIAjCL52XTqfDNXM12jpbYQqLwihjSkiKLz6w25MYEscJAZC1Hz9JRSxypPYVd/ZM7Gi1Wvy/qp+i9s5ZAMC3J/4mIOKLBfufqD+APed/i4r6owDuzVqfOapQ9nnF95gXj2on6gTbNpgQZdfqSYCq8SZ7Gp4nSIARBBHEht9dw+wtD5HS/QJ5LtaBbT2xHhX1R5EVn4v/O+u/vQ7zBPra3QnFx3ZMlL3PHxefEvb1tF9KdAbyEgvwtYxlACDEbLFO/T/++awgbtztuyD9SRj0kXA4HN0z/trrcOHmEYwfNt0p+NzbcJdcscSu7WDthy7L0FW3VKKh7ariITJ2jz+/fQoV9UcRZ0rA/Qlf7jUxLvc+8de9Zl8RAGB9QTHGDZkk69qlvKWhHJIyYAUYVYR/31rU3E85wxAEEQzblYpJEg99iIOO5e4nx9bdDWvJPZe39RG1Wq1LGQJ17d6EpJrZhOy8Op3O4/9Vt1SiuqUSpXX78PqX/uxUd97Oye+7oaAYkfpBAICkqEycbPi70/U7HA6X4UJ398SToOWHHree2ACge4b4s1PWIH5QAqp6cj6KY9E8iQomYrRaLSrqj2J7+SZkxecif/RXhXshnnXui0fJWzyfXNvxZBvse6XiUe5LDUEeMIIggvg2zk+pFw9LifMwSQkRqan4Uvt5O5c475NUx+XtXDzPTlkjDEFKXXcgrl1uSgGpznhp9nJ8Pfvbkufmj+tuP/b/l2+dx/vlm1Batw/VLZXYe+kPmJ/ydaeZe4ys+Fysn1vsdt+txzfgO3mvur1+JhLk1qe7oHsmlmpuXxDyHK7I+0/EmUYBgJD3j81qdefNFHuY2HF5dDqdIg+S1LHdxeNJHYN9ilNXeLpP3sqodugwWEl1SYARBEF4gfc86HQ6nG0qE4amsuJzkRqdgfAwo9OadOI4Iq1Wi/auuyi/cRTVLZU9yXKnY1h4nJDUk/desHPV3L4gDC2xfWIi4l1SRyg5F58LKXnIeOE4/BCc+PrVXntFw1G0WVuF5M4RYSaXxJpqvA/i+Cuxt8edx4LVT/KQ8fhx/q/w3O45aGi7itK6v6Mw7Rse9xfvu2Z/ESrqj2J/1U4XAZY0ONPpnjCR02ypR0NbHSrqjyIlOgMmw2BkxOQI91DqfvAvAVqt1in5MRNfYhHD9uOFqjsx7S7OjYky3s6k4t+kji32vPHi092sTd7mmtpvoKL+iGD3KdEZGB01zim1hycB5gskvEiAEQQRAt4v1iHo9Xocv/Ep3ixd5bzKQnnPAudTVmN28gIhmFuj0WDn+V8LyYaXZi/HnvPvuazQsCD9STw16UdCw886vto7F4X4LDF5iQVYMeM1GPSRgpjace4dYfgoO2665LmWZi8X4p1Y+f50ZrOw37/P/o3QebNrl3s8OdduMnR72dqsrViavRyLxj8X1DgjsWAAgLhBCbLWXeUD9Vm8V17il1zKyISXkfMoarVaWB3t+Pn/rpJcWoyt0+rpfjCxweqLsfAPE5w8da88+B7+z/88hYr6o073mL8WFtvG6lyj0eCR7enCcSrqj7ocl8UHfu2DLADOsVb8sVnM3fqCYowfOlm414/+OVv4vs16B9vLNwnL5LHr1mg0aDRfx5ulP5K0+6z4XKzJ3wy9LtzjsCjRzwQYjf/6r0PzxzGoPohge76O3/gUGw68JHSYeYkF3fqr5y2dBUR/ccxCJw8Tg3WazOvBOpg9595DnCkRXx77uNBZNVvqheW0TIYozE1dBFNYlBBzVFq3D3cPvIR1c7a5PA8V9UedZsXx52KCKn3YFMl8RlJDP0qOp9Vqna6d34cdS3x/vcU9uYPFVIljncRxblLl48veZr0j+7ziuD5ekLLzxkQmYPyw6YiJTHQSpas/KnISHNlx01HecATVLefQZm1FecMRLJ7wvMfYvG6PV7c3iD8WIzU6w2VfVl673S4ZM8V+z4rPFZY4MxmikBKd7nRcKS+Zt2PrdDrhb4ytxzdIrk+s1Wph7ryD7+5dKNh9XmIB4kzdAnl/1U5U1B/F6n1F2Dh/p6ylsKivIA8YQRB9+GWBCTAmsFKiM7ChoBjGsG5RYe68gzcPd3s2tp7YgLykAiEgW+y1eiZnjTBk1NB2DRsOvITqlkrsOfdbfHXCE0KH/Wbpj4RhO/5cAFDRcBRr9nUPfZ1pPIb7hk9z6WTE56puOSeIok+qdiEjJkdSaEjN1pNzvMzYqYIAe798k9CBrs7/FbLi7gkEc+cdrN53T4io6Rz3V+1EecMRj//zk/x3PQo3/l6ya8lL/JLHmDReLDJBwa4jzpQgDOHGhadh+aTfCl4ztpYrO8/6gmLhnnwd3wYAfFK1C0fq9nlciYD97cGURxA3KOHerL+5xS6xcJ5Eo7s6Xz+3GO+X/xLbyzchJTpdOK7Y66f02GIRVN1SKaTLiBuU0P1C0+Mt3Hp8g1u7/+qEJ/HdvQtR3VKJ/7m8G/mjv+q2rggSYARB9AMRptFocOzaPwRvx+r8zYjUDxJiUSL1g7Bixmso/WAq2qytKK3dhzmpi1yO9eP8X8Fut6OrqwsajQbDjSOxNHs5Nhx4CQ1tV1Hdcg4p0eloaLsmeIpW52926oQAICsuV/CAVNQfdRI4zJPBzsXixFKi05GXWID9VTtR31bnUfiI/ybneEyctHfdxf6qnQC6hyez4nKdhmSNYYMFb5i445bbkTa0XZU1ZCi1X0XDPQ/ckbp92F+1SxDVD4/7Jrq6ujxmOmfiraHtGv77+L0h1rmpi11i2njvEk9qdIbT73a7HbOTF2BW0le8enXceQvZeaVmb7rLYSYHPn5Mqixyji3+bkH6k3hmymrh+OwZM3feEWzn2ZzVLnbPbK60bh8qGo5idvIC4X7cN3ya2/tFkAAjCKIPCzDmvYgzJSDONApdXV2CANPpdDCGDUZWfG73cF3DUUkBJk4QqdPpMD1xrsgzkI6K+m6viskQhU96OiQxTMRIDeXw5+KH4uJMCarvg5zjaTQaIQ1CtyhZJAToy03tIIe5qYsl768cz9l+ifvJ4unEw5c89zx+d1zu+dzUxXg080VhAgY/Q495wJiHBwBW7yvCgglPIit+OuJMoxR7AcWigp8ZqHbWn5SwE89y9Vcy0uk9Q/e82NXpdE62ww9789ztmXxQ31bnVFeUsb6fCzAaR/Zvp+brvlQfRLDEl0ajEWadxQ1KkMxj5XA4MKink61vq/PYyblbI5B5ddhnm7XVKdhairudrR7PxQSAVLoAdzFgUt97Ox4vVBjGsMGCKPHk5fL2TIu/jzMlCF4/d2koxHFHgnjuGfJicVcmQxRWzHgNxrDBTjM5xbRZW10EQZwpAQvSn8KXxz7uNEwn5UUaHTUOc1MXY3/VTlS3VArD2SZDFLLjcjE9sQCzkxc47aNWPKm5x3LsVU2b7M6epGZm8vfXm917Kr8pLErV2pMEecAIgghBGu5edfuGreRtW+xh8dRBxJkSMDd1scfjsdgjd4LJnXfDFw+J2kWe/R0Qzaf8cFcv/O9zUxfj69ndMVcsjq7N2orV+4qwoaAYETqTW8GQEp2BZ3NWC7+nRmcgQueaTkPqWpgo/HbuemTF5WJ/9U5BbLRZW4VJFRUNR/GtaeucJnD4w5MjzsSvZPkdT8LZ3XnUiDvx8ZdmL5dl91IeMJaqgrxgJMAIgugHpERnoLRuH9qsd5xm0gH3cigxb1S8KdFtB8XnZ2KzvhhsNhtL1dDQdlUQDHzHxTo5Pl9UqLzp8zPnGtquITZyhHCNntZjVCsI5Xh/pPbNisvFirzX8GbpKlS3VGJ9z4xS3mvGX6vJMFjwurHOnQ2h8Qtuezqn3W7HF8csFIZPq1vOobqlEtvLNwmz/L6evRzRhuF+S83R1tkqudajXAHG27k7Dxc/q1Rt/TocDqRwsXEL0p90igET2z2fs078/BChiZZuAUEQajp6Fu/UnRD1GnQ6HfR6PfR6vSCk+FQNnjo0lqRUp9OhtHafk1cFgFNQ/Sc9QeKeREcoEceJz0+qdgr50/R6PXQ6HcyddyTTPqj16nja3NWnzWZDV1cXvjhmoeBhrKg/ik1HVjslnnXndWP78/FtnvJ2iX9m/5sSnY45qYuwvuB3nGit84tIZcPhVS2VQowVW27IWyZ6sb1KJVAFur3C4gTFauLZ7t2Pe8/Nfi92L3Wt6+Zsw7o526jR6o8eMBpL9g++DkNQXheiN2w1L6kAW09Eoc3aijdLf4Q1otmJW49uEH6enlgg6ZUyd95x2qe65Zywnt/c1MUwhg3u8QSkC7Mct57YgLhB3TFP/PU0tF3D++WbEGdKwGP3veSxzfLX8+LpePeE6ihhMgKL42GeieqWc9hz7rcuMxg9PdOe/qbX6yWH/TzlARN35MunbxCGAfdX7URKdAa+Mr5IspziJZS8rYHIe552nHsH1S2VTqk8eNEleNpEy0EpuU/89TCPbUX9UWF2LbPBPWfec7vAOG+bvL3yxxbyclXvxJzURcLM0G57Xq/q+XI4HIiNHOFkO3GmBExPnOti9385/1uYwqLwtYxlQj132M2oaq4UXmTCNBHQarWUrLW/CDDCv16F3tiXINS8ndvtdoTrjHh2ymq8WboKFfVHseJv97wn+6t2CqLi2Zw1GG4cKWmnSz+YKogRfjadyRCFr2cvdxITK/JeE/JsrdlXJCzjAwDl9fdyV7FYGanzefKUufMkeMqD5e14zLu0Iu8/hWSa28s3AeXO/2syRLlk1FfyzG8v3+Q1SPvPj1Z4XcyZxVqtmPEa6ntyk209vh6msMFuZ7HKGW50J1xZrFdKdIaQxJcNPTKhmjxkvDC06a4OvN0jh8OB6YkFwj1as79IEGDuhBfbn+3XZm3Fir8tRHb8dNS31WFQWBR+eP9bwsvC9vJNqKg/iud2z0HcoATJ2aFK7EmoC852Nhx4ycnuq3rSrvB2z+5v1c3Ke3nRCoqRPmwKNWAhBg1B9nERRuKL6A07ZQHWXxyzECvyXoPJEIWGtquCEGDia2n2cjw87ptCULbYXk2GKGF6PeusUqIzsH5usbC2I9t3dNQ4rJ9bzHmPKrHn3HvYc+49p32z4nMlO2s5v7vbT+3xWJljIuLxRuFuzE1dLMSzAd3pHt4o3O0UJxaoZ19qLUIpAWaz2RCuNWJ1/mbhWree2OA0m9PX9sfhcCArPtdpGJvZDhNfeYkFWJO/WXY8mTuRw8o1OmocVuS91iP2W53SOsxNXew03Cfeb0H6k07isKL+qBDf6HA4sCD9SWH/hrargj2bDFF4NmeNanuy2+2C7UjZPbv+7nVIc70u5E6EFpqeTdfjDTMACAcQAcDYsw0CEAVgCIBoAMMAxACIbWtre5xuoR8qocedrNPphLXr5JAVn4uf5L/rMeaCIAJls3wsTIfdjNLafYLwijMlIC+pAOFao9PUep1O57Ru3+5vnEdFQ3dHaDJEISuu2+PB51sS3ha58/GLEjPhlRKdgdjIEU7nu9nRgIa2OpjCopA4KM0pSFmn06HF2uj0d4bc770dT2pRcCnYGoPrC4qREZMjOZtRqr043/KZ7DqbEP0F4b6w/eJMiYg2DHeaIceOzZZQYsOBcaZExEaOQM3tC2jrbHW6B0raHz7uT6vVOi2sfk9MTBfqkj++VJwTu95OWIS8WROiv+CxTCyXnMkQhemJBYgzjepOw8GVi9keq7dmS71gcynRGYgzJSBp8FintBHHrv3DKT9eXlIBjGGDhWS3qdEZCEOEcP2sHtj3fFnFEwWk7F58r/j0Jvz9kDo+4R9MJtPvATQBaAZwE0ALgNsAWgHcBWDu2SwAOgBYAXQBsPkkwMxmMwkwP3docoNmxW+t9EARvfXiILZbKa8K68ikBJjYnt0F1nsKLPe0j9ijwAs68d/d7efL8bzNtvvL+W3Yerw7Tmj7o2UwaCK9dpRy2wsl94W/Xqn1L90dW2n7wy9nJacu+Zmt3u6F3DLJbVt5ceXuGqXs09ux5dSDJ5t3d6/E5RX/H/UV/sdoNKoWYBQDFkLwS1DIgd5kiN6Ej1URdyb83z3lyuKzyUvN6JL6f3eB71L7SAkidgzx4uBqBJin4/H/X9l8HGv2FSEvsUDw1rVZW1HRcFQYcpubuhgROpPgVfP2bCtpL7x1/Erq1VP9yLUb8f2SYzty7oUvZXJ3Pl4Eis8hdU+VHNvTNUvZmFy7F0+4oL4iNCEBFmKdmdJGjR4qorft1tOSLOJ8Se6WdvE0nd5dZ6QkIFvOMyYnmFvNM8t3mCzoXExWfC6ezVktO6BdTXuhpHze6tXX9sfXupRz/WrL5En4e4rbUntsud+ruVdq+xWCBNiAF2IE0Z/slnWAWfG5WIrlggBTk8fLV9HhD9Hl7e+88EqNzsCKvNdQfavSaX2/1OgMZMVNx7RRD0rGvQWqvfDX/QulNi/QZZJr44EsO72ckwCTbGAIgiDkdAoTor+A9GFTZOWN6i9lNmgjMTt5Ab44ZqFkJym1wDO1rwRBAowgCMJvYkTqs7+XWUk8FXkuCIIEGEEQhN/Fl7fv+nOZ1Q5tEgQxsASYQ+H3BEEQqoQYlZkgiL7+mCvVTBQDRhAEQRAEEWS0/lJyBEEQBEEQAxhF2kmrUmSRECMIgiAIglCpm7Re/sFBIowgCIIgCEKxFvKoqeQG4TukNooBIwiCIAhigAswqc2rQNO6EVtKDk4QBEEQBEEizL1OctFZ7oYgHW4Oyr6z92wEQRAEQRADFaaHvOkmsQjzOAtSauNPRAKMIAiCIIiBLsDE+kjWqKFWJLrgQcXZJTaCIAiCIIiBLMDEmywvmFQQvjevlx2ADYCNgvAJgiAIghjA2Ho2Ka3k0QumlRBe4A7AizD+JOxngiAIgiAIEmDOPztEWkqssySD8N0NO7IDd7Gtq6uLhiEJgiAIghhw9GigLm6zQd5wpKQAgxsBxqs7dqLO9vZ2K1UBQRAEQRADjR4N1CkSYFJDkl6HIL2Jry5OgHUCsNbV1bVQFRAEQRAEMdDo0UC8CGMayS5HhOnhOd2EXSS+OvmtoqLiemZm5kiqBoIgCIIgBhIVFRXXxbpIJMI8DUU63KWhYBvvTmMKr7NH8XV8/PHHF6kKCIIgCIIYaPz973+vAtABZy+YeCjSXToKsDwS2p5Nh26vmKFnCwcQ2bOZAAwGENWzDQUQfeXKlZdGjhw5lKqCIAiCIIiBwPXr12+NHj16M4AWALcAtPZsdwC0AWjv2ZhAs0IUqM+vBSn2fEnNfuzsOVgHAAsAyy9/+ct/UlUQBEEQBDFQ6NE+lp6N6SI+Fkyso1xmQzIPmAb3PGDevGCD0O0JG8K2M2fOPDN+/HiKBSMIgiAIol9z6dKlG+np6VsB3Oa2OwDuwrv3S8gT5m0WpDj3lxD/1XNwMwDz888//5e7d++2U7UQBEEQBNFfuXv3bvszzzyzh+kfkdCSigNzOwtS1/PJe8L4TSux6US/a2prazuuX79+8+GHH87UarW0PhFBEARBEP2Krq4u+7e+9a2dH3744UXc83YxEcYPR0qJMX42JADXtSDleMA64DxUqQOg27ZtW6VGo/nTW2+9tchkMoVTVREEQRAE0R9oa2vr+M53vrNr27ZtlSLh1c4JL1UeMIbGzaZ187OTt+vUqVO3SkpKLj744INJw4YNG0RVRhAEQRBEX+bixYs3FixYsP2jjz6qQrfnS8r7xQLxrXC/NJGTENOJxJe7T158QSS+NNwB7devX2//5S9/Wd7R0dGanZ0dbzKZIqj6CIIgCILoSzQ0NNzesGHDvqVLl/7t+vXrzZzwYuLLjHtDjxY4J2RlIkwsvlxEl1ho8XFeegBhuDczMpzb2OxIY8/G/x4BIHLBggXJS5YsGT9t2rRkg8GgHzNmzDCqVoIgCIIgQonLly/ftFqtXceOHavZsWPHhT179tTgnoeLH3I0i37vgKsHrFMkwFySsmokxBgbYhSnpWBCLKxHfPEpKiKY4OJ+Zhv7X7YxMaeDa0A/LwQJgiAIgiD8Ae+BssN9rlMrtwk5T7mtXfRzB/e/Yu+XOA7Mzl2LUxC+A/eGE8H9s6bnABoP4ogvRKfownnhFcaJOV6A8cObWpEgJAiCIAiC8EV8gRNAvCCSmmzYKRJh/GaBq8erw43okgrAdzsLUizEeMXmrlB2DwJMjvjSwkNgP4kxgiAIgiBUii7xdw6RdpEjwsReMd7jJR5y5IPvJYWXOwEm9oLZPQghh4QA4114YuEVxgkvJcOPJL4IgiAIgvBVhHkbhuQdSWIhJv7sgvOMR6lZjx5FmF7GRfNesC64DlHyIoxdhL7nwvQi8aWHm2Su8OwBIwiCIAiC8FWQefKC2TkhxXu0Oj188t4zd0OPUt44r0OQTCVq4eoNs8M1aaueE2CdcE7WKld8kQAjCIIgCCLQAsybCOM/xZ4u/tMuIb4UD0FKiTCNGxEmvngddzG88OJnU+pEwksq9osEGEEQBEEQgRBgkBBgUvHsNjiHV9ncbFJDjnaJ87ngTey4S8Yq/tRJfPJiS8rr5WnokUQYQRAEQRD+Fl9iASYlwsQeLbEg4z8dkPZ6eRRfcoWOu4W6vYkxKcElZ0kjmgVJEARBEIS/BJc3ESYOqZISZHJFlyzxBbgfghRfsEbiwjUSv7OL5DPquxNcGglxR8KLIAiCIIhACzGp4UgpQWbzINTAfQcl4kupwJFatghwv4C3t01KeNEwJEEQBEEQgRJhDgVCTM4mPo4s8aVW5EiJJCkxBpk/k/giCIIgCKI3RBg8iCl3Ag2Q9nQ5lFyQL0LHnYByJ9Dk/D9BEARBEEQwRZk3QSbn/30WUb7gLYZLE+TrIQiCIAiCUCqWvHm1HP64kGAKHhJXBEEQBEH0B5HmuyhyOBx0qwmCIAiCIILI/x8AbQIEFE/L9DgAAAAASUVORK5CYII=]]></BINARYDATA>
-  <WIDTH><![CDATA[608]]></WIDTH>
-  <HEIGHT><![CDATA[217]]></HEIGHT>
-  <MIMETYPE><![CDATA[image/png]]></MIMETYPE>
-</AD_IMAGE>
-
-<AD_IMAGE>
   <AD_IMAGE_ID><![CDATA[A2C65B8DA5F749069C95EC61E08219A5]]></AD_IMAGE_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[DC206C91AA6A4897B44DA897936E0EC3]]></AD_ORG_ID>
@@ -304,4 +288,20 @@
   <MIMETYPE><![CDATA[image/png]]></MIMETYPE>
 </AD_IMAGE>
 
+<AD_IMAGE>
+  <AD_IMAGE_ID><![CDATA[FA0CD9C5BD34491D97C537D8B6ED08D2]]></AD_IMAGE_ID>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2018-02-20 11:21:18.139]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-02-20 11:21:18.139]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <NAME><![CDATA[Image]]></NAME>
+  <BINARYDATA><![CDATA[PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iT0JTVkciIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB2aWV3Qm94PSIwIDAgMzczIDg0LjMiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDM3MyA4NC4zOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+DQo8c3R5bGUgdHlwZT0idGV4dC9jc3MiPg0KCS5zdDB7ZmlsbDojNkNCMjNGO30NCgkuc3Qxe2ZpbGw6IzQ0NDM0NTt9DQo8L3N0eWxlPg0KPGc+DQoJPHBhdGggY2xhc3M9InN0MCIgZD0iTTU4LjUsMzQuOGM1LjEsMCw5LjQsMS43LDEyLjksNWMzLjUsMy4zLDUuMiw3LjQsNS4yLDEyLjJjMCw0LjktMS43LDktNS4zLDEyLjNjLTMuNSwzLjMtNy45LDQuOS0xMyw0LjkNCgkJYy0wLjcsMC0xLjMtMC4xLTEuOS0wLjF2LTYuOGMwLjcsMC4xLDEuNCwwLjIsMi4xLDAuMmMzLjEsMCw1LjUtMSw3LjQtMi44YzEuOS0xLjksMi44LTQuNCwyLjgtNy42YzAtMy4yLTAuOS01LjctMi44LTcuNg0KCQlzLTQuMy0yLjktNy40LTIuOWMtMywwLTUuNCwxLTcuMywyLjljLTEuNywxLjctMi42LDMuOS0yLjgsNi42bC0wLjEsMjAuNWwwLjEsMTIuN2gtOC4xVjUxLjd2LTAuN2MwLjItNC40LDEuOS04LjIsNS4zLTExLjQNCgkJQzQ5LjIsMzYuNCw1My40LDM0LjgsNTguNSwzNC44Ii8+DQoJPHBhdGggY2xhc3M9InN0MCIgZD0iTTk5LDM0LjhjNS4xLDAsOS40LDEuNywxMi45LDVjMy41LDMuMyw1LjMsNy40LDUuMywxMi4yYzAsMS0wLjEsMS45LTAuMiwyLjhIOTYuNnYtNi40aDEyLjENCgkJYy0wLjUtMS42LTEuMi0yLjktMi4zLTMuOWMtMS45LTEuOS00LjMtMi45LTcuNC0yLjljLTMsMC01LjQsMS03LjMsMi45Yy0xLjksMS45LTIuOCw0LjQtMi44LDcuNGMwLDMuMiwwLjksNS44LDIuNyw3LjcNCgkJYzEuOSwxLjksNC4zLDIuOSw3LjQsMi45YzMuMSwwLDUuNS0xLDcuNC0yLjhjMC40LTAuNSwwLjgtMSwxLjItMS41bDcuNSwyLjJjLTAuOCwxLjQtMS45LDIuNy0zLjEsMy45Yy0zLjUsMy4zLTcuOSw0LjktMTMsNC45DQoJCWMtNS4xLDAtOS4zLTEuNy0xMi44LTVjLTMuNS0zLjMtNS4xLTcuNC01LjEtMTIuNGMwLTQuNywxLjctOC43LDUuMy0xMkM4OS43LDM2LjQsOTQsMzQuOCw5OSwzNC44Ii8+DQoJPHBhdGggY2xhc3M9InN0MCIgZD0iTTEzOS42LDM0LjhjNS4xLDAsOS40LDEuNywxMi45LDVjMy41LDMuMyw1LjIsNy40LDUuMiwxMi4ydjE2LjZoLThWNTEuOGMtMC4xLTMuMS0xLTUuNi0yLjgtNy40DQoJCWMtMS45LTEuOS00LjMtMi45LTcuNC0yLjljLTMsMC01LjQsMS03LjMsMi45Yy0xLjksMS45LTIuOCw0LjQtMi44LDcuNHYxNC41djIuMmgtOFY1MS44YzAtNC44LDEuNy04LjksNS4zLTEyLjENCgkJQzEzMC4zLDM2LjQsMTM0LjUsMzQuOCwxMzkuNiwzNC44Ii8+DQoJPHBhdGggY2xhc3M9InN0MSIgZD0iTTE3MC4xLDE5LjdsLTAuMSwxMi43bDAuMSwyMC41YzAuMSwyLjcsMS4xLDQuOSwyLjgsNi42YzEuOSwxLjksNC4zLDIuOSw3LjMsMi45YzMuMSwwLDUuNS0xLDcuNC0yLjkNCgkJYzEuOS0xLjksMi44LTQuNCwyLjgtNy42YzAtMy4yLTAuOS01LjctMi44LTcuNmMtMS45LTEuOS00LjMtMi44LTcuNC0yLjhjLTAuNywwLTEuNCwwLjEtMi4xLDAuMnYtNi44YzAuNy0wLjEsMS4zLTAuMSwyLTAuMQ0KCQljNS4xLDAsOS41LDEuNiwxMyw0LjljMy41LDMuMyw1LjMsNy40LDUuMywxMi4zYzAsNC44LTEuNyw4LjktNS4yLDEyLjJjLTMuNSwzLjMtNy44LDUtMTIuOSw1Yy01LDAtOS4zLTEuNy0xMi45LTUNCgkJYy0zLjMtMy4xLTUuMS02LjktNS4zLTExLjR2LTAuN1YxOS42TDE3MC4xLDE5LjciLz4NCgk8cGF0aCBjbGFzcz0ic3QxIiBkPSJNMTcwLjEsMTkuN2wtMC4xLDEyLjdsMC4xLDIwLjVjMC4xLDIuNywxLjEsNC45LDIuOCw2LjZjMS45LDEuOSw0LjMsMi45LDcuMywyLjljMy4xLDAsNS41LTEsNy40LTIuOQ0KCQljMS45LTEuOSwyLjgtNC40LDIuOC03LjZjMC0zLjItMC45LTUuNy0yLjgtNy42Yy0xLjktMS45LTQuMy0yLjgtNy40LTIuOGMtMC43LDAtMS40LDAuMS0yLjEsMC4ydi02LjhjMC43LTAuMSwxLjMtMC4xLDItMC4xDQoJCWM1LjEsMCw5LjUsMS42LDEzLDQuOWMzLjUsMy4zLDUuMyw3LjQsNS4zLDEyLjNjMCw0LjgtMS43LDguOS01LjIsMTIuMmMtMy41LDMuMy03LjgsNS0xMi45LDVjLTUsMC05LjMtMS43LTEyLjktNQ0KCQljLTMuMy0zLjEtNS4xLTYuOS01LjMtMTEuNHYtMC43VjE5LjZMMTcwLjEsMTkuNyIvPg0KCTxwYXRoIGNsYXNzPSJzdDEiIGQ9Ik0yMzkuNiwzNC44YzUsMCw5LjMsMS42LDEyLjksNWMzLjMsMy4yLDUuMSw2LjksNS4zLDExLjR2MC43djE2LjloLThWNTEuMWMtMC4xLTIuNy0xLjEtNC45LTIuOC02LjYNCgkJYy0xLjktMS45LTQuMy0yLjktNy4zLTIuOWMtMy4xLDAtNS41LDEtNy40LDIuOWMtMS45LDEuOS0yLjgsNC40LTIuOCw3LjZjMCwzLjIsMC45LDUuNywyLjgsNy42czQuMywyLjgsNy40LDIuOA0KCQljMC43LDAsMS40LTAuMSwyLjEtMC4ydjYuOGMtMC43LDAuMS0xLjMsMC4xLTIsMC4xYy01LjEsMC05LjUtMS42LTEzLTQuOWMtMy41LTMuMy01LjMtNy40LTUuMy0xMi4zYzAtNC44LDEuNy04LjksNS4yLTEyLjINCgkJQzIzMC4zLDM2LjQsMjM0LjYsMzQuOCwyMzkuNiwzNC44Ii8+DQoJPHBhdGggY2xhc3M9InN0MSIgZD0iTTIzOS42LDM0LjhjNSwwLDkuMywxLjYsMTIuOSw1YzMuMywzLjIsNS4xLDYuOSw1LjMsMTEuNHYwLjd2MTYuOWgtOFY1MS4xYy0wLjEtMi43LTEuMS00LjktMi44LTYuNg0KCQljLTEuOS0xLjktNC4zLTIuOS03LjMtMi45Yy0zLjEsMC01LjUsMS03LjQsMi45Yy0xLjksMS45LTIuOCw0LjQtMi44LDcuNmMwLDMuMiwwLjksNS43LDIuOCw3LjZzNC4zLDIuOCw3LjQsMi44DQoJCWMwLjcsMCwxLjQtMC4xLDIuMS0wLjJ2Ni44Yy0wLjcsMC4xLTEuMywwLjEtMiwwLjFjLTUuMSwwLTkuNS0xLjYtMTMtNC45Yy0zLjUtMy4zLTUuMy03LjQtNS4zLTEyLjNjMC00LjgsMS43LTguOSw1LjItMTIuMg0KCQlDMjMwLjMsMzYuNCwyMzQuNiwzNC44LDIzOS42LDM0LjgiLz4NCgk8cGF0aCBjbGFzcz0ic3QxIiBkPSJNMjIwLjUsMzQuOGwwLjEsNi44Yy0zLjEsMC01LjUsMS03LjQsMi45Yy0xLjksMS45LTIuOCw0LjQtMi44LDcuNHYxNC41djIuMmgtOFY1MS44YzAtNC44LDEuNy04LjksNS4zLTEyLjENCgkJQzIxMS4yLDM2LjQsMjE1LjQsMzQuOCwyMjAuNSwzNC44Ii8+DQoJPHBhdGggY2xhc3M9InN0MSIgZD0iTTIyMC41LDM0LjhsMC4xLDYuOGMtMy4xLDAtNS41LDEtNy40LDIuOWMtMS45LDEuOS0yLjgsNC40LTIuOCw3LjR2MTQuNXYyLjJoLThWNTEuOGMwLTQuOCwxLjctOC45LDUuMy0xMi4xDQoJCUMyMTEuMiwzNi40LDIxNS40LDM0LjgsMjIwLjUsMzQuOCIvPg0KCTxwYXRoIGNsYXNzPSJzdDEiIGQ9Ik0yOTUuMSwzNS4ydjE2LjZjMCw0LjgtMS43LDguOS01LjIsMTIuMmMtMy41LDMuMy03LjgsNC41LTEyLjksNC41Yy01LDAtMTMuMiwwLTEzLjIsMFYzNS4yaDh2Mi4ydjI0LjgNCgkJYzAsMCwyLjIsMCw1LjIsMHM1LjUtMSw3LjQtMi45YzEuOC0xLjksMi44LTQuNCwyLjgtNy40VjM1LjJMMjk1LjEsMzUuMiIvPg0KCTxwYXRoIGNsYXNzPSJzdDEiIGQ9Ik0yOTUuMSwzNS4ydjE2LjZjMCw0LjgtMS43LDguOS01LjIsMTIuMmMtMy41LDMuMy03LjgsNC41LTEyLjksNC41Yy01LDAtMTMuMiwwLTEzLjIsMFYzNS4yaDh2Mi4ydjI0LjgNCgkJYzAsMCwyLjIsMCw1LjIsMHM1LjUtMSw3LjQtMi45YzEuOC0xLjksMi44LTQuNCwyLjgtNy40VjM1LjJMMjk1LjEsMzUuMiIvPg0KCTxwYXRoIGNsYXNzPSJzdDAiIGQ9Ik0xOCwzNC43YzkuOSwwLDE4LDcuNywxOCwxNy4ycy04LjEsMTcuMi0xOCwxNy4yUzAsNjEuNCwwLDUxLjlDMCw0Ni4yLDIuOSw0MS4xLDcuNCwzOHYxMy40DQoJCWMwLDAuMiwwLDAuNCwwLDAuNWMwLDAuMiwwLDAuNCwwLDAuN2MwLjQsNS4zLDUsOS41LDEwLjYsOS41YzUuOSwwLDEwLjYtNC41LDEwLjYtMTAuMlMyMy45LDQxLjgsMTgsNDEuOGMtMS4xLDAtMi4zLDAuMi0zLjMsMC41DQoJCVYzNUMxNS43LDM0LjgsMTYuOSwzNC43LDE4LDM0LjciLz4NCgk8cGF0aCBjbGFzcz0ic3QxIiBkPSJNMzE3LjcsMzQuN2M5LjksMCwxOCw3LjcsMTgsMTcuMnMtOC4xLDE3LjItMTgsMTcuMnMtMTgtNy43LTE4LTE3LjJjMC01LjcsMi45LTEwLjgsNy40LTEzLjl2MTMuNA0KCQljMCwwLjIsMCwwLjQsMCwwLjVjMCwwLjIsMCwwLjQsMCwwLjdjMC40LDUuMyw1LDkuNSwxMC42LDkuNWM1LjksMCwxMC42LTQuNSwxMC42LTEwLjJzLTQuOC0xMC4yLTEwLjYtMTAuMg0KCQljLTEuMSwwLTIuMywwLjItMy4zLDAuNVYzNUMzMTUuNSwzNC44LDMxNi42LDM0LjcsMzE3LjcsMzQuNyIvPg0KCTxwYXRoIGNsYXNzPSJzdDAiIGQ9Ik0zNTQuOSwwYzEwLDAsMTguMSw3LjgsMTguMSwxNy4zcy04LjEsMTcuMy0xOC4xLDE3LjNjLTEwLDAtMTguMS03LjgtMTguMS0xNy4zYzAtNS44LDMtMTEsNy43LTE0LjF2MTQuNg0KCQljMC4xLDIuNiwxLjEsNC43LDMuMSw2LjZjMiwxLjksNC41LDIuOSw3LjQsMi45czUuNC0xLDcuNS0yLjljMi0xLjksMy4xLTQuMiwzLjEtNy4xYzAtMi44LTEtNS4yLTMuMS03LjFjLTItMS45LTQuNS0yLjgtNy41LTIuOA0KCQljLTAuNCwwLTAuOCwwLTEuMSwwLjF2My45YzAuNC0wLjEsMC44LTAuMSwxLjItMC4xYzEuOCwwLDMuMiwwLjUsNC4yLDEuNmMxLjEsMS4xLDEuNiwyLjYsMS42LDQuNGMwLDEuOS0wLjUsMy4zLTEuNiw0LjQNCgkJYy0xLjEsMS4xLTIuNSwxLjctNC4yLDEuN2MtMS43LDAtMy4yLTAuNS00LjItMS43Yy0xLTEtMS41LTIuMy0xLjYtMy44TDM0OSw2VjFDMzUwLjksMC40LDM1Mi44LDAsMzU0LjksMCIvPg0KPC9nPg0KPC9zdmc+DQo=]]></BINARYDATA>
+  <WIDTH><![CDATA[0]]></WIDTH>
+  <HEIGHT><![CDATA[0]]></HEIGHT>
+  <MIMETYPE><![CDATA[image/svg+xml]]></MIMETYPE>
+</AD_IMAGE>
+
 </data>
--- a/referencedata/sampledata/F_B_International_Group/AD_PROCESS_REQUEST.xml	Wed Apr 18 12:21:14 2018 +0000
+++ b/referencedata/sampledata/F_B_International_Group/AD_PROCESS_REQUEST.xml	Tue Apr 24 06:49:23 2018 +0000
@@ -289,6 +289,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[022D48DB169147608BDEA594C6B449F1]]></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[2018-03-20 08:47:25.711725]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 08:47:25.711725]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"2E1341FC087E47B59DC7CBE2A2FFC2E1","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[023154910C9C469F9017AEB31F829FC1]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -1063,6 +1081,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[06EBEBC84C464D3AA53667FDC1392F13]]></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[2018-03-20 10:30:56.21142]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 10:30:56.21142]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"06AE465B76314F95A98971EFA9111DFA","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[0714B82F00AC41658ED20FFAF9D60CB1]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -1333,6 +1369,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[089BC8C171354AE890FA58C76CDCE20E]]></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[2018-03-20 08:54:55.580525]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 08:54:55.580525]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"2E1341FC087E47B59DC7CBE2A2FFC2E1","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[08CAB5018231450E817E4343B6451A7E]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -1423,6 +1477,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[094BE0702D154F158D9963E33DC6CE36]]></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[2018-03-20 08:07:45.766543]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 08:07:45.766543]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"2E1341FC087E47B59DC7CBE2A2FFC2E1","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[097917CD195C4FA687E2B91D0A68096F]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -2485,6 +2557,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[0ECD00BDB60242B7A5FD34AB1E641DEC]]></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[2018-03-20 07:41:53.121668]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 07:41:53.121668]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"2E1341FC087E47B59DC7CBE2A2FFC2E1","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[0EEA506C09A54E61B8367764CA944A24]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -2593,6 +2683,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[0FFD768AA103466CB2DB9755C9B7D384]]></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[2018-03-20 07:41:39.897068]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 07:41:39.897068]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"2E1341FC087E47B59DC7CBE2A2FFC2E1","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[103FBC8CF06A4C63993217D4E93AAB1F]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -3097,6 +3205,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[13EE4009B8B54756AAD4CAF295C497FE]]></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[2018-03-20 07:47:41.753477]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 07:47:41.753477]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"2E1341FC087E47B59DC7CBE2A2FFC2E1","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[13F54E361EC64D0487A224B16A16605D]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -3691,6 +3817,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[18039F5137C141A78A8FEC5B136C5E1A]]></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[2018-03-20 08:11:14.618876]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 08:11:14.618876]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"2E1341FC087E47B59DC7CBE2A2FFC2E1","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[1807749F73A5461798B9F8C25AA9929D]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
@@ -4069,6 +4213,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[1BA86930296D4FE6B4BB62ED4AF5CC4D]]></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[2018-03-20 10:30:59.837259]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 10:30:59.837259]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"06AE465B76314F95A98971EFA9111DFA","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[1BCCCE7548C24DEF881F4DBD13E2A38C]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -5455,6 +5617,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[24531B1D825B4DF6A06E90BCA25FB693]]></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[2018-03-20 09:37:05.154063]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 09:37:05.154063]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"06AE465B76314F95A98971EFA9111DFA","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[245D82729731484692A88D43AC936D2B]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
@@ -7003,6 +7183,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[2F8C6B04738741A9A080246BA00AA57D]]></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[2018-03-20 08:47:39.139537]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 08:47:39.139537]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"2E1341FC087E47B59DC7CBE2A2FFC2E1","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[2F8EDBBA3DB74252BF1BF4ADB3463650]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
@@ -7039,6 +7237,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[2FB420F558314F3684A75CE17AC8F9C8]]></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[2018-03-20 08:55:07.95539]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 08:55:07.95539]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"2E1341FC087E47B59DC7CBE2A2FFC2E1","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[2FC05173559448C981499575CF0C36FF]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -7201,6 +7417,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[30ACD7CFCD2B4F7A989130272876EB35]]></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[2018-03-20 10:50:52.726871]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 10:50:52.726871]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"06AE465B76314F95A98971EFA9111DFA","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[30B6989DB8D24C40A525323C2497B8E3]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -7525,6 +7759,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[32B971F6FBE04E7AAC3D37FB2D4D0DEA]]></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[2018-03-20 07:47:38.683137]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 07:47:38.683137]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"2E1341FC087E47B59DC7CBE2A2FFC2E1","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[32F42D662365436CA9197D5C8DFEF451]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -7543,6 +7795,42 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[33196A42CBDC46CAA8C2338898956726]]></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[2018-03-20 08:55:27.688913]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 08:55:27.688913]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"2E1341FC087E47B59DC7CBE2A2FFC2E1","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[3323BA795BDA48838FD3B1BB4739AE4B]]></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[2018-03-20 09:39:00.241425]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 09:39:00.241425]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"06AE465B76314F95A98971EFA9111DFA","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[3362F69B109448069FC13360DC70AD07]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -7615,6 +7903,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[33E7B08122564698B49E24E536701A8C]]></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[2018-03-20 07:47:45.048655]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 07:47:45.048655]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"2E1341FC087E47B59DC7CBE2A2FFC2E1","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[33F7C0841CE44F30A84C57066BC881B2]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -8479,6 +8785,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[398634C4ADE64C2CBF92947DFC88DCB5]]></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[2018-03-20 09:55:50.961569]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 09:55:50.961569]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"06AE465B76314F95A98971EFA9111DFA","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[398849E17CB14A7D9F33B0331D78EC6D]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -9595,6 +9919,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[40CCE2A6DC124D4B8CD80D0F50A1559F]]></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[2018-03-20 09:38:27.568239]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 09:38:27.568239]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"06AE465B76314F95A98971EFA9111DFA","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[40E404BF77D9488D80B5CE574A6C03E2]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -10549,6 +10891,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[4665711EC1E44F56BF348A41FC21FA98]]></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[2018-03-20 09:15:07.472871]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 09:15:07.472871]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"2E1341FC087E47B59DC7CBE2A2FFC2E1","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[46889941E8E040C282E736743C24B61E]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -11143,6 +11503,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[4A5BE825544340C5B4EAF542EC131F93]]></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[2018-03-20 10:51:01.71984]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 10:51:01.71984]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"06AE465B76314F95A98971EFA9111DFA","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[4A5C93E2020B46B0AC5DF8B1E0FF5AB0]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -11593,6 +11971,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[4E829946350A47BB9F272A78BD27DFA6]]></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[2018-03-20 10:25:24.164956]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 10:25:24.164956]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"06AE465B76314F95A98971EFA9111DFA","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[4E8ABAB1A9364729BE785668CA10BB8B]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -11755,6 +12151,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[4F2EAA57E2964344B38395AE0CB7A4A3]]></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[2018-03-20 08:28:27.589643]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 08:28:27.589643]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_PROCESS_ID><![CDATA[100]]></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_BUTTONProcessing100","userClient":"'23C59575B9CF467C9620760EB255B389'","userOrganization":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"2E1341FC087E47B59DC7CBE2A2FFC2E1","javaDateFormat":"dd-MM-yyyy","javaDateTimeFormat":"dd-MM-yyyy HH:mm:ss","jsDateFormat":"%d-%m-%Y","sqlDateFormat":"DD-MM-YYYY","accessLevel":3,"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[4F3EC776D9444DECA379D987BD7FA1F9]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -11935,6 +12349,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[4FF73FC0D96A4F5DBA0A0F07064E6DCE]]></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[2018-03-20 08:10:19.430918]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 08:10:19.430918]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"2E1341FC087E47B59DC7CBE2A2FFC2E1","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[5005B31EED4C4CF98A0A164C1E4C1A31]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -12097,6 +12529,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[516CF87DC4F3459E99E61FA7216FBCF0]]></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[2018-03-20 08:55:21.641411]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 08:55:21.641411]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"2E1341FC087E47B59DC7CBE2A2FFC2E1","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[5170456F17D14D68BF2B91D161A25C7B]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
@@ -12457,6 +12907,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[53C2957D21744261A12DFC5CFCA60E47]]></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[2018-03-20 08:47:19.787537]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 08:47:19.787537]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"2E1341FC087E47B59DC7CBE2A2FFC2E1","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[541EBDB3A9194A90829014AE8CFC3732]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -12763,6 +13231,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[5631E273935547E4B71D06DBBD52DA24]]></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[2018-03-20 08:28:04.808241]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 08:28:04.808241]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_PROCESS_ID><![CDATA[100]]></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_BUTTONProcessing100","userClient":"'23C59575B9CF467C9620760EB255B389'","userOrganization":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"2E1341FC087E47B59DC7CBE2A2FFC2E1","javaDateFormat":"dd-MM-yyyy","javaDateTimeFormat":"dd-MM-yyyy HH:mm:ss","jsDateFormat":"%d-%m-%Y","sqlDateFormat":"DD-MM-YYYY","accessLevel":3,"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[5651991CA81D4510A390ADD004C5ADCD]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -13411,6 +13897,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[59D4D83121F14383A54CA6B4C4D6B524]]></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[2018-03-20 08:47:06.45131]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 08:47:06.45131]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"2E1341FC087E47B59DC7CBE2A2FFC2E1","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[59DFC02AC3FC424ABA443FBEE6D92A16]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -14113,6 +14617,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[5E3E9ECBF3AD436D9FA3CEDE0CC925B1]]></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[2018-03-20 09:38:51.095286]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 09:38:51.095286]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"06AE465B76314F95A98971EFA9111DFA","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[5E66398D357D4081984BA4D37295A2A7]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -14365,6 +14887,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[5F75396DAF1844D9B5290010AE523605]]></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[2018-03-20 10:25:17.729877]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 10:25:17.729877]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"06AE465B76314F95A98971EFA9111DFA","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[5F9693C73A944693BBA2760AE1F485BF]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -15319,6 +15859,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[65D85FCEA1E848049EACD854DC640F50]]></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[2018-03-20 08:25:19.72517]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 08:25:19.72517]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"2E1341FC087E47B59DC7CBE2A2FFC2E1","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[65E110C796A94331835152F9C9B8F7EE]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -16111,6 +16669,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[6B157F48733643DCBF48151D0A979D92]]></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[2018-03-20 10:25:10.325424]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 10:25:10.325424]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"06AE465B76314F95A98971EFA9111DFA","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[6B3C1622BC284B389D1C12ED41CB8CA1]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
@@ -16813,6 +17389,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[6F06761B1C144D188259EC44747C7CF7]]></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[2018-03-20 08:02:20.519879]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 08:02:20.519879]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"2E1341FC087E47B59DC7CBE2A2FFC2E1","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[6F547B484CFB4ED3B62749EB02B5292C]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -18523,6 +19117,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[7AC6D97C496E45B6A0135EB2F2F70F67]]></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[2018-03-20 10:25:20.994316]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 10:25:20.994316]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"06AE465B76314F95A98971EFA9111DFA","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[7AD1244501D542D6B0E641936F4FF387]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -19279,6 +19891,42 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[7F14FA03E3BD4FC0A2EFBB7C9C865F6D]]></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[2018-03-20 08:26:22.723852]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 08:26:22.723852]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"2E1341FC087E47B59DC7CBE2A2FFC2E1","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[7F44ACACD3D9451596A9AA5DA251A741]]></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[2018-03-20 09:36:09.454365]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 09:36:09.454365]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"06AE465B76314F95A98971EFA9111DFA","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[7F6249FD5E124F139B0C178321C6F223]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -20053,6 +20701,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[8401C07F871E4283BF62B4D428291B9E]]></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[2018-03-20 09:56:34.856088]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 09:56:34.856088]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"06AE465B76314F95A98971EFA9111DFA","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[8437C18C64084DAEA1D7F8C1AC36821B]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -21295,6 +21961,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[8C461F90DF36458F8172772CC4136542]]></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[2018-03-20 10:30:50.468781]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 10:30:50.468781]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"06AE465B76314F95A98971EFA9111DFA","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[8C5076B421C14935B57E8C08214B2A74]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -21439,6 +22123,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[8D43295D277D4C7BB58F71D8A606CA3B]]></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[2018-03-20 11:31:01.554859]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 11:31:01.554859]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"ECF7A65173144D7CBF2BB5D5AA245BFE","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[8D5A86CC475048A4A64085BB53CE5D43]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -21871,6 +22573,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[90F9E2B52E2D4FA7910D9E8D73D98890]]></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[2018-03-20 10:25:27.376033]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 10:25:27.376033]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"06AE465B76314F95A98971EFA9111DFA","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[911921416C4F48E184429E4A1DDBEA69]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -25345,6 +26065,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[A745BD110F4449F6B5DD054505DACA2F]]></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[2018-03-20 07:47:50.652363]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 07:47:50.652363]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"2E1341FC087E47B59DC7CBE2A2FFC2E1","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[A7900917636C493A9242AB6D4D5420D0]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
@@ -25597,6 +26335,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[A8A2F1ADD2B042E2979973AE22B4F3EF]]></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[2018-03-20 08:47:32.081227]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 08:47:32.081227]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"2E1341FC087E47B59DC7CBE2A2FFC2E1","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[A8F073DBD82B4A40884ED9F4C5C6B80F]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
@@ -26047,6 +26803,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[ABDC24EC7B0F48E4AD706C25501DA1BA]]></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[2018-03-20 10:50:58.775868]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 10:50:58.775868]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"06AE465B76314F95A98971EFA9111DFA","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[ABED99D19B2A42969467672EB85D8702]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
@@ -26173,6 +26947,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[ACDD48987EA0478DA37B1E7F7B646C30]]></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[2018-03-20 09:18:33.530429]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 09:18:33.530429]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"2E1341FC087E47B59DC7CBE2A2FFC2E1","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[AD10FCB49A414C2C835238ABD5E6EA77]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -26191,6 +26983,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[AD36C75CDA37482584B912057C48AA2B]]></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[2018-03-20 09:36:52.968676]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 09:36:52.968676]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"06AE465B76314F95A98971EFA9111DFA","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[AD438BF0EDFB412688F9427E660A050E]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
@@ -26299,6 +27109,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[AE12F1F169E14CFA933807CE80BD2CB9]]></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[2018-03-20 10:30:53.397025]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 10:30:53.397025]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"06AE465B76314F95A98971EFA9111DFA","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[AE7D585A87194F078047B29296A33981]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -27523,6 +28351,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[B6F1C4A2D6F04D99930B0FF6F10BD344]]></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[2018-03-20 07:47:53.779606]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 07:47:53.779606]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"2E1341FC087E47B59DC7CBE2A2FFC2E1","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[B700049378FD40DDAA8B421A20761B77]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -27757,6 +28603,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[B8FAD4940AFD4E72902D196714C57BF4]]></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[2018-03-20 08:55:02.362648]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 08:55:02.362648]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"2E1341FC087E47B59DC7CBE2A2FFC2E1","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[B91A760334654D9E91AD7C625357FE88]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -27775,6 +28639,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[B91DA2B9FA694C4D8E4A561F024608B3]]></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[2018-03-20 08:09:24.690585]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 08:09:24.690585]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"2E1341FC087E47B59DC7CBE2A2FFC2E1","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[B9395E91CC394B75A89BFA689BA56FB0]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
@@ -28909,6 +29791,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[BFE54294CE26487AAAA4D5DAFE32B0EE]]></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[2018-03-20 10:31:02.88242]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 10:31:02.88242]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"06AE465B76314F95A98971EFA9111DFA","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[BFFF4BFAFB2B452B97574409058AF2B3]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
@@ -29233,6 +30133,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[C1C2DFECCF4F4A8F8DF01218B1DB654A]]></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[2018-03-20 07:47:47.861029]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 07:47:47.861029]]></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":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"2E1341FC087E47B59DC7CBE2A2FFC2E1","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[C1CCDF1F51CD45FCBEA3579B674716A9]]></AD_PROCESS_REQUEST_ID>
   <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
@@ -29539,6 +30457,24 @@
 </AD_PROCESS_REQUEST>
 
 <AD_PROCESS_REQUEST>
+  <AD_PROCESS_REQUEST_ID><![CDATA[C37AD741D5B04C4A8D19E4543B098ADD]]></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[2018-03-20 11:41:55.878874]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2018-03-20 11:41:55.878874]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <AD_PROCESS_ID><![CDATA[58A9261BACEF45DDA526F29D8557272D]]></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_Process_BS58A9261BACEF45DDA526F29D8557272D","userClient":"'23C59575B9CF467C9620760EB255B389'","userOrganization":"'0','E443A31992CB4635AFCAEABE7183CE85','B843C30461EA4501935CB1D125C9C25A','BAE22373FEBE4CCCA24517E23F0C8A48','DC206C91AA6A4897B44DA897936E0EC3','19404EAD144C49A0AF37D54377CF452D','2E60544D37534C0B89E765FE29BC0B43','7BABA5FF80494CAFA54DEBD22EC46F01'","dbSessionID":"ECF7A65173144D7CBF2BB5D5AA245BFE","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[C4084D8E5FFF49D68E987C2EE9179F2D]]></AD_PROCESS_REQUEST_ID>