Merge temporary head for 3.0PR16Q4.2
authorRM packaging bot <staff.rm@openbravo.com>
Wed, 25 Jan 2017 05:32:50 +0000
changeset 31299 c86e51ad0767
parent 31200 46831856bcb3 (diff)
parent 31298 54ad79ad5c57 (current diff)
child 31304 21d052f37ed3
Merge temporary head for 3.0PR16Q4.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.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.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js
modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
src-db/database/sourcedata/AD_MODULE.xml
--- a/.classpath.template	Tue Jan 24 05:37:19 2017 +0000
+++ b/.classpath.template	Wed Jan 25 05:32:50 2017 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0"/>
+	<classpathentry exported="true" kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/OpenbravoTrl"/>
 	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/OpenbravoWAD"/>
--- a/.hgsigs	Tue Jan 24 05:37:19 2017 +0000
+++ b/.hgsigs	Wed Jan 25 05:32:50 2017 +0000
@@ -197,8 +197,13 @@
 91b0a6cc5947ea0958b3d677a3e76174fa0a045e 0 iEYEABECAAYFAldajXIACgkQCX/oGf+2qkMRiQCgread+PDPwOVh7Qu/IlmeCLDSPVQAn3cepToICm61fiNkrV+PmFen4bwd
 ac4b84085793438223d82a0024dd84d2268d0768 0 iEYEABECAAYFAld974YACgkQCX/oGf+2qkPrUgCg05BzCWexFGf76njdN2lBgPJn5uMAoIzGxA0dHD54Km07x2m9J1pgFcoW
 a98ba1097ffda83047f2824177bfd940fd9268b2 0 iEYEABECAAYFAlfAIacACgkQCX/oGf+2qkMeAwCgsAyLUenvqX0uAZTRjaUrUXZfcL0AoJg0tc+GlPLwfSGk9nCtgF8M3v5f
+b12145ac735ade9806288818f80bc7048f644b1e 0 iEYEABECAAYFAlgq31UACgkQCX/oGf+2qkNW8ACeMKZHj7v345vjRhUr6sJnORyzuc8An17g7zd8xd/eE3cUa7Gl86DAtGRQ
 c9da212632eaa8b5ad282ea755200a6761da6fa9 0 iEYEABECAAYFAlftOagACgkQCX/oGf+2qkMyVgCfXQS09IJiOH63CblJE5zX6Qn3TDQAoPZnadaVKBEfROW6Ma1feqUrUgY/
 159bac1903e52d4f6785d5e53405ae988c273975 0 iEYEABECAAYFAlejLbgACgkQCX/oGf+2qkOIMQCcDP51SEWDiDNBGTaEShgrqwhm7xYAoO/e+AXZ3cBSAhUb8CmIpJ0Rls82
 b91eab932a2640f7395e9c1b7d237c08303d0788 0 iEYEABECAAYFAlfGHnMACgkQCX/oGf+2qkNXHQCgysf6qFN75kW873qTx3i0S9a2qjAAoI0R/AZCW4a6RPrNiFfjaWsOE3+v
 b79e30a5b3532f45101cedce0f3bb6b0a86b5780 0 iEYEABECAAYFAlfz21YACgkQCX/oGf+2qkMqZgCgodjBPp4aS6GrpBTpumtr8DsFNAYAmwS3mdHHNYX8g8y4yIwjMDzmQG+o
+892fdbc643c7c5c52298aae76502ab2283a32433 0 iEYEABECAAYFAlg0JDIACgkQCX/oGf+2qkM+5gCeMkJ6j6tr/FN8cPHlBLGdnf/6F08AoNBmFRFQ/osVwBtifI+b3ZzXEx+X
+e03ab293da7be8c989b20cb7b1ecf4bbf3c7c990 0 iEYEABECAAYFAlh959EACgkQCX/oGf+2qkOFNwCgi/qs8UguivvKA1tlKRKQoIsQqDIAoOGm7DqYBaR6v3aZtvaLmdvffaUh
+555379f85b18b37ee1c36b4137c75eca80da7267 0 iEYEABECAAYFAlhSQ0UACgkQCX/oGf+2qkN2yQCg5zq8YEVnWK3wy859qvLYbrEhBY4AoKsfpep+GEj+oGGlmOiOqESGPxxH
+fa51600e25b24b2eb3739898d293168ea94748a7 0 iEYEABECAAYFAlh/u8wACgkQCX/oGf+2qkPTnwCfZ29b107GdizLBcC+tzdP3HlnmUUAoN2kMLXvfTYSRLAQG/ziGm5P6kYA
 9753e90ea3e81f850f904feb531120b4e185394a 0 iEYEABECAAYFAliG6A8ACgkQCX/oGf+2qkPeeQCg6D9p++eslvzqEVlYK8RS0uzgZNsAoMELVWkte/AM/ilPxZ4vP37myscv
--- a/.hgtags	Tue Jan 24 05:37:19 2017 +0000
+++ b/.hgtags	Wed Jan 25 05:32:50 2017 +0000
@@ -208,8 +208,13 @@
 cfff3c184b53528cd71acfe21b15800db17b3436 3.0PR16Q2
 7667e8781815f8fa0bf2d3104aeb585cb2ce8681 3.0PR16Q2.1
 d40ef4d2ac507a87b46d3118841d03a6a54fec1e 3.0PR16Q2.2
+5c1e158fa994240cc6bd410405b4ed86a33c7261 3.0PR16Q2.4
 6db3d7641170254dbd658eb774e36b092c68dd04 3.0PR16Q2.3
 ec10d529b9bbe8caa83f2ea72b29b94bd3473cae 3.0PR16Q3
 d0dee6596f281e29afcd159544992498896e93ff 3.0PR16Q3.1
 f252db9dde915c15574e3d5fa505bd1154e39c74 3.0PR16Q3.2
+0c8c781e34c94d084b495d00a541d8d57a3903ea 3.0PR16Q3.3
+ed52b01e833ecc6407392f97ffd7d6531bd9bf2f 3.0PR16Q3.4
+cd98953b932b72cc3c694904fc8f8549463ba84a 3.0PR16Q4
+b93f495b2cde680cf6558d93d72051429f4b9031 3.0PR16Q4.1
 31c79a32ce3a6b555dadb35c70d63113be6312e7 3.0PR16Q4.2
--- a/.project	Tue Jan 24 05:37:19 2017 +0000
+++ b/.project	Wed Jan 25 05:32:50 2017 +0000
@@ -15,6 +15,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.sonarlint.eclipse.core.sonarlintBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
--- a/.settings/org.eclipse.jdt.core.prefs	Tue Jan 24 05:37:19 2017 +0000
+++ b/.settings/org.eclipse.jdt.core.prefs	Wed Jan 25 05:32:50 2017 +0000
@@ -1,11 +1,12 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml	Wed Jan 25 05:32:50 2017 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <runtime name="Apache Tomcat v6.0"/>
+  <runtime name="Apache Tomcat v7.0"/>
   <fixed facet="jst.web"/>
   <fixed facet="jst.java"/>
-  <installed facet="jst.java" version="5.0"/>
-  <installed facet="jst.web" version="2.4"/>
+  <installed facet="jst.java" version="7.0"/>
+  <installed facet="jst.web" version="3.0"/>
 </faceted-project>
--- a/WebContent/META-INF/MANIFEST.MF	Tue Jan 24 05:37:19 2017 +0000
+++ b/WebContent/META-INF/MANIFEST.MF	Wed Jan 25 05:32:50 2017 +0000
@@ -1,2 +1,1 @@
-Manifest-Version: 1.0
-Class-Path:
\ No newline at end of file
+Manifest-Version: 1.0
\ No newline at end of file
--- a/build.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/build.xml	Wed Jan 25 05:32:50 2017 +0000
@@ -577,7 +577,7 @@
           <include name="*/lib/test/*.jar" />
         </fileset>
       </classpath>
-      <link href="http://docs.oracle.com/javase/6/docs/api/"/>
+      <link href="http://docs.oracle.com/javase/7/docs/api/"/>
     </javadoc>
   </target>
 
--- a/config/eclipse/Openbravo-eclipse-prefs.epf	Tue Jan 24 05:37:19 2017 +0000
+++ b/config/eclipse/Openbravo-eclipse-prefs.epf	Wed Jan 25 05:32:50 2017 +0000
@@ -16,7 +16,7 @@
 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.compliance=1.6
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.compliance=1.7
 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 @org.eclipse.mylyn.monitor.ui=3.6.0.v20110608-1400
 @org.eclipse.jst.j2ee.webservice.ui=1.1.500.v201105122000
@@ -130,7 +130,7 @@
 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 @org.eclipse.team.cvs.ui=3.3.400.I20110510-0800
 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.source=1.6
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.source=1.7
 /instance/org.eclipse.wst.validation/USER_PREFERENCE=saveAutomaticallyfalseprojectsCanOverridetruedisableAllValidationfalseversion1.1.101.v200706071630
 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
@@ -418,7 +418,7 @@
 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 /instance/org.eclipse.mylyn.tasks.ui/org.eclipse.mylyn.tasks.ui.backup.last=1233309627073
 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
--- a/legal/Licensing.txt	Tue Jan 24 05:37:19 2017 +0000
+++ b/legal/Licensing.txt	Wed Jan 25 05:32:50 2017 +0000
@@ -116,6 +116,7 @@
 # jettison-1.3.jar
 # log4j-1.2.16.jar
 # quartz-1.6.2.jar
+# servlet-api.jar 
 # tika-core-0.9.jar
 # wstx-asl-3.0.2.jar
 # xercesImpl.jar
@@ -200,7 +201,6 @@
 
 # jaxrpc.jar 
 # mail-1.4.4.jar 
-# servlet-api.jar 
 All files under the corresponding Sun Binary Code License. This is not free
 software, but provided under license from Sun Microsystems.
 
@@ -216,7 +216,7 @@
 # jboss-el-api_2.2_spec-1.0.0.Final.jar
 Under the LGPL license (included as LGPL-2.1.txt in this folder)
 
-# cal10n-api-0.7.4.jar
+# cal10n-api-0.7.7.jar
 # slf4j-ext-1.6.1.jar
 Under the MIT license (available at http://www.slf4j.org/license.html)
 
Binary file lib/build/servlet-api.jar has changed
Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData.class has changed
Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UniquePaymentForTransaction.class has changed
Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments.class has changed
Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck.class has changed
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Wed Jan 25 05:32:50 2017 +0000
@@ -300,6 +300,18 @@
 <!--2EE9E3A8A29044C5B6A1BCB77EB37B87-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--2EE9E3A8A29044C5B6A1BCB77EB37B87--></AD_MESSAGE>
 
+<!--2FCA4882990D431BB1E0AB7CA7505E6B--><AD_MESSAGE>
+<!--2FCA4882990D431BB1E0AB7CA7505E6B-->  <AD_MESSAGE_ID><![CDATA[2FCA4882990D431BB1E0AB7CA7505E6B]]></AD_MESSAGE_ID>
+<!--2FCA4882990D431BB1E0AB7CA7505E6B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2FCA4882990D431BB1E0AB7CA7505E6B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2FCA4882990D431BB1E0AB7CA7505E6B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2FCA4882990D431BB1E0AB7CA7505E6B-->  <VALUE><![CDATA[APRM_InvoiceAwaitingExcutionPaymentRelated]]></VALUE>
+<!--2FCA4882990D431BB1E0AB7CA7505E6B-->  <MSGTEXT><![CDATA[Invoice can not be voided as there is an awaiting execution payment related. Please either execute that payment or cancel it]]></MSGTEXT>
+<!--2FCA4882990D431BB1E0AB7CA7505E6B-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--2FCA4882990D431BB1E0AB7CA7505E6B-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--2FCA4882990D431BB1E0AB7CA7505E6B-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--2FCA4882990D431BB1E0AB7CA7505E6B--></AD_MESSAGE>
+
 <!--2FD618C9D5064C75BFF13B57B767C912--><AD_MESSAGE>
 <!--2FD618C9D5064C75BFF13B57B767C912-->  <AD_MESSAGE_ID><![CDATA[2FD618C9D5064C75BFF13B57B767C912]]></AD_MESSAGE_ID>
 <!--2FD618C9D5064C75BFF13B57B767C912-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODEL_OBJECT.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODEL_OBJECT.xml	Wed Jan 25 05:32:50 2017 +0000
@@ -57,7 +57,7 @@
 <!--560040FB16CB46A0ABDED8047D25D4CD-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_BankStatementProcess]]></CLASSNAME>
 <!--560040FB16CB46A0ABDED8047D25D4CD-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--560040FB16CB46A0ABDED8047D25D4CD-->  <AD_PROCESS_ID><![CDATA[2DDE7D3618034C38A4462B7F3456C28D]]></AD_PROCESS_ID>
-<!--560040FB16CB46A0ABDED8047D25D4CD-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--560040FB16CB46A0ABDED8047D25D4CD-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--560040FB16CB46A0ABDED8047D25D4CD--></AD_MODEL_OBJECT>
 
 <!--62CA7E15A1D94659808D715D1A6D65F9--><AD_MODEL_OBJECT>
@@ -81,7 +81,7 @@
 <!--640FC5F514AA4798B36A15D1E70335EC-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_ReconciliationProcess]]></CLASSNAME>
 <!--640FC5F514AA4798B36A15D1E70335EC-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--640FC5F514AA4798B36A15D1E70335EC-->  <AD_PROCESS_ID><![CDATA[6BF16EFC772843AC9A17552AE0B26AB7]]></AD_PROCESS_ID>
-<!--640FC5F514AA4798B36A15D1E70335EC-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--640FC5F514AA4798B36A15D1E70335EC-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--640FC5F514AA4798B36A15D1E70335EC--></AD_MODEL_OBJECT>
 
 <!--668D8470721B430687DFE2F97A75751F--><AD_MODEL_OBJECT>
@@ -93,7 +93,7 @@
 <!--668D8470721B430687DFE2F97A75751F-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_DoubtfulDebtProcess]]></CLASSNAME>
 <!--668D8470721B430687DFE2F97A75751F-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--668D8470721B430687DFE2F97A75751F-->  <AD_PROCESS_ID><![CDATA[0BDC2164ED3E48539FCEF4D306F29EFD]]></AD_PROCESS_ID>
-<!--668D8470721B430687DFE2F97A75751F-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--668D8470721B430687DFE2F97A75751F-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--668D8470721B430687DFE2F97A75751F--></AD_MODEL_OBJECT>
 
 <!--733555DE925D4789BF94835D50EEEE14--><AD_MODEL_OBJECT>
@@ -105,7 +105,7 @@
 <!--733555DE925D4789BF94835D50EEEE14-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_AddPaymentFromJournal]]></CLASSNAME>
 <!--733555DE925D4789BF94835D50EEEE14-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--733555DE925D4789BF94835D50EEEE14-->  <AD_PROCESS_ID><![CDATA[5BE14AA10165490A9ADEFB7532F7FA94]]></AD_PROCESS_ID>
-<!--733555DE925D4789BF94835D50EEEE14-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--733555DE925D4789BF94835D50EEEE14-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--733555DE925D4789BF94835D50EEEE14--></AD_MODEL_OBJECT>
 
 <!--89313103AC3C4CC0BF080175CE85AEE9--><AD_MODEL_OBJECT>
@@ -153,7 +153,7 @@
 <!--95620B3F5CA04222A12CD446B0581DF3-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_BankStatementProcess]]></CLASSNAME>
 <!--95620B3F5CA04222A12CD446B0581DF3-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--95620B3F5CA04222A12CD446B0581DF3-->  <AD_PROCESS_ID><![CDATA[58A9261BACEF45DDA526F29D8557272D]]></AD_PROCESS_ID>
-<!--95620B3F5CA04222A12CD446B0581DF3-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--95620B3F5CA04222A12CD446B0581DF3-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--95620B3F5CA04222A12CD446B0581DF3--></AD_MODEL_OBJECT>
 
 <!--A7A562CD91CB42D9977E12B098CBC9EC--><AD_MODEL_OBJECT>
@@ -177,7 +177,7 @@
 <!--AA1C0D6D318943808A75A24F5781AEBF-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_TransactionModify]]></CLASSNAME>
 <!--AA1C0D6D318943808A75A24F5781AEBF-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--AA1C0D6D318943808A75A24F5781AEBF-->  <AD_PROCESS_ID><![CDATA[15C8708DFC464C2D91286E59624FDD18]]></AD_PROCESS_ID>
-<!--AA1C0D6D318943808A75A24F5781AEBF-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--AA1C0D6D318943808A75A24F5781AEBF-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--AA1C0D6D318943808A75A24F5781AEBF--></AD_MODEL_OBJECT>
 
 <!--ACF0CCE03B9648CDB143478B8DD9A8F3--><AD_MODEL_OBJECT>
@@ -189,7 +189,7 @@
 <!--ACF0CCE03B9648CDB143478B8DD9A8F3-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_DoubtfulDebtRunProcess]]></CLASSNAME>
 <!--ACF0CCE03B9648CDB143478B8DD9A8F3-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--ACF0CCE03B9648CDB143478B8DD9A8F3-->  <AD_PROCESS_ID><![CDATA[017312F51139438A9665775E3B5392A1]]></AD_PROCESS_ID>
-<!--ACF0CCE03B9648CDB143478B8DD9A8F3-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--ACF0CCE03B9648CDB143478B8DD9A8F3-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--ACF0CCE03B9648CDB143478B8DD9A8F3--></AD_MODEL_OBJECT>
 
 <!--B18447439CAB419395BDA44287722832--><AD_MODEL_OBJECT>
@@ -201,7 +201,7 @@
 <!--B18447439CAB419395BDA44287722832-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_PaymentProcess]]></CLASSNAME>
 <!--B18447439CAB419395BDA44287722832-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--B18447439CAB419395BDA44287722832-->  <AD_PROCESS_ID><![CDATA[6255BE488882480599C81284B70CD9B3]]></AD_PROCESS_ID>
-<!--B18447439CAB419395BDA44287722832-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--B18447439CAB419395BDA44287722832-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--B18447439CAB419395BDA44287722832--></AD_MODEL_OBJECT>
 
 <!--C200D584303B4C9BA59CD232F16610D7--><AD_MODEL_OBJECT>
@@ -225,7 +225,7 @@
 <!--D4B8EDB86914439A9E10B5D4D8372C6C-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_TransactionProcess]]></CLASSNAME>
 <!--D4B8EDB86914439A9E10B5D4D8372C6C-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--D4B8EDB86914439A9E10B5D4D8372C6C-->  <AD_PROCESS_ID><![CDATA[F68F2890E96D4D85A1DEF0274D105BCE]]></AD_PROCESS_ID>
-<!--D4B8EDB86914439A9E10B5D4D8372C6C-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--D4B8EDB86914439A9E10B5D4D8372C6C-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--D4B8EDB86914439A9E10B5D4D8372C6C--></AD_MODEL_OBJECT>
 
 <!--DC6F77826AD54AEF865E47C8FC356143--><AD_MODEL_OBJECT>
@@ -249,7 +249,7 @@
 <!--DF09705B3D7F4756A1E741FB3E73B825-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_PaymentProcess]]></CLASSNAME>
 <!--DF09705B3D7F4756A1E741FB3E73B825-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--DF09705B3D7F4756A1E741FB3E73B825-->  <AD_PROCESS_ID><![CDATA[29D17F515727436DBCE32BC6CA28382B]]></AD_PROCESS_ID>
-<!--DF09705B3D7F4756A1E741FB3E73B825-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--DF09705B3D7F4756A1E741FB3E73B825-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--DF09705B3D7F4756A1E741FB3E73B825--></AD_MODEL_OBJECT>
 
 <!--E711C538D5414BC6AABC2281BEA2F738--><AD_MODEL_OBJECT>
@@ -261,7 +261,7 @@
 <!--E711C538D5414BC6AABC2281BEA2F738-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_AddPaymentFromJournalLine]]></CLASSNAME>
 <!--E711C538D5414BC6AABC2281BEA2F738-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--E711C538D5414BC6AABC2281BEA2F738-->  <AD_PROCESS_ID><![CDATA[DE1B382FDD2540199D223586F6E216D0]]></AD_PROCESS_ID>
-<!--E711C538D5414BC6AABC2281BEA2F738-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--E711C538D5414BC6AABC2281BEA2F738-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--E711C538D5414BC6AABC2281BEA2F738--></AD_MODEL_OBJECT>
 
 <!--E7D054B44F5848B6B6FC5923EBA4E1DE--><AD_MODEL_OBJECT>
@@ -297,7 +297,7 @@
 <!--F621B518B6264CDF9285A590995013E4-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_PaymentProposalProcess]]></CLASSNAME>
 <!--F621B518B6264CDF9285A590995013E4-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--F621B518B6264CDF9285A590995013E4-->  <AD_PROCESS_ID><![CDATA[D16966FBF9604A3D91A50DC83C6EA8E3]]></AD_PROCESS_ID>
-<!--F621B518B6264CDF9285A590995013E4-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--F621B518B6264CDF9285A590995013E4-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--F621B518B6264CDF9285A590995013E4--></AD_MODEL_OBJECT>
 
 <!--F9CAF92FC3A84BAD8644B0006EF483FB--><AD_MODEL_OBJECT>
@@ -345,7 +345,7 @@
 <!--FF8080812E437710012E43BE26A3000E-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_ReconciliationProcess]]></CLASSNAME>
 <!--FF8080812E437710012E43BE26A3000E-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--FF8080812E437710012E43BE26A3000E-->  <AD_PROCESS_ID><![CDATA[FF8080812E2F8EAE012E2F94CF470014]]></AD_PROCESS_ID>
-<!--FF8080812E437710012E43BE26A3000E-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--FF8080812E437710012E43BE26A3000E-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--FF8080812E437710012E43BE26A3000E--></AD_MODEL_OBJECT>
 
 <!--FF8080812F348A97012F349E7610000A--><AD_MODEL_OBJECT>
@@ -357,7 +357,7 @@
 <!--FF8080812F348A97012F349E7610000A-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.ad_actionbutton.DeleteTransaction]]></CLASSNAME>
 <!--FF8080812F348A97012F349E7610000A-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--FF8080812F348A97012F349E7610000A-->  <AD_PROCESS_ID><![CDATA[FF8080812F348A97012F349DC24F0007]]></AD_PROCESS_ID>
-<!--FF8080812F348A97012F349E7610000A-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--FF8080812F348A97012F349E7610000A-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--FF8080812F348A97012F349E7610000A--></AD_MODEL_OBJECT>
 
 </data>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.31055]]></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[PR16Q4.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	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.31055]]></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.30447]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.31055]]></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-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData.java	Wed Jan 25 05:32:50 2017 +0000
@@ -21,8 +21,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.openbravo.base.ExecutionLimits;
 import org.openbravo.buildvalidation.BuildValidation;
 import org.openbravo.database.ConnectionProvider;
+import org.openbravo.modulescript.OpenbravoVersion;
 
 public class TransactionsWithMissingData extends BuildValidation {
 
@@ -51,4 +53,10 @@
     }
     return errors;
   }
+
+  @Override
+  protected ExecutionLimits getBuildValidationLimits() {
+    return new ExecutionLimits("A918E3331C404B889D69AA9BFAFB23AC", null, new OpenbravoVersion(3, 0,
+        24742));
+  }
 }
--- a/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/UniquePaymentForTransaction.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/UniquePaymentForTransaction.java	Wed Jan 25 05:32:50 2017 +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 Openbravo SLU
+ * All portions are Copyright (C) 2011-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -21,8 +21,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.openbravo.base.ExecutionLimits;
 import org.openbravo.buildvalidation.BuildValidation;
 import org.openbravo.database.ConnectionProvider;
+import org.openbravo.modulescript.OpenbravoVersion;
 
 public class UniquePaymentForTransaction extends BuildValidation {
 
@@ -112,4 +114,10 @@
 
   }
 
+  @Override
+  protected ExecutionLimits getBuildValidationLimits() {
+    return new ExecutionLimits("A918E3331C404B889D69AA9BFAFB23AC", null, new OpenbravoVersion(3, 0,
+        11282));
+  }
+
 }
--- a/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments.java	Wed Jan 25 05:32:50 2017 +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-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -21,8 +21,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.openbravo.base.ExecutionLimits;
 import org.openbravo.buildvalidation.BuildValidation;
 import org.openbravo.database.ConnectionProvider;
+import org.openbravo.modulescript.OpenbravoVersion;
 
 public class UnpostRefundPayments extends BuildValidation {
 
@@ -88,4 +90,10 @@
     }
   }
 
+  @Override
+  protected ExecutionLimits getBuildValidationLimits() {
+    return new ExecutionLimits("A918E3331C404B889D69AA9BFAFB23AC", null, new OpenbravoVersion(3, 0,
+        13005));
+  }
+
 }
--- a/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck.java	Wed Jan 25 05:32:50 2017 +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 Openbravo SLU
+ * All portions are Copyright (C) 2011-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -21,8 +21,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.openbravo.base.ExecutionLimits;
 import org.openbravo.buildvalidation.BuildValidation;
 import org.openbravo.database.ConnectionProvider;
+import org.openbravo.modulescript.OpenbravoVersion;
 
 public class WrongPaymentScheduleDetailsCheck extends BuildValidation {
 
@@ -31,9 +33,8 @@
     ConnectionProvider cp = getConnectionProvider();
     ArrayList<String> errors = new ArrayList<String>();
     try {
-      //Verify if it is necessary execute the buildvalidation
-      if (WrongPaymentScheduleDetailsCheckData.before30MP3(cp))
-      {
+      // Verify if it is necessary execute the buildvalidation
+      if (WrongPaymentScheduleDetailsCheckData.before30MP3(cp)) {
         // Prevent error when upgrading from a pure 2.50 (MP0)
         if (WrongPaymentScheduleDetailsCheckData.existAPRMbasetables(cp)) {
           if (WrongPaymentScheduleDetailsCheckData.existWrongPaymentSchedules(cp)) {
@@ -90,4 +91,11 @@
 
     }
   }
+
+  @Override
+  protected ExecutionLimits getBuildValidationLimits() {
+    return new ExecutionLimits("A918E3331C404B889D69AA9BFAFB23AC", null, new OpenbravoVersion(3, 0,
+        22964));
+  }
 }
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/FundsTransferPostProcessHook.java	Wed Jan 25 05:32:50 2017 +0000
@@ -0,0 +1,40 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2016 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  
+ *************************************************************************
+ */
+package org.openbravo.advpaymentmngt;
+
+import java.util.List;
+
+import org.openbravo.model.financialmgmt.payment.FIN_FinaccTransaction;
+
+/**
+ * Interface to be used to extend the Funds Transfer functionality.
+ * 
+ * @author Daniel Martins
+ * 
+ */
+public interface FundsTransferPostProcessHook {
+
+  /**
+   * Method to implement in extension classes. This method will be called to extend functionality.
+   * 
+   * @param transactions
+   *          A list of all transactions created by Funds Transfer
+   */
+  public void exec(List<FIN_FinaccTransaction> transactions) throws Exception;
+}
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentOnProcessActionHandler.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentOnProcessActionHandler.java	Wed Jan 25 05:32:50 2017 +0000
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2014 Openbravo SLU
+ * All portions are Copyright (C) 2014-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -21,6 +21,7 @@
 
 import java.util.Map;
 
+import org.apache.commons.lang.StringUtils;
 import org.codehaus.jettison.json.JSONArray;
 import org.codehaus.jettison.json.JSONObject;
 import org.openbravo.advpaymentmngt.utility.FIN_Utility;
@@ -49,7 +50,9 @@
       FIN_FinancialAccount finFinancialAccount = OBDal.getInstance().get(
           FIN_FinancialAccount.class, strFinFinancialAccountId);
       String strBusinessPartnerId = null;
+
       if (jsonData.get("receivedFrom") != JSONObject.NULL) {
+
         strBusinessPartnerId = jsonData.getString("receivedFrom");
         BusinessPartner businessPartner = OBDal.getInstance().get(BusinessPartner.class,
             strBusinessPartnerId);
@@ -64,6 +67,22 @@
           result.put("message", errorMessage);
           return result;
         }
+
+        // If the payment uses or generates credit, payment currency should map bp currency
+        String currencyId = jsonData.getString("currencyId");
+        boolean usesCredit = jsonData.getBoolean("usesCredit");
+        boolean generatesCredit = jsonData.getBoolean("generatesCredit");
+        if ((usesCredit || generatesCredit)
+            && !StringUtils.equals(currencyId, businessPartner.getCurrency().getId())) {
+          String message = String.format(OBMessageUtils.messageBD("APRM_CreditCurrency"),
+              businessPartner.getCurrency().getISOCode());
+          errorMessage.put("severity", "error");
+          errorMessage.put("title", "Error");
+          errorMessage.put("text", message);
+          result.put("message", errorMessage);
+          return result;
+        }
+
       } else {
         JSONArray selectedPSDs = jsonData.getJSONArray("selectedRecords");
         for (int i = 0; i < selectedPSDs.length(); i++) {
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/DoubtFulDebtPickEditLines.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/DoubtFulDebtPickEditLines.java	Wed Jan 25 05:32:50 2017 +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-2013 Openbravo SLU 
+ * All portions are Copyright (C) 2012-2016 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -98,7 +98,8 @@
 
   private JSONObject createDoubtfulDebt(DoubtfulDebtRun doubtfulDebtRun, JSONObject jsonRequest,
       List<String> idList) throws JSONException {
-    final JSONArray selectedLines = jsonRequest.getJSONArray("_selection");
+    final JSONArray selectedLines = jsonRequest.getJSONObject("_params").getJSONObject("grid")
+        .getJSONArray("_selection");
     DocumentType documentType = null;
     Currency currency = null;
     JSONObject message = new JSONObject();
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/FundsTransferActionHandler.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/FundsTransferActionHandler.java	Wed Jan 25 05:32:50 2017 +0000
@@ -20,7 +20,6 @@
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -34,6 +33,7 @@
 import org.openbravo.advpaymentmngt.process.FIN_TransactionProcess;
 import org.openbravo.base.exception.OBException;
 import org.openbravo.base.provider.OBProvider;
+import org.openbravo.base.weld.WeldUtils;
 import org.openbravo.client.application.process.BaseProcessActionHandler;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.erpCommon.utility.OBMessageUtils;
@@ -115,13 +115,7 @@
       log.error(ERROR_IN_PROCESS, e);
 
       return createPopUpError(e.getMessage(), true);
-    } catch (JSONException e) {
-      log.error(ERROR_IN_PROCESS, e);
-
-      return createResponse(JsonConstants.RESPONSE_ERROR,
-          OBMessageUtils.messageBD("OBUIAPP_Error"), OBMessageUtils.messageBD("APRM_UnknownError"),
-          false);
-    } catch (ParseException e) {
+    } catch (Exception e) {
       log.error(ERROR_IN_PROCESS, e);
 
       return createResponse(JsonConstants.RESPONSE_ERROR,
@@ -190,9 +184,13 @@
 
       OBDal.getInstance().flush();
       processTransactions(transactions);
-    } catch (OBException obe) {
-      String message = OBMessageUtils.parseTranslation(obe.getMessage());
-      throw new OBException(message, obe);
+
+      WeldUtils.getInstanceFromStaticBeanManager(FundsTransferHookCaller.class).executeHook(
+          transactions);
+
+    } catch (Exception e) {
+      String message = OBMessageUtils.parseTranslation(e.getMessage());
+      throw new OBException(message, e);
     }
   }
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/FundsTransferHookCaller.java	Wed Jan 25 05:32:50 2017 +0000
@@ -0,0 +1,48 @@
+/*
+ *************************************************************************
+ * 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) 2016 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+ */
+package org.openbravo.advpaymentmngt.actionHandler;
+
+import java.util.Iterator;
+import java.util.List;
+
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+
+import org.openbravo.advpaymentmngt.FundsTransferPostProcessHook;
+import org.openbravo.model.financialmgmt.payment.FIN_FinaccTransaction;
+
+public class FundsTransferHookCaller {
+
+  @Inject
+  @Any
+  private Instance<FundsTransferPostProcessHook> hooks;
+
+  public void executeHook(List<FIN_FinaccTransaction> transactions) throws Exception {
+    executeHooks(transactions);
+  }
+
+  private void executeHooks(List<FIN_FinaccTransaction> transactions) throws Exception {
+    for (Iterator<FundsTransferPostProcessHook> procIter = hooks.iterator(); procIter.hasNext();) {
+      FundsTransferPostProcessHook proc = procIter.next();
+      proc.exec(transactions);
+    }
+  }
+
+}
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java	Wed Jan 25 05:32:50 2017 +0000
@@ -66,6 +66,7 @@
 import org.openbravo.model.ad.process.ProcessInstance;
 import org.openbravo.model.ad.ui.Process;
 import org.openbravo.model.common.currency.ConversionRate;
+import org.openbravo.model.common.currency.ConversionRateDoc;
 import org.openbravo.model.common.enterprise.DocumentType;
 import org.openbravo.model.common.invoice.Invoice;
 import org.openbravo.model.common.invoice.ReversedInvoice;
@@ -252,6 +253,28 @@
               return;
             }
 
+            // If Invoice has a awaiting execution payment related, show an Error
+            List<FIN_PaymentSchedule> psl = invoice.getFINPaymentScheduleList();
+            for (FIN_PaymentSchedule ps : psl) {
+              List<FIN_PaymentScheduleDetail> psdl = ps
+                  .getFINPaymentScheduleDetailInvoicePaymentScheduleList();
+              for (FIN_PaymentScheduleDetail psd : psdl) {
+                FIN_PaymentDetail pd = psd.getPaymentDetails();
+                if (pd != null
+                    && (pd.getFinPayment().getStatus().equals("RPAE") || pd.getFinPayment()
+                        .getStatus().equals("RPAP"))) {
+                  msg = new OBError();
+                  msg.setType("Error");
+                  msg.setTitle(Utility.messageBD(this, "Error", vars.getLanguage()));
+                  msg.setMessage(OBMessageUtils
+                      .messageBD("APRM_InvoiceAwaitingExcutionPaymentRelated"));
+                  vars.setMessage(strTabId, msg);
+                  printPageClosePopUp(response, vars, Utility.getTabURL(strTabId, "R", true));
+                  return;
+                }
+              }
+            }
+
             // Reversed invoice's date: voidDate in Purchase Invoice, new Date() in Sales Invoice
             Date reversedDate = voidDate != null ? voidDate : new Date();
 
@@ -291,8 +314,23 @@
               OBDal.getInstance().save(psd);
             }
             dummyPayment.setFINPaymentDetailList(paymentDetails);
+
+            // Copy exchange rate from invoice
+            for (ConversionRateDoc conversionRateDoc : invoice.getCurrencyConversionRateDocList()) {
+              ConversionRateDoc newConversionRateDoc = OBProvider.getInstance().get(
+                  ConversionRateDoc.class);
+              newConversionRateDoc.setClient(conversionRateDoc.getClient());
+              newConversionRateDoc.setOrganization(conversionRateDoc.getOrganization());
+              newConversionRateDoc.setCurrency(conversionRateDoc.getCurrency());
+              newConversionRateDoc.setToCurrency(conversionRateDoc.getToCurrency());
+              newConversionRateDoc.setRate(conversionRateDoc.getRate());
+              newConversionRateDoc.setForeignAmount(BigDecimal.ZERO);
+              newConversionRateDoc.setPayment(dummyPayment);
+              dummyPayment.getCurrencyConversionRateDocList().add(newConversionRateDoc);
+              OBDal.getInstance().save(newConversionRateDoc);
+            }
+
             OBDal.getInstance().save(dummyPayment);
-
           } catch (final Exception e) {
             log4j.error("Exception while creating dummy payment for the invoice: "
                 + strC_Invoice_ID);
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java	Wed Jan 25 05:32:50 2017 +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-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -195,8 +195,8 @@
           account, "Y");
 
       reconciliation.setEndingBalance(new BigDecimal(strEndBalance));
-      reconciliation.setTransactionDate(FIN_Utility.getDateTime(strStatementDate));
-      reconciliation.setEndingDate(FIN_Utility.getDateTime(strStatementDate));
+      reconciliation.setTransactionDate(FIN_Utility.getDate(strStatementDate));
+      reconciliation.setEndingDate(FIN_Utility.getDate(strStatementDate));
       reconciliation.setDocumentStatus("DR");
       reconciliation.setProcessed(false);
       reconciliation.setAPRMProcessReconciliation("P");
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddPaymentReadOnlyLogicsHandler.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddPaymentReadOnlyLogicsHandler.java	Wed Jan 25 05:32:50 2017 +0000
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2014 Openbravo SLU
+ * All portions are Copyright (C) 2014-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -27,6 +27,7 @@
 import org.codehaus.jettison.json.JSONObject;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
+import org.openbravo.erpCommon.businessUtility.Preferences;
 import org.openbravo.erpCommon.utility.PropertyException;
 import org.openbravo.erpCommon.utility.PropertyNotFoundException;
 import org.openbravo.model.ad.ui.Window;
@@ -139,7 +140,7 @@
           "NotAllowChangeExchange", true, OBContext.getOBContext().getCurrentClient(), OBContext
               .getOBContext().getCurrentOrganization(), OBContext.getOBContext().getUser(),
           OBContext.getOBContext().getRole(), window);
-      return "Y".equals(value);
+      return Preferences.YES.equals(value);
     } catch (PropertyNotFoundException e) {
       logger.debug("Property NotAllowChangeExchange not found");
       return false;
@@ -178,7 +179,7 @@
           "NotAllowChangeExchange", true, OBContext.getOBContext().getCurrentClient(), OBContext
               .getOBContext().getCurrentOrganization(), OBContext.getOBContext().getUser(),
           OBContext.getOBContext().getRole(), window);
-      return "Y".equals(value);
+      return Preferences.YES.equals(value);
     } catch (PropertyNotFoundException e) {
       logger.debug("Property NotAllowChangeExchange not found");
       return false;
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/TransactionAddPaymentDefaultValues.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/TransactionAddPaymentDefaultValues.java	Wed Jan 25 05:32:50 2017 +0000
@@ -262,14 +262,16 @@
     if (context.has("depositamt") && context.has("withdrawalamt")
         && context.get("depositamt") != JSONObject.NULL
         && context.get("withdrawalamt") != JSONObject.NULL) {
-      return new BigDecimal(context.getString("depositamt")).subtract(
-          new BigDecimal(context.getString("withdrawalamt"))).toString();
+      return new BigDecimal(convertToSafeDecimalString(context.getString("depositamt"))).subtract(
+          new BigDecimal(convertToSafeDecimalString(context.getString("withdrawalamt"))))
+          .toString();
     }
     if (context.has("inpdepositamt") && context.has("inppaymentamt")
         && context.get("inpdepositamt") != JSONObject.NULL
         && context.get("inppaymentamt") != JSONObject.NULL) {
-      return new BigDecimal(context.getString("inpdepositamt")).subtract(
-          new BigDecimal(context.getString("inppaymentamt"))).toString();
+      return new BigDecimal(convertToSafeDecimalString(context.getString("inpdepositamt")))
+          .subtract(new BigDecimal(convertToSafeDecimalString(context.getString("inppaymentamt"))))
+          .toString();
     }
     return BigDecimal.ZERO.toPlainString();
   }
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java	Wed Jan 25 05:32:50 2017 +0000
@@ -1304,7 +1304,7 @@
    * @param writeOffAmount
    *          Write off amount, null or 0 if not applicable.
    * 
-   * @Deprecated This method doesn't support Cash VAT flow, so it's better to use
+   * @deprecated This method doesn't support Cash VAT flow, so it's better to use
    *             {@link #updatePaymentDetail(FIN_PaymentScheduleDetail, FIN_Payment, BigDecimal, boolean)}
    */
   @Deprecated
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPaymentFromJournalLine.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPaymentFromJournalLine.java	Wed Jan 25 05:32:50 2017 +0000
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2013-2014 Openbravo SLU
+ * All portions are Copyright (C) 2013-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -67,22 +67,24 @@
       BusinessPartner bPartner = journalLine.getBusinessPartner();
       GLItem glItem = journalLine.getGLItem();
       Date date = journalLine.getPaymentDate();
-      boolean isReceipt = journalLine.getDebit().subtract(journalLine.getCredit()).compareTo(
-          BigDecimal.ZERO) > 0;
+      boolean isReceipt = journalLine.getDebit().subtract(journalLine.getCredit())
+          .compareTo(BigDecimal.ZERO) > 0;
 
       // Check restrictions
       OBContext.setAdminMode(false);
       try {
-        final StringBuilder hsqlScript = new StringBuilder();
-        hsqlScript.append("select distinct(o.generalLedger) ");
-        hsqlScript.append("from Organization o ");
-        hsqlScript.append("where ad_isorgincluded('" + journalLine.getOrganization().getId()
-            + "', o.id, o.client) <> -1 ");
-        hsqlScript.append("and o.generalLedger is not null ");
-        final Session session = OBDal.getInstance().getSession();
-        final Query query = session.createQuery(hsqlScript.toString());
-        if (query.list().size() != 1) {
-          throw new OBException("@FIN_NoMultiAccountingAllowed@");
+        if (!journalLine.getJournalEntry().isMultigeneralLedger()) {
+          final StringBuilder hsqlScript = new StringBuilder();
+          hsqlScript.append("select distinct(o.generalLedger) ");
+          hsqlScript.append("from Organization o ");
+          hsqlScript.append("where ad_isorgincluded('" + journalLine.getOrganization().getId()
+              + "', o.id, o.client) <> -1 ");
+          hsqlScript.append("and o.generalLedger is not null ");
+          final Session session = OBDal.getInstance().getSession();
+          final Query query = session.createQuery(hsqlScript.toString());
+          if (query.list().size() != 1) {
+            throw new OBException("@FIN_NoMultiAccountingAllowed@");
+          }
         }
       } finally {
         OBContext.restorePreviousMode();
@@ -111,18 +113,18 @@
           (isReceipt) ? "ARR" : "APP", (isReceipt) ? "AR Receipt" : "AP Payment");
 
       // Generate Payment
-      FIN_Payment payment = dao.getNewPayment(isReceipt, journalLine.getOrganization(), dao
-          .getObject(DocumentType.class, strDocTypeId), strPaymentDocumentNo, bPartner,
-          paymentMethod, financialAccount, journalLine.getForeignCurrencyDebit().subtract(
-              journalLine.getForeignCurrencyCredit()).abs().toString(), date, null, journalLine
-              .getCurrency(), null, null);
+      FIN_Payment payment = dao.getNewPayment(isReceipt, journalLine.getOrganization(),
+          dao.getObject(DocumentType.class, strDocTypeId), strPaymentDocumentNo, bPartner,
+          paymentMethod, financialAccount,
+          journalLine.getForeignCurrencyDebit().subtract(journalLine.getForeignCurrencyCredit())
+              .abs().toString(), date, null, journalLine.getCurrency(), null, null);
 
       // Add Payment Details
-      FIN_AddPayment.saveGLItem(payment, journalLine.getForeignCurrencyDebit().subtract(
-          journalLine.getForeignCurrencyCredit()).abs(), glItem, bPartner,
-          journalLine.getProduct(), journalLine.getProject(), journalLine.getSalesCampaign(),
-          journalLine.getActivity(), journalLine.getSalesRegion(), journalLine.getCostCenter(),
-          journalLine.getStDimension(), journalLine.getNdDimension());
+      FIN_AddPayment.saveGLItem(payment,
+          journalLine.getForeignCurrencyDebit().subtract(journalLine.getForeignCurrencyCredit())
+              .abs(), glItem, bPartner, journalLine.getProduct(), journalLine.getProject(),
+          journalLine.getSalesCampaign(), journalLine.getActivity(), journalLine.getSalesRegion(),
+          journalLine.getCostCenter(), journalLine.getStDimension(), journalLine.getNdDimension());
 
       OBDal.getInstance().flush();
 
@@ -144,8 +146,10 @@
         strMessageType = "Success";
       }
       strMessageResult.append("@Payment@ ").append(payment.getDocumentNo());
-      strMessageResult.append(" (").append(
-          payment.getBusinessPartner() != null ? payment.getBusinessPartner().getName() : "")
+      strMessageResult
+          .append(" (")
+          .append(
+              payment.getBusinessPartner() != null ? payment.getBusinessPartner().getName() : "")
           .append(")");
       if (!"".equals(message.getMessage()))
         strMessageResult.append(": ").append(message.getMessage());
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java	Wed Jan 25 05:32:50 2017 +0000
@@ -325,7 +325,7 @@
           // Execution Process
           if (!isPosOrder
               && dao.isAutomatedExecutionPayment(payment.getAccount(), payment.getPaymentMethod(),
-                  payment.isReceipt())) {
+                  payment.isReceipt()) && payment.getAmount().compareTo(BigDecimal.ZERO) != 0) {
             try {
               payment.setStatus("RPAE");
 
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java	Wed Jan 25 05:32:50 2017 +0000
@@ -359,7 +359,8 @@
     return null;
   }
 
-  public static String getDocumentNo(boolean updateNext, Sequence seq) {
+  public static String getDocumentNo(boolean updateNext, Sequence seqParam) {
+    Sequence seq = seqParam;
     if (seq != null) {
       if (updateNext) {
         // We lock the sequence with a select for update to avoid duplicates
@@ -558,12 +559,17 @@
       String strFinancialAccountId, String strOrgId, boolean isMandatory, String strCurrencyId,
       boolean isInPayment) {
 
-    List<FIN_FinancialAccount> financialAccounts = dao.getFilteredFinancialAccounts(
-        strPaymentMethodId, strOrgId, strCurrencyId,
-        isInPayment ? AdvPaymentMngtDao.PaymentDirection.IN
-            : AdvPaymentMngtDao.PaymentDirection.OUT);
-    String options = getOptionsList(financialAccounts, strFinancialAccountId, isMandatory);
-    return options;
+    try {
+      OBContext.setAdminMode(true);
+      List<FIN_FinancialAccount> financialAccounts = dao.getFilteredFinancialAccounts(
+          strPaymentMethodId, strOrgId, strCurrencyId,
+          isInPayment ? AdvPaymentMngtDao.PaymentDirection.IN
+              : AdvPaymentMngtDao.PaymentDirection.OUT);
+      String options = getOptionsList(financialAccounts, strFinancialAccountId, isMandatory);
+      return options;
+    } finally {
+      OBContext.restorePreviousMode();
+    }
   }
 
   /**
--- a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js	Wed Jan 25 05:32:50 2017 +0000
@@ -1089,6 +1089,7 @@
 OB.APRM.AddPayment.onProcess = function (view, actionHandlerCall, clientSideValidationFail) {
   var orderInvoiceGrid = view.theForm.getItem('order_invoice').canvas.viewGrid,
       receivedFrom = view.theForm.getItem('received_from').getValue(),
+      currencyId = view.theForm.getItem('c_currency_id').getValue(),
       issotrx = view.theForm.getItem('issotrx').getValue(),
       finFinancialAccount = view.theForm.getItem('fin_financial_account_id').getValue(),
       amountInvOrds = new BigDecimal(String(view.theForm.getItem('amount_inv_ords').getValue() || 0)),
@@ -1186,6 +1187,9 @@
   OB.RemoteCallManager.call('org.openbravo.advpaymentmngt.actionHandler.AddPaymentOnProcessActionHandler', {
     issotrx: issotrx,
     receivedFrom: receivedFrom,
+    currencyId: currencyId,
+    usesCredit: creditTotalItem.compareTo(BigDecimal.prototype.ZERO) !== 0,
+    generatesCredit: overpaymentField.isVisible() && overpaymentAction === 'CR',
     selectedRecords: selectedRecords,
     finFinancialAccount: finFinancialAccount
   }, {}, callbackOnProcessActionHandler);
--- a/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></VERSION>
+<!--8A098711BB324335A19833286BDB093D-->  <VERSION><![CDATA[1.0.31055]]></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[PR16Q4.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	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></STARTVERSION>
+<!--1467C397BC5F4999A5606F39CD6FF8A4-->  <STARTVERSION><![CDATA[2.1.31055]]></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/JdbcExternalConnectionPool.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/JdbcExternalConnectionPool.java	Wed Jan 25 05:32:50 2017 +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-2015 Openbravo SLU
+ * All portions are Copyright (C) 2014-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -97,7 +97,6 @@
     PoolProperties poolProperties = new PoolProperties();
 
     poolProperties.setJdbcInterceptors("org.apache.tomcat.jdbc.pool.interceptor.ConnectionState;"
-        + "org.apache.tomcat.jdbc.pool.interceptor.StatementFinalizer;"
         + "org.openbravo.apachejdbcconnectionpool.ConnectionInitializerInterceptor;");
 
     if (SessionFactoryController.isJNDIModeOn(poolPropertiesConfig)) {
Binary file modules/org.openbravo.base.weld/lib/runtime/cal10n-api-0.7.4.jar has changed
Binary file modules/org.openbravo.base.weld/lib/runtime/cal10n-api-0.7.7.jar has changed
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.31055]]></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[PR16Q4.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	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.31055]]></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/META-INF/beans.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.base.weld/src/META-INF/beans.xml	Wed Jan 25 05:32:50 2017 +0000
@@ -37,7 +37,11 @@
         <weld:exclude name="org.openbravo.model.**"/>
         <weld:exclude name="org.openbravo.examples.**"/>
         <weld:exclude name="org.openbravo.authentication.**"/>
-        <weld:exclude name="org.openbravo.**.ad_*.**"/>
+        <weld:exclude name="org.openbravo.**.ad_callouts.**"/>
+        <weld:exclude name="org.openbravo.**.ad_combos.**"/>
+        <weld:exclude name="org.openbravo.**.ad_forms.**"/>
+        <weld:exclude name="org.openbravo.**.ad_help.**"/>
+        <weld:exclude name="org.openbravo.**.ad_reports.**"/>
         <weld:exclude name="org.openbravo.**.test.**">
           <weld:if-class-available name="!org.jboss.ejb3.api.spi.EJBContainerWrapper"/>
         </weld:exclude>
--- a/modules/org.openbravo.base.weld/src/org/openbravo/base/weld/WeldUtils.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.base.weld/src/org/openbravo/base/weld/WeldUtils.java	Wed Jan 25 05:32:50 2017 +0000
@@ -18,6 +18,8 @@
  */
 package org.openbravo.base.weld;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Set;
 
 import javax.enterprise.context.ApplicationScoped;
@@ -29,7 +31,6 @@
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
-import org.jboss.weld.environment.servlet.Listener;
 import org.openbravo.base.exception.OBException;
 import org.openbravo.dal.core.DalContextListener;
 import org.slf4j.Logger;
@@ -45,11 +46,12 @@
 
   private static BeanManager staticBeanManager = null;
   private static final Logger log = LoggerFactory.getLogger(WeldUtils.class);
+  private static final String BEAN_MANAGER_ATTRIBUTE_NAME = "org.jboss.weld.environment.servlet.javax.enterprise.inject.spi.BeanManager";
 
   public static BeanManager getStaticInstanceBeanManager() {
     if (staticBeanManager == null) {
       staticBeanManager = (BeanManager) DalContextListener.getServletContext().getAttribute(
-          Listener.BEAN_MANAGER_ATTRIBUTE_NAME);
+          BEAN_MANAGER_ATTRIBUTE_NAME);
 
       if (staticBeanManager == null) {
         // In wildfly, bean manager is not saved in servlet context.
@@ -120,4 +122,21 @@
     }
     throw new IllegalArgumentException("No bean found for type " + type);
   }
+
+  /**
+   * Returns a set of instances for a specified type/class
+   */
+  @SuppressWarnings("unchecked")
+  public static <T> List<T> getInstances(Class<T> type) {
+    final BeanManager beanManager = WeldUtils.getStaticInstanceBeanManager();
+    final Set<Bean<?>> beans = beanManager.getBeans(type);
+
+    final List<T> instances = new ArrayList<T>();
+    for (Bean<?> bean : beans) {
+      T instance = (T) beanManager.getReference(bean, type,
+          beanManager.createCreationalContext(bean));
+      instances.add(instance);
+    }
+    return instances;
+  }
 }
--- a/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_SYSTEM.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_SYSTEM.xml	Wed Jan 25 05:32:50 2017 +0000
@@ -73,6 +73,10 @@
         <default><![CDATA[10]]></default>
         <onCreateDefault><![CDATA['10']]></onCreateDefault>
       </column>
+      <column name="ALLOWSUMMARYFUNCTIONS" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="OBUIAPP_GC_SYSTEM_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
@@ -84,6 +88,7 @@
       <check name="OBUIAPP_GC_SYS_ISLAZY_CHK"><![CDATA[ISLAZYFILTERING IN ('Y', 'N')]]></check>
       <check name="OBUIAPP_GC_SYS_ISSORT_CHK"><![CDATA[ISSORTABLE IN ('Y', 'N')]]></check>
       <check name="OBUIAPP_GC_SYS_ONCHNG_CHK"><![CDATA[FILTERONCHANGE IN ('Y', 'N')]]></check>
+      <check name="OBUIAPP_GC_SYS_SUMMARY_CHK"><![CDATA[ALLOWSUMMARYFUNCTIONS IN ('Y', 'N')]]></check>
       <check name="OBUIAPP_GC_SYS_UNFILTDD_CHK"><![CDATA[ISFKDROPDOWNUNFILTERED IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_TAB.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_TAB.xml	Wed Jan 25 05:32:50 2017 +0000
@@ -77,6 +77,10 @@
         <default><![CDATA[10]]></default>
         <onCreateDefault><![CDATA['10']]></onCreateDefault>
       </column>
+      <column name="ALLOWSUMMARYFUNCTIONS" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false">
+        <default><![CDATA[D]]></default>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="OBUIAPP_GC_TAB_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
--- a/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_REPORT.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_REPORT.xml	Wed Jan 25 05:32:50 2017 +0000
@@ -49,6 +49,14 @@
         <default><![CDATA[N]]></default>
         <onCreateDefault/>
       </column>
+      <column name="HTML_TEMPLATE" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="USE_PDF_AS_HTML_TEMPLATE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault><![CDATA['N']]></onCreateDefault>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="OBUIAPP_REPORT_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
@@ -62,7 +70,8 @@
         <unique-column name="OBUIAPP_PROCESS_ID"/>
       </unique>
       <check name="OBUIAPP_REPORT_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+      <check name="OBUIAPP_REPORT_PDF_AS_HTML_CHK"><![CDATA[USE_PDF_AS_HTML_TEMPLATE IN ('Y', 'N')]]></check>
       <check name="OBUIAPP_REPORT_PDF_AS_XLS_CHK"><![CDATA[USE_PDF_AS_XLS_TEMPLATE IN ('Y', 'N')]]></check>
-      <check name="OBUIAPP_REPORT_TMP_CHK"><![CDATA[PDF_TEMPLATE IS NOT NULL OR XLS_TEMPLATE IS NOT NULL]]></check>
+      <check name="OBUIAPP_REPORT_TMP_CHK"><![CDATA[PDF_TEMPLATE IS NOT NULL OR XLS_TEMPLATE IS NOT NULL OR HTML_TEMPLATE IS NOT NULL]]></check>
     </table>
   </database>
--- a/modules/org.openbravo.client.application/src-db/database/model/triggers/OBUIAPP_REPORT_MOD_TRG.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/model/triggers/OBUIAPP_REPORT_MOD_TRG.xml	Wed Jan 25 05:32:50 2017 +0000
@@ -55,7 +55,9 @@
         COALESCE(:NEW.OBUIAPP_Process_ID , '.') != COALESCE(:OLD.OBUIAPP_Process_ID , '.') OR
         COALESCE(:NEW.PDF_Template , '.') != COALESCE(:OLD.PDF_Template , '.') OR
         COALESCE(:NEW.XLS_Template , '.') != COALESCE(:OLD.XLS_Template , '.') OR
+        COALESCE(:NEW.HTML_Template , '.') != COALESCE(:OLD.HTML_Template , '.') OR
         COALESCE(:NEW.USE_PDF_AS_XLS_TEMPLATE , '.') != COALESCE(:OLD.USE_PDF_AS_XLS_TEMPLATE , '.') OR
+        COALESCE(:NEW.USE_PDF_AS_HTML_TEMPLATE , '.') != COALESCE(:OLD.USE_PDF_AS_HTML_TEMPLATE , '.') OR
         1=2) THEN
       RAISE_APPLICATION_ERROR(-20000, '@20532@');
     END IF;
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml	Wed Jan 25 05:32:50 2017 +0000
@@ -1470,6 +1470,45 @@
 <!--178D324AD10947149B7F79F140AA6832-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--178D324AD10947149B7F79F140AA6832--></AD_COLUMN>
 
+<!--17BDFF7E011B456AA35E388543741F7C--><AD_COLUMN>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <AD_COLUMN_ID><![CDATA[17BDFF7E011B456AA35E388543741F7C]]></AD_COLUMN_ID>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <NAME><![CDATA[AllowSummaryFunctions]]></NAME>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <DESCRIPTION><![CDATA[If this flag is enabled then the user can add summary functions into the grid, by using the column header context menu. If not enabled, then the summary functions menu will not be available.]]></DESCRIPTION>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <HELP><![CDATA[If this flag is enabled then the user can add summary functions into the grid, by using the column header context menu. If not enabled, then the summary functions menu will not be available.]]></HELP>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <COLUMNNAME><![CDATA[AllowSummaryFunctions]]></COLUMNNAME>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <AD_TABLE_ID><![CDATA[5D50320222DD4865ADFD50364C84291D]]></AD_TABLE_ID>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <SEQNO><![CDATA[190]]></SEQNO>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <AD_ELEMENT_ID><![CDATA[6F89D13CC2D547DF82B8B835DC91BC39]]></AD_ELEMENT_ID>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <POSITION><![CDATA[20]]></POSITION>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--17BDFF7E011B456AA35E388543741F7C--></AD_COLUMN>
+
 <!--182023ADC5294B6C87123A6AF98F567D--><AD_COLUMN>
 <!--182023ADC5294B6C87123A6AF98F567D-->  <AD_COLUMN_ID><![CDATA[182023ADC5294B6C87123A6AF98F567D]]></AD_COLUMN_ID>
 <!--182023ADC5294B6C87123A6AF98F567D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3578,6 +3617,46 @@
 <!--566FA3846A514CB48A5B470711520415-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--566FA3846A514CB48A5B470711520415--></AD_COLUMN>
 
+<!--56C7AD9229D94A15A80AE69AB27D9AC7--><AD_COLUMN>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <AD_COLUMN_ID><![CDATA[56C7AD9229D94A15A80AE69AB27D9AC7]]></AD_COLUMN_ID>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <NAME><![CDATA[AllowSummaryFunctions]]></NAME>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <DESCRIPTION><![CDATA[If this flag is enabled then the user can add summary functions into the grid, by using the column header context menu. If not enabled, then the summary functions menu will not be available.]]></DESCRIPTION>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <HELP><![CDATA[If this flag is enabled then the user can add summary functions into the grid, by using the column header context menu. If not enabled, then the summary functions menu will not be available.]]></HELP>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <COLUMNNAME><![CDATA[AllowSummaryFunctions]]></COLUMNNAME>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <AD_TABLE_ID><![CDATA[8A16662B37184121A1EDAA89890E160C]]></AD_TABLE_ID>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <AD_REFERENCE_VALUE_ID><![CDATA[892231CFE03848758D74B0209B801C14]]></AD_REFERENCE_VALUE_ID>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <DEFAULTVALUE><![CDATA[D]]></DEFAULTVALUE>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <SEQNO><![CDATA[210]]></SEQNO>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <AD_ELEMENT_ID><![CDATA[6F89D13CC2D547DF82B8B835DC91BC39]]></AD_ELEMENT_ID>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <POSITION><![CDATA[20]]></POSITION>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7--></AD_COLUMN>
+
 <!--57C992741B824BE5A3B285A4E2B9AF02--><AD_COLUMN>
 <!--57C992741B824BE5A3B285A4E2B9AF02-->  <AD_COLUMN_ID><![CDATA[57C992741B824BE5A3B285A4E2B9AF02]]></AD_COLUMN_ID>
 <!--57C992741B824BE5A3B285A4E2B9AF02-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -5791,6 +5870,45 @@
 <!--8A70E8C4933E45169F74BC730318D1B5-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--8A70E8C4933E45169F74BC730318D1B5--></AD_COLUMN>
 
+<!--8BAD159F88D64983917E5D2D4DF400F7--><AD_COLUMN>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <AD_COLUMN_ID><![CDATA[8BAD159F88D64983917E5D2D4DF400F7]]></AD_COLUMN_ID>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <NAME><![CDATA[Use PDF as HTML Template]]></NAME>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <DESCRIPTION><![CDATA[Determines whether the PDF Template needs to be used to generate the HTML report instead of defining a specific template for it.]]></DESCRIPTION>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <HELP><![CDATA[Determines whether the PDF Template needs to be used to generate the HTML report instead of defining a specific template for it.]]></HELP>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <COLUMNNAME><![CDATA[USE_Pdf_As_Html_Template]]></COLUMNNAME>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <AD_TABLE_ID><![CDATA[C7CAB786F3EF4DF0B5E7B9AC6EC7DED8]]></AD_TABLE_ID>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <SEQNO><![CDATA[140]]></SEQNO>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <AD_ELEMENT_ID><![CDATA[0FA9076400FE4EF2BEACC722292144C5]]></AD_ELEMENT_ID>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <POSITION><![CDATA[14]]></POSITION>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--8BAD159F88D64983917E5D2D4DF400F7--></AD_COLUMN>
+
 <!--8BE595E8BE9940578AF409B85AFE02AA--><AD_COLUMN>
 <!--8BE595E8BE9940578AF409B85AFE02AA-->  <AD_COLUMN_ID><![CDATA[8BE595E8BE9940578AF409B85AFE02AA]]></AD_COLUMN_ID>
 <!--8BE595E8BE9940578AF409B85AFE02AA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -8214,6 +8332,44 @@
 <!--A1A338DE694D4B849A249AD2C709B36C-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A1A338DE694D4B849A249AD2C709B36C--></AD_COLUMN>
 
+<!--A215112D541C479796B314D93155993F--><AD_COLUMN>
+<!--A215112D541C479796B314D93155993F-->  <AD_COLUMN_ID><![CDATA[A215112D541C479796B314D93155993F]]></AD_COLUMN_ID>
+<!--A215112D541C479796B314D93155993F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A215112D541C479796B314D93155993F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A215112D541C479796B314D93155993F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A215112D541C479796B314D93155993F-->  <NAME><![CDATA[HTML Template]]></NAME>
+<!--A215112D541C479796B314D93155993F-->  <DESCRIPTION><![CDATA[JRXML template to use for exporting the report to HTML format]]></DESCRIPTION>
+<!--A215112D541C479796B314D93155993F-->  <HELP><![CDATA[JRXML template to use for exporting the report to HTML format]]></HELP>
+<!--A215112D541C479796B314D93155993F-->  <COLUMNNAME><![CDATA[HTML_Template]]></COLUMNNAME>
+<!--A215112D541C479796B314D93155993F-->  <AD_TABLE_ID><![CDATA[C7CAB786F3EF4DF0B5E7B9AC6EC7DED8]]></AD_TABLE_ID>
+<!--A215112D541C479796B314D93155993F-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--A215112D541C479796B314D93155993F-->  <FIELDLENGTH><![CDATA[255]]></FIELDLENGTH>
+<!--A215112D541C479796B314D93155993F-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--A215112D541C479796B314D93155993F-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--A215112D541C479796B314D93155993F-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--A215112D541C479796B314D93155993F-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--A215112D541C479796B314D93155993F-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--A215112D541C479796B314D93155993F-->  <SEQNO><![CDATA[130]]></SEQNO>
+<!--A215112D541C479796B314D93155993F-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--A215112D541C479796B314D93155993F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A215112D541C479796B314D93155993F-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--A215112D541C479796B314D93155993F-->  <AD_ELEMENT_ID><![CDATA[7B0DBFCC0E5C429092E23014127C44B8]]></AD_ELEMENT_ID>
+<!--A215112D541C479796B314D93155993F-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--A215112D541C479796B314D93155993F-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--A215112D541C479796B314D93155993F-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--A215112D541C479796B314D93155993F-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--A215112D541C479796B314D93155993F-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--A215112D541C479796B314D93155993F-->  <POSITION><![CDATA[13]]></POSITION>
+<!--A215112D541C479796B314D93155993F-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--A215112D541C479796B314D93155993F-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--A215112D541C479796B314D93155993F-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--A215112D541C479796B314D93155993F-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--A215112D541C479796B314D93155993F-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--A215112D541C479796B314D93155993F-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--A215112D541C479796B314D93155993F-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A215112D541C479796B314D93155993F-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--A215112D541C479796B314D93155993F--></AD_COLUMN>
+
 <!--A296915242174A738010EB453701B187--><AD_COLUMN>
 <!--A296915242174A738010EB453701B187-->  <AD_COLUMN_ID><![CDATA[A296915242174A738010EB453701B187]]></AD_COLUMN_ID>
 <!--A296915242174A738010EB453701B187-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml	Wed Jan 25 05:32:50 2017 +0000
@@ -80,6 +80,20 @@
 <!--0E87BDD6E59C4B5FB9273E2580CC76B2-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--0E87BDD6E59C4B5FB9273E2580CC76B2--></AD_ELEMENT>
 
+<!--0FA9076400FE4EF2BEACC722292144C5--><AD_ELEMENT>
+<!--0FA9076400FE4EF2BEACC722292144C5-->  <AD_ELEMENT_ID><![CDATA[0FA9076400FE4EF2BEACC722292144C5]]></AD_ELEMENT_ID>
+<!--0FA9076400FE4EF2BEACC722292144C5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0FA9076400FE4EF2BEACC722292144C5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0FA9076400FE4EF2BEACC722292144C5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0FA9076400FE4EF2BEACC722292144C5-->  <COLUMNNAME><![CDATA[USE_Pdf_As_Html_Template]]></COLUMNNAME>
+<!--0FA9076400FE4EF2BEACC722292144C5-->  <NAME><![CDATA[Use PDF as HTML Template]]></NAME>
+<!--0FA9076400FE4EF2BEACC722292144C5-->  <PRINTNAME><![CDATA[Use PDF as HTML Template]]></PRINTNAME>
+<!--0FA9076400FE4EF2BEACC722292144C5-->  <DESCRIPTION><![CDATA[Determines whether the PDF Template needs to be used to generate the HTML report instead of defining a specific template for it.]]></DESCRIPTION>
+<!--0FA9076400FE4EF2BEACC722292144C5-->  <HELP><![CDATA[Determines whether the PDF Template needs to be used to generate the HTML report instead of defining a specific template for it.]]></HELP>
+<!--0FA9076400FE4EF2BEACC722292144C5-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--0FA9076400FE4EF2BEACC722292144C5-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--0FA9076400FE4EF2BEACC722292144C5--></AD_ELEMENT>
+
 <!--10922048465547F48765035389E22977--><AD_ELEMENT>
 <!--10922048465547F48765035389E22977-->  <AD_ELEMENT_ID><![CDATA[10922048465547F48765035389E22977]]></AD_ELEMENT_ID>
 <!--10922048465547F48765035389E22977-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -408,6 +422,20 @@
 <!--6DBAB16113DB4879A0EA095E80FBA959-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--6DBAB16113DB4879A0EA095E80FBA959--></AD_ELEMENT>
 
+<!--6F89D13CC2D547DF82B8B835DC91BC39--><AD_ELEMENT>
+<!--6F89D13CC2D547DF82B8B835DC91BC39-->  <AD_ELEMENT_ID><![CDATA[6F89D13CC2D547DF82B8B835DC91BC39]]></AD_ELEMENT_ID>
+<!--6F89D13CC2D547DF82B8B835DC91BC39-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6F89D13CC2D547DF82B8B835DC91BC39-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6F89D13CC2D547DF82B8B835DC91BC39-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6F89D13CC2D547DF82B8B835DC91BC39-->  <COLUMNNAME><![CDATA[AllowSummaryFunctions]]></COLUMNNAME>
+<!--6F89D13CC2D547DF82B8B835DC91BC39-->  <NAME><![CDATA[Allow Summary Functions]]></NAME>
+<!--6F89D13CC2D547DF82B8B835DC91BC39-->  <PRINTNAME><![CDATA[Allow Summary Functions]]></PRINTNAME>
+<!--6F89D13CC2D547DF82B8B835DC91BC39-->  <DESCRIPTION><![CDATA[If this flag is enabled then the user can add summary functions into the grid, by using the column header context menu. If not enabled, then the summary functions menu will not be available.]]></DESCRIPTION>
+<!--6F89D13CC2D547DF82B8B835DC91BC39-->  <HELP><![CDATA[If this flag is enabled then the user can add summary functions into the grid, by using the column header context menu. If not enabled, then the summary functions menu will not be available.]]></HELP>
+<!--6F89D13CC2D547DF82B8B835DC91BC39-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--6F89D13CC2D547DF82B8B835DC91BC39-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--6F89D13CC2D547DF82B8B835DC91BC39--></AD_ELEMENT>
+
 <!--7A18B7D741A349B493D145C80DB54E5E--><AD_ELEMENT>
 <!--7A18B7D741A349B493D145C80DB54E5E-->  <AD_ELEMENT_ID><![CDATA[7A18B7D741A349B493D145C80DB54E5E]]></AD_ELEMENT_ID>
 <!--7A18B7D741A349B493D145C80DB54E5E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -420,6 +448,20 @@
 <!--7A18B7D741A349B493D145C80DB54E5E-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--7A18B7D741A349B493D145C80DB54E5E--></AD_ELEMENT>
 
+<!--7B0DBFCC0E5C429092E23014127C44B8--><AD_ELEMENT>
+<!--7B0DBFCC0E5C429092E23014127C44B8-->  <AD_ELEMENT_ID><![CDATA[7B0DBFCC0E5C429092E23014127C44B8]]></AD_ELEMENT_ID>
+<!--7B0DBFCC0E5C429092E23014127C44B8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7B0DBFCC0E5C429092E23014127C44B8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7B0DBFCC0E5C429092E23014127C44B8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7B0DBFCC0E5C429092E23014127C44B8-->  <COLUMNNAME><![CDATA[HTML_Template]]></COLUMNNAME>
+<!--7B0DBFCC0E5C429092E23014127C44B8-->  <NAME><![CDATA[HTML Template]]></NAME>
+<!--7B0DBFCC0E5C429092E23014127C44B8-->  <PRINTNAME><![CDATA[HTML Template]]></PRINTNAME>
+<!--7B0DBFCC0E5C429092E23014127C44B8-->  <DESCRIPTION><![CDATA[JRXML template to use for exporting the report to HTML format]]></DESCRIPTION>
+<!--7B0DBFCC0E5C429092E23014127C44B8-->  <HELP><![CDATA[JRXML template to use for exporting the report to HTML format]]></HELP>
+<!--7B0DBFCC0E5C429092E23014127C44B8-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--7B0DBFCC0E5C429092E23014127C44B8-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--7B0DBFCC0E5C429092E23014127C44B8--></AD_ELEMENT>
+
 <!--7F257DE6A0C847A8A121804BC5F9B7A8--><AD_ELEMENT>
 <!--7F257DE6A0C847A8A121804BC5F9B7A8-->  <AD_ELEMENT_ID><![CDATA[7F257DE6A0C847A8A121804BC5F9B7A8]]></AD_ELEMENT_ID>
 <!--7F257DE6A0C847A8A121804BC5F9B7A8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml	Wed Jan 25 05:32:50 2017 +0000
@@ -623,7 +623,7 @@
 <!--08AEFECA5A607AECE050007F0100529C-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--08AEFECA5A607AECE050007F0100529C-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--08AEFECA5A607AECE050007F0100529C-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--08AEFECA5A607AECE050007F0100529C-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--08AEFECA5A607AECE050007F0100529C-->  <STARTNEWLINE><![CDATA[Y]]></STARTNEWLINE>
 <!--08AEFECA5A607AECE050007F0100529C-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
 <!--08AEFECA5A607AECE050007F0100529C-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--08AEFECA5A607AECE050007F0100529C--></AD_FIELD>
@@ -2362,6 +2362,34 @@
 <!--2D7AB3C1F38B437A878AE286C3AF9D17-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--2D7AB3C1F38B437A878AE286C3AF9D17--></AD_FIELD>
 
+<!--2E33383FC304491FBBA8F4593AF9918C--><AD_FIELD>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <AD_FIELD_ID><![CDATA[2E33383FC304491FBBA8F4593AF9918C]]></AD_FIELD_ID>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <NAME><![CDATA[Allow Summary Functions]]></NAME>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <DESCRIPTION><![CDATA[If this flag is enabled then the user can add summary functions into the grid, by using the column header context menu. If not enabled, then the summary functions menu will not be available.]]></DESCRIPTION>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <HELP><![CDATA[If this flag is enabled then the user can add summary functions into the grid, by using the column header context menu. If not enabled, then the summary functions menu will not be available.]]></HELP>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <AD_TAB_ID><![CDATA[49B33DC2EDFD45A48EECE139AD5E9AC9]]></AD_TAB_ID>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <AD_COLUMN_ID><![CDATA[56C7AD9229D94A15A80AE69AB27D9AC7]]></AD_COLUMN_ID>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <SEQNO><![CDATA[140]]></SEQNO>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--2E33383FC304491FBBA8F4593AF9918C--></AD_FIELD>
+
 <!--2F84AAB44351416C8F48DC36CE6B9E58--><AD_FIELD>
 <!--2F84AAB44351416C8F48DC36CE6B9E58-->  <AD_FIELD_ID><![CDATA[2F84AAB44351416C8F48DC36CE6B9E58]]></AD_FIELD_ID>
 <!--2F84AAB44351416C8F48DC36CE6B9E58-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -5630,6 +5658,35 @@
 <!--961A9B93266A41F1BF3BAE222A7E07DB-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--961A9B93266A41F1BF3BAE222A7E07DB--></AD_FIELD>
 
+<!--964F43EDD5CC4EA092F49DEFE4C2E040--><AD_FIELD>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <AD_FIELD_ID><![CDATA[964F43EDD5CC4EA092F49DEFE4C2E040]]></AD_FIELD_ID>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <NAME><![CDATA[HTML Template]]></NAME>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <DESCRIPTION><![CDATA[JRXML template to use for exporting the report to HTML format]]></DESCRIPTION>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <HELP><![CDATA[JRXML template to use for exporting the report to HTML format]]></HELP>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <AD_TAB_ID><![CDATA[2B7B3CCDC940436F93437445AA7752F3]]></AD_TAB_ID>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <AD_COLUMN_ID><![CDATA[A215112D541C479796B314D93155993F]]></AD_COLUMN_ID>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <DISPLAYLOGIC><![CDATA[@USE_Pdf_As_Html_Template@='N']]></DISPLAYLOGIC>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <DISPLAYLENGTH><![CDATA[255]]></DISPLAYLENGTH>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <STARTNEWLINE><![CDATA[Y]]></STARTNEWLINE>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040--></AD_FIELD>
+
 <!--96B87B69B9C8458888D81C486932E9A9--><AD_FIELD>
 <!--96B87B69B9C8458888D81C486932E9A9-->  <AD_FIELD_ID><![CDATA[96B87B69B9C8458888D81C486932E9A9]]></AD_FIELD_ID>
 <!--96B87B69B9C8458888D81C486932E9A9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -6759,6 +6816,35 @@
 <!--C216C156DB954876BB6F0B830038E599-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--C216C156DB954876BB6F0B830038E599--></AD_FIELD>
 
+<!--C257145471DD451BA2F7E09F7B87B66A--><AD_FIELD>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <AD_FIELD_ID><![CDATA[C257145471DD451BA2F7E09F7B87B66A]]></AD_FIELD_ID>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <NAME><![CDATA[Use PDF as HTML Template]]></NAME>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <DESCRIPTION><![CDATA[Determines whether the PDF Template needs to be used to generate the HTML report instead of defining a specific template for it.]]></DESCRIPTION>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <HELP><![CDATA[Determines whether the PDF Template needs to be used to generate the HTML report instead of defining a specific template for it.]]></HELP>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <AD_TAB_ID><![CDATA[2B7B3CCDC940436F93437445AA7752F3]]></AD_TAB_ID>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <AD_COLUMN_ID><![CDATA[8BAD159F88D64983917E5D2D4DF400F7]]></AD_COLUMN_ID>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <DISPLAYLOGIC><![CDATA[@HTML_Template@='']]></DISPLAYLOGIC>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--C257145471DD451BA2F7E09F7B87B66A--></AD_FIELD>
+
 <!--C2B8716DE89B4A69BD3F0F77667A9938--><AD_FIELD>
 <!--C2B8716DE89B4A69BD3F0F77667A9938-->  <AD_FIELD_ID><![CDATA[C2B8716DE89B4A69BD3F0F77667A9938]]></AD_FIELD_ID>
 <!--C2B8716DE89B4A69BD3F0F77667A9938-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -7234,6 +7320,34 @@
 <!--CD0E9652F46441AA9A75A0A2FC467706-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--CD0E9652F46441AA9A75A0A2FC467706--></AD_FIELD>
 
+<!--CF40B74CE6A4408F8349E3709BD08D70--><AD_FIELD>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <AD_FIELD_ID><![CDATA[CF40B74CE6A4408F8349E3709BD08D70]]></AD_FIELD_ID>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <NAME><![CDATA[Allow Summary Functions]]></NAME>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <DESCRIPTION><![CDATA[If this flag is enabled then the user can add summary functions into the grid, by using the column header context menu. If not enabled, then the summary functions menu will not be available.]]></DESCRIPTION>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <HELP><![CDATA[If this flag is enabled then the user can add summary functions into the grid, by using the column header context menu. If not enabled, then the summary functions menu will not be available.]]></HELP>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <AD_TAB_ID><![CDATA[13FE911F7F684A47801DF55525BAD4A1]]></AD_TAB_ID>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <AD_COLUMN_ID><![CDATA[17BDFF7E011B456AA35E388543741F7C]]></AD_COLUMN_ID>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <SEQNO><![CDATA[130]]></SEQNO>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--CF40B74CE6A4408F8349E3709BD08D70--></AD_FIELD>
+
 <!--D31CFA8B415F48B79A7D939291850D7F--><AD_FIELD>
 <!--D31CFA8B415F48B79A7D939291850D7F-->  <AD_FIELD_ID><![CDATA[D31CFA8B415F48B79A7D939291850D7F]]></AD_FIELD_ID>
 <!--D31CFA8B415F48B79A7D939291850D7F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Wed Jan 25 05:32:50 2017 +0000
@@ -228,6 +228,18 @@
 <!--090A37D22ED3AFD5012ED3C5DE60001C-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--090A37D22ED3AFD5012ED3C5DE60001C--></AD_MESSAGE>
 
+<!--0BB85B43F187432F934B3A7AF6456685--><AD_MESSAGE>
+<!--0BB85B43F187432F934B3A7AF6456685-->  <AD_MESSAGE_ID><![CDATA[0BB85B43F187432F934B3A7AF6456685]]></AD_MESSAGE_ID>
+<!--0BB85B43F187432F934B3A7AF6456685-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0BB85B43F187432F934B3A7AF6456685-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0BB85B43F187432F934B3A7AF6456685-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0BB85B43F187432F934B3A7AF6456685-->  <VALUE><![CDATA[OBUIAPP_HTMLExport]]></VALUE>
+<!--0BB85B43F187432F934B3A7AF6456685-->  <MSGTEXT><![CDATA[View]]></MSGTEXT>
+<!--0BB85B43F187432F934B3A7AF6456685-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--0BB85B43F187432F934B3A7AF6456685-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--0BB85B43F187432F934B3A7AF6456685-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--0BB85B43F187432F934B3A7AF6456685--></AD_MESSAGE>
+
 <!--0BEB24CF954E410EAFE4EF198C38A902--><AD_MESSAGE>
 <!--0BEB24CF954E410EAFE4EF198C38A902-->  <AD_MESSAGE_ID><![CDATA[0BEB24CF954E410EAFE4EF198C38A902]]></AD_MESSAGE_ID>
 <!--0BEB24CF954E410EAFE4EF198C38A902-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -665,6 +677,18 @@
 <!--42B286FCB7054BD49A7FCDE676DB736A-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--42B286FCB7054BD49A7FCDE676DB736A--></AD_MESSAGE>
 
+<!--449C8BE622434987A5BF5CEEAD846E43--><AD_MESSAGE>
+<!--449C8BE622434987A5BF5CEEAD846E43-->  <AD_MESSAGE_ID><![CDATA[449C8BE622434987A5BF5CEEAD846E43]]></AD_MESSAGE_ID>
+<!--449C8BE622434987A5BF5CEEAD846E43-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--449C8BE622434987A5BF5CEEAD846E43-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--449C8BE622434987A5BF5CEEAD846E43-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--449C8BE622434987A5BF5CEEAD846E43-->  <VALUE><![CDATA[OBUIAPP_RM_OutOfRange_AUM]]></VALUE>
+<!--449C8BE622434987A5BF5CEEAD846E43-->  <MSGTEXT><![CDATA[Returning %0 %1, considering quantity returned in other RM Orders, Returned Qty exceeds the Quantity. Please enter a valid range: 0 - %2.]]></MSGTEXT>
+<!--449C8BE622434987A5BF5CEEAD846E43-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--449C8BE622434987A5BF5CEEAD846E43-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--449C8BE622434987A5BF5CEEAD846E43-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--449C8BE622434987A5BF5CEEAD846E43--></AD_MESSAGE>
+
 <!--48A6793A3C364216B184A33117EF7ED1--><AD_MESSAGE>
 <!--48A6793A3C364216B184A33117EF7ED1-->  <AD_MESSAGE_ID><![CDATA[48A6793A3C364216B184A33117EF7ED1]]></AD_MESSAGE_ID>
 <!--48A6793A3C364216B184A33117EF7ED1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1135,6 +1159,18 @@
 <!--7E8A12D43C0D404F868CE36DB349C9FC-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--7E8A12D43C0D404F868CE36DB349C9FC--></AD_MESSAGE>
 
+<!--7F4934C893024B329C8A230264C0D603--><AD_MESSAGE>
+<!--7F4934C893024B329C8A230264C0D603-->  <AD_MESSAGE_ID><![CDATA[7F4934C893024B329C8A230264C0D603]]></AD_MESSAGE_ID>
+<!--7F4934C893024B329C8A230264C0D603-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7F4934C893024B329C8A230264C0D603-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7F4934C893024B329C8A230264C0D603-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7F4934C893024B329C8A230264C0D603-->  <VALUE><![CDATA[OBUIAPP_Filter_By_Column]]></VALUE>
+<!--7F4934C893024B329C8A230264C0D603-->  <MSGTEXT><![CDATA[Filter by %0]]></MSGTEXT>
+<!--7F4934C893024B329C8A230264C0D603-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--7F4934C893024B329C8A230264C0D603-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--7F4934C893024B329C8A230264C0D603-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--7F4934C893024B329C8A230264C0D603--></AD_MESSAGE>
+
 <!--80A295E6A2EE4213BD9D975158749977--><AD_MESSAGE>
 <!--80A295E6A2EE4213BD9D975158749977-->  <AD_MESSAGE_ID><![CDATA[80A295E6A2EE4213BD9D975158749977]]></AD_MESSAGE_ID>
 <!--80A295E6A2EE4213BD9D975158749977-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1406,7 +1442,7 @@
 <!--A497EC573BCE49F093FFA012620BD082-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A497EC573BCE49F093FFA012620BD082-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A497EC573BCE49F093FFA012620BD082-->  <VALUE><![CDATA[OBUIAPP_REPORT_TMP_CHK]]></VALUE>
-<!--A497EC573BCE49F093FFA012620BD082-->  <MSGTEXT><![CDATA[You have to define at least one of PDF Template or XLS Template fields.]]></MSGTEXT>
+<!--A497EC573BCE49F093FFA012620BD082-->  <MSGTEXT><![CDATA[You have to define at least one of PDF Template or XLS Template or HTML Template fields.]]></MSGTEXT>
 <!--A497EC573BCE49F093FFA012620BD082-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
 <!--A497EC573BCE49F093FFA012620BD082-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--A497EC573BCE49F093FFA012620BD082-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
@@ -1821,6 +1857,18 @@
 <!--D71BBF4693BD45329F17355A907B9D39-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--D71BBF4693BD45329F17355A907B9D39--></AD_MESSAGE>
 
+<!--D779698DB3A6486B801ED22037369E18--><AD_MESSAGE>
+<!--D779698DB3A6486B801ED22037369E18-->  <AD_MESSAGE_ID><![CDATA[D779698DB3A6486B801ED22037369E18]]></AD_MESSAGE_ID>
+<!--D779698DB3A6486B801ED22037369E18-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D779698DB3A6486B801ED22037369E18-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D779698DB3A6486B801ED22037369E18-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D779698DB3A6486B801ED22037369E18-->  <VALUE><![CDATA[OBUIAPP_RM_TooMuchShippedInUomManagement]]></VALUE>
+<!--D779698DB3A6486B801ED22037369E18-->  <MSGTEXT><![CDATA[The sum of the Ship Qty exceeds the Pending Qty for that particular RM Order No. and Line No.]]></MSGTEXT>
+<!--D779698DB3A6486B801ED22037369E18-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--D779698DB3A6486B801ED22037369E18-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--D779698DB3A6486B801ED22037369E18-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--D779698DB3A6486B801ED22037369E18--></AD_MESSAGE>
+
 <!--DAC8C406FB1D497CAF91619E6B8A5458--><AD_MESSAGE>
 <!--DAC8C406FB1D497CAF91619E6B8A5458-->  <AD_MESSAGE_ID><![CDATA[DAC8C406FB1D497CAF91619E6B8A5458]]></AD_MESSAGE_ID>
 <!--DAC8C406FB1D497CAF91619E6B8A5458-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.31055]]></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[PR16Q4.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	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.31055]]></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.30447]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.31055]]></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.30447]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.31055]]></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.30447]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.31055]]></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-db/database/sourcedata/AD_REF_LIST.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REF_LIST.xml	Wed Jan 25 05:32:50 2017 +0000
@@ -140,6 +140,18 @@
 <!--4C0466BB94BD413BB8D523C3FADB4E4C-->  <SEQNO><![CDATA[60]]></SEQNO>
 <!--4C0466BB94BD413BB8D523C3FADB4E4C--></AD_REF_LIST>
 
+<!--557BFB777B164892BB8BC97772EEA71A--><AD_REF_LIST>
+<!--557BFB777B164892BB8BC97772EEA71A-->  <AD_REF_LIST_ID><![CDATA[557BFB777B164892BB8BC97772EEA71A]]></AD_REF_LIST_ID>
+<!--557BFB777B164892BB8BC97772EEA71A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--557BFB777B164892BB8BC97772EEA71A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--557BFB777B164892BB8BC97772EEA71A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--557BFB777B164892BB8BC97772EEA71A-->  <VALUE><![CDATA[OBUIAPP_DisableLinkedItemsSection]]></VALUE>
+<!--557BFB777B164892BB8BC97772EEA71A-->  <NAME><![CDATA[Disable Linked Items Section]]></NAME>
+<!--557BFB777B164892BB8BC97772EEA71A-->  <DESCRIPTION><![CDATA[This property allows to disable the Linked Items section]]></DESCRIPTION>
+<!--557BFB777B164892BB8BC97772EEA71A-->  <AD_REFERENCE_ID><![CDATA[A26BA480E2014707B47257024C3CBFF7]]></AD_REFERENCE_ID>
+<!--557BFB777B164892BB8BC97772EEA71A-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--557BFB777B164892BB8BC97772EEA71A--></AD_REF_LIST>
+
 <!--57A4B4D636954DF88444CAD72B20598B--><AD_REF_LIST>
 <!--57A4B4D636954DF88444CAD72B20598B-->  <AD_REF_LIST_ID><![CDATA[57A4B4D636954DF88444CAD72B20598B]]></AD_REF_LIST_ID>
 <!--57A4B4D636954DF88444CAD72B20598B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/DisplayLogicAtServerLevelTest.java	Wed Jan 25 05:32:50 2017 +0000
@@ -0,0 +1,163 @@
+/*
+ *************************************************************************
+ * 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) 2016 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+ */
+
+package org.openbravo.client.application.test;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertThat;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.openbravo.base.weld.test.WeldBaseTest;
+import org.openbravo.client.application.CachedPreference;
+import org.openbravo.client.application.DynamicExpressionParser;
+import org.openbravo.client.application.window.OBViewFieldHandler;
+import org.openbravo.client.application.window.OBViewFieldHandler.OBViewField;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.model.ad.ui.Tab;
+
+/**
+ * 
+ * This class is used to test the correct behavior of the Display Logic Evaluated at Server Level
+ * functionality
+ *
+ */
+public class DisplayLogicAtServerLevelTest extends WeldBaseTest {
+  private CachedPreference cachedPreference;
+  private Tab tab;
+  private OBViewField field;
+
+  /**
+   * Initializes the global variables for the rest of the tests
+   */
+  @Before
+  public void initializeTest() {
+    setSystemAdministratorContext();
+
+    cachedPreference = org.openbravo.base.weld.WeldUtils
+        .getInstanceFromStaticBeanManager(CachedPreference.class);
+    tab = OBDal.getInstance().get(Tab.class, "270");
+
+    OBViewFieldHandler handler = new OBViewFieldHandler();
+    handler.setTab(tab);
+    field = handler.new OBViewField();
+  }
+
+  /**
+   * Tests that the replacement of the DisplayLogic at Server level works correctly
+   */
+  @Test
+  public void replaceSystemPreferencesInDisplayLogic() {
+    cachedPreference.addCachedPreference("enableNegativeStockCorrections");
+    cachedPreference.setPreferenceValue("enableNegativeStockCorrections", "Y");
+    cachedPreference.addCachedPreference("uomManagement");
+    cachedPreference.setPreferenceValue("uomManagement", "Y");
+
+    String displayLogicEvaluatedInServerExpression = "@uomManagement@ = 'Y' & @enableNegativeStockCorrections@ = 'Y'";
+    String expectedTranslatedDisplayLogic = "'Y' = 'Y' & 'Y' = 'Y'";
+
+    testTranslationOfDisplayLogic(displayLogicEvaluatedInServerExpression,
+        expectedTranslatedDisplayLogic);
+  }
+
+  /**
+   * Tests that the replacement of the DisplayLogic at Server level works correctly containing null
+   * values
+   */
+  @Test
+  public void replaceSystemPreferencesInDisplayLogicWithNullValue() {
+    cachedPreference.addCachedPreference("enableNegativeStockCorrections");
+    cachedPreference.setPreferenceValue("enableNegativeStockCorrections", "Y");
+
+    String displayLogicEvaluatedInServerExpression = "@uomManagement@ = 'Y' & @enableNegativeStockCorrections@ = 'N'";
+    String expectedTranslatedDisplayLogic = "'null' = 'Y' & 'Y' = 'N'";
+
+    testTranslationOfDisplayLogic(displayLogicEvaluatedInServerExpression,
+        expectedTranslatedDisplayLogic);
+  }
+
+  /**
+   * Tests that the evaluation of the DisplayLogic at Server level works correctly
+   */
+  @Test
+  public void evaluatePreferencesInDisplayLogic() {
+    cachedPreference.addCachedPreference("enableNegativeStockCorrections");
+    cachedPreference.setPreferenceValue("enableNegativeStockCorrections", "Y");
+    cachedPreference.addCachedPreference("uomManagement");
+    cachedPreference.setPreferenceValue("uomManagement", "Y");
+
+    String displayLogicEvaluatedInServerExpression = "@uomManagement@ = 'Y' & @enableNegativeStockCorrections@ = 'Y'";
+
+    boolean expectedEvaluatedDisplayLogic = true;
+
+    testEvaluationOfDisplayLogic(displayLogicEvaluatedInServerExpression,
+        expectedEvaluatedDisplayLogic);
+  }
+
+  /**
+   * Tests that the evaluation of the DisplayLogic at Server level works correctly containing null
+   * values
+   */
+  @Test
+  public void evaluatePreferencesInDisplayLogicWithNullValue() {
+    cachedPreference.addCachedPreference("enableNegativeStockCorrections");
+    cachedPreference.setPreferenceValue("enableNegativeStockCorrections", "N");
+
+    String displayLogicEvaluatedInServerExpression = "@uomManagement@ = 'Y' & @enableNegativeStockCorrections@ = 'Y'";
+
+    boolean expectedEvaluatedDisplayLogic = false;
+
+    testEvaluationOfDisplayLogic(displayLogicEvaluatedInServerExpression,
+        expectedEvaluatedDisplayLogic);
+  }
+
+  private void testTranslationOfDisplayLogic(String displayLogicEvaluatedInServerExpression,
+      String expectedTranslatedDisplayLogic) {
+    String translatedDisplayLogic = DynamicExpressionParser
+        .replaceSystemPreferencesInDisplayLogic(displayLogicEvaluatedInServerExpression);
+
+    assertThat(
+        "The translation from the Display Logic Evaluated at Server Level expression was different than expected: ",
+        translatedDisplayLogic, equalTo(expectedTranslatedDisplayLogic));
+  }
+
+  private void testEvaluationOfDisplayLogic(String displayLogicEvaluatedInServerExpression,
+      boolean expectedEvaluatedDisplayLogic) {
+    Class<?> clazz = field.getClass();
+    Method evaluateDisplayLogicAtServerLevel;
+    try {
+      evaluateDisplayLogicAtServerLevel = clazz
+          .getDeclaredMethod("evaluateDisplayLogicAtServerLevel", String.class, String.class);
+      boolean originallyAccessible = evaluateDisplayLogicAtServerLevel.isAccessible();
+      evaluateDisplayLogicAtServerLevel.setAccessible(true);
+      boolean evaluatedDisplayLogic = (boolean) evaluateDisplayLogicAtServerLevel.invoke(field,
+          displayLogicEvaluatedInServerExpression, "0");
+      evaluateDisplayLogicAtServerLevel.setAccessible(originallyAccessible);
+      assertThat(
+          "The result of the evaluation of the Display Logic Evaluated at Server Level expression was different than expected: ",
+          evaluatedDisplayLogic, equalTo(expectedEvaluatedDisplayLogic));
+    } catch (NoSuchMethodException | SecurityException | IllegalAccessException
+        | IllegalArgumentException | InvocationTargetException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java	Wed Jan 25 05:32:50 2017 +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-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -317,6 +317,9 @@
     // Good Movement of reserved stock
     globalResources.add(createStaticResource(
         "web/org.openbravo.client.application/js/materialmgmt/ob-reservedGoodMovement.js", false));
+    // Procurement
+    globalResources.add(createStaticResource(
+        "web/org.openbravo.client.application/js/procurement/ob-procurement.js", false));
 
     // Styling
     globalResources.add(createStyleSheetResource(
@@ -483,7 +486,7 @@
     globalResources.add(createStaticResource("web/js/productServices.js", true));
 
     // Cancel and Replace
-    globalResources.add(createStaticResource("web/js/cancelAndReplace.js", false));
+    globalResources.add(createStaticResource("web/js/cancelAndReplace.js", true));
 
     return globalResources;
   }
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationConstants.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationConstants.java	Wed Jan 25 05:32:50 2017 +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-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -65,6 +65,8 @@
   public static final String TABLEBASEDTABLE = "Table";
   public static final String HQLBASEDTABLE = "HQL";
 
+  public static final String REPORT_UI_PATTERN = "OBUIAPP_Report";
+
   static {
     try {
       ACTION_RESULT_SUCCESS = new JSONObject("{result: 'success'}");
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/CachedPreference.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/CachedPreference.java	Wed Jan 25 05:32:50 2017 +0000
@@ -18,13 +18,14 @@
  */
 package org.openbravo.client.application;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.SessionScoped;
 
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
@@ -36,31 +37,26 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * This class is used as a singleton to keep the value of some preferences in cache during the
- * application life cycle, avoiding the time spent to compute the preference value. The preference
- * values that can be cached by this class are those defined at System level.
- * 
- * This class it is also used by the
- * {@link org.openbravo.client.application.event.PreferenceEventHandler} class to detect changes in
- * the cached preferences values, and it that case it invalidates the stored value. This way the
- * next time it is requested, the current value will be retrieved from database again.
- * 
- * This mechanism for automatic refresh the preference value, only works on environments with a
- * single JVM. In case of Tomcat clustering environments (multiple JVM) it will be necessary to
- * restart Tomcat to retrieve the new value of the preference in every JVM.
+ * This class is used to keep the value of some preferences in cache during the life cycle of a
+ * session, avoiding the time spent to compute the preference value. The preference values that can
+ * be cached by this class are those defined at System level.
  * 
  */
-@ApplicationScoped
-public class CachedPreference {
+@SessionScoped
+public class CachedPreference implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+  private static final Logger log = LoggerFactory.getLogger(CachedPreference.class);
+
   public static final String ALLOW_UNPAGED_DS_MANUAL_REQUEST = "OBJSON_AllowUnpagedDatasourceManualRequest";
   public static final String ALLOW_UNSECURED_DS_REQUEST = "OBSERDS_AllowUnsecuredDatasourceRequest";
   public static final String ALLOW_WHERE_PARAMETER = "OBSERDS_AllowWhereParameter";
   public static final String RESTRICT_ERP_ACCESS_IN_STORE_SERVER = "RestrictErpAccessInStoreServer";
 
-  private static final Logger log = LoggerFactory.getLogger(CachedPreference.class);
   private List<String> propertyList = new ArrayList<String>(Arrays.asList(
-      ALLOW_UNPAGED_DS_MANUAL_REQUEST, ALLOW_UNSECURED_DS_REQUEST, ALLOW_WHERE_PARAMETER, RESTRICT_ERP_ACCESS_IN_STORE_SERVER));
-  private Map<String, String> cachedPreference = new HashMap<String, String>();
+      ALLOW_UNPAGED_DS_MANUAL_REQUEST, ALLOW_UNSECURED_DS_REQUEST, ALLOW_WHERE_PARAMETER,
+      RESTRICT_ERP_ACCESS_IN_STORE_SERVER));
+  private transient Map<String, String> cachedPreference;
 
   /**
    * It returns a String with the value of the preference whose related property name is entered as
@@ -74,6 +70,9 @@
    */
   public String getPreferenceValue(String propertyName) {
     long t = System.nanoTime();
+    if (cachedPreference == null) {
+      cachedPreference = new HashMap<String, String>();
+    }
     if (!cachedPreference.containsKey(propertyName)) {
       try {
         OBContext.setAdminMode(false);
@@ -94,6 +93,19 @@
   }
 
   /**
+   * Return the Preference value and store it into the cached variable
+   * 
+   * @param propertyName
+   *          The name of the property related to the preference
+   * @return The preference value of the propertyName given
+   */
+  public String getPreferenceValueAndStoreInCache(String propertyName) {
+    String result = getPreferenceValue(propertyName);
+    addCachedPreference(propertyName);
+    return result;
+  }
+
+  /**
    * Checks if the preference related to the property name entered as parameter is contained in the
    * list of cached preferences.
    * 
@@ -116,7 +128,10 @@
    *          String with the value assigned to the preference
    */
   public synchronized void setPreferenceValue(String propertyName, String preferenceValue) {
-    this.cachedPreference.put(propertyName, preferenceValue);
+    if (cachedPreference == null) {
+      cachedPreference = new HashMap<String, String>();
+    }
+    cachedPreference.put(propertyName, preferenceValue);
   }
 
   /**
@@ -127,7 +142,9 @@
    *          The name of the property related to the preference
    */
   public synchronized void invalidatePreferenceValue(String propertyName) {
-    this.cachedPreference.remove(propertyName);
+    if (cachedPreference != null) {
+      cachedPreference.remove(propertyName);
+    }
   }
 
   /**
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java	Wed Jan 25 05:32:50 2017 +0000
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2011-2014 Openbravo SLU
+ * All portions are Copyright (C) 2011-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -83,6 +83,8 @@
 
   private ApplicationDictionaryCachedStructures cachedStructures;
 
+  public static final String REPLACE_DISPLAY_LOGIC_SERVER_PATTERN = "@(.*?)@";
+
   public DynamicExpressionParser(String code, Process process, boolean parameterDisplayLogic) {
     this.code = code;
     this.process = process;
@@ -440,6 +442,27 @@
         isBoolean);
   }
 
+  /**
+   * Given the Display logic expression, it replaces the preferences properties with its values
+   * 
+   * @param displayLogic
+   *          DisplayLogic to be replaced
+   * @return Returns the Display logic expression with the properties replaced
+   */
+  public static String replaceSystemPreferencesInDisplayLogic(String displayLogic) {
+    String result = displayLogic;
+    CachedPreference cachedPreference = org.openbravo.base.weld.WeldUtils
+        .getInstanceFromStaticBeanManager(CachedPreference.class);
+
+    Pattern pattern = Pattern.compile(REPLACE_DISPLAY_LOGIC_SERVER_PATTERN);
+    Matcher matcher = pattern.matcher(displayLogic);
+    while (matcher.find()) {
+      result = result.replaceAll("@" + matcher.group(1) + "@",
+          "'" + cachedPreference.getPreferenceValueAndStoreInCache(matcher.group(1)) + "'");
+    }
+    return result;
+  }
+
   private Field lookForFieldInAncestorTabs(String fieldName) {
     Field aField = null;
     Tab parentTab = KernelUtils.getInstance().getParentTab(tab);
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/GlobalMenu.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/GlobalMenu.java	Wed Jan 25 05:32:50 2017 +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 Openbravo SLU
+ * All portions are Copyright (C) 2013-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -155,7 +155,7 @@
   }
 
   /**
-   * Each menu option is configured with additional paramters
+   * Each menu option is configured with additional parameters
    * 
    */
   private void linkMenus(List<Menu> menus, List<MenuOption> menuOptions, String language) {
@@ -236,6 +236,10 @@
               && menu.getOBUIAPPProcessDefinition().isActive()) {
             foundOption.setType(MenuEntryType.ProcessDefinition);
             foundOption.setObjectId(menu.getOBUIAPPProcessDefinition().getId());
+            if (ApplicationConstants.REPORT_UI_PATTERN.equals(menu.getOBUIAPPProcessDefinition()
+                .getUIPattern())) {
+              foundOption.setReport(true);
+            }
           } else if (menu.getWindow() != null && menu.getWindow().isActive()) {
             boolean found = false;
             for (Tab tab : menu.getWindow().getADTabList()) {
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/HeartBeatPopupActionHandler.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/HeartBeatPopupActionHandler.java	Wed Jan 25 05:32:50 2017 +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-2012 Openbravo SLU 
+ * All portions are Copyright (C) 2009-2016 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -63,8 +63,8 @@
       boolean sysAdmin = false;
       boolean isUpgrading = false;
       try {
-        isUpgrading = "Y".equals(Preferences.getPreferenceValue("isUpgrading", true, "0", "0",
-            null, null, null));
+        isUpgrading = Preferences.YES.equals(Preferences.getPreferenceValue("isUpgrading", true,
+            "0", "0", null, null, null));
       } catch (PropertyException e) {
         isUpgrading = false;
       }
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ViewComponent.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ViewComponent.java	Wed Jan 25 05:32:50 2017 +0000
@@ -18,8 +18,13 @@
  */
 package org.openbravo.client.application;
 
+import java.util.Calendar;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
@@ -27,6 +32,7 @@
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang.StringUtils;
 import org.hibernate.Query;
+import org.hibernate.Session;
 import org.hibernate.criterion.Restrictions;
 import org.openbravo.base.exception.OBException;
 import org.openbravo.base.util.OBClassLoader;
@@ -301,10 +307,77 @@
         viewVersions += t.getTable().isFullyAudited() + "|";
       }
       viewVersions += getLastGridConfigurationChange(window) + "|";
+      viewVersions += getLastSystemPrefrenceChage(window) + "|";
       viewVersionHash = DigestUtils.md5Hex(viewVersions);
     } finally {
       OBContext.restorePreviousMode();
     }
     return viewVersionHash;
   }
+
+  private String getLastSystemPrefrenceChage(Window window) {
+    Date lastModification = new Date(0);
+
+    Set<String> preferences = new HashSet<String>();
+
+    Pattern p = Pattern.compile(DynamicExpressionParser.REPLACE_DISPLAY_LOGIC_SERVER_PATTERN);
+    for (String displayLogic : getFieldsWithDisplayLogicAtServerLevel(window.getId())) {
+      Matcher m = p.matcher(displayLogic);
+      while (m.find()) {
+        preferences.add(m.group(1));
+      }
+    }
+
+    Calendar cal = Calendar.getInstance();
+    cal.set(9999, 9, 9);
+    Date updated = new Date(cal.getTimeInMillis());
+    if (!preferences.isEmpty()) {
+      updated = getLastUpdated(preferences, updated);
+    }
+    if (lastModification.compareTo(updated) < 0) {
+      lastModification = updated;
+    }
+
+    return lastModification.toString();
+  }
+
+  @SuppressWarnings("unchecked")
+  private List<String> getFieldsWithDisplayLogicAtServerLevel(String windowID) {
+    StringBuilder where = new StringBuilder();
+    where.append(" select displayLogicEvaluatedInTheServer");
+    where.append(" from ADField as f");
+    where.append(" where f.displayLogicEvaluatedInTheServer is not null");
+    where.append(" and f.tab.id in (select t.id");
+    where.append("                  from ADTab t");
+    where.append("                  where t.window.id = :windowId)");
+
+    Session session = OBDal.getInstance().getSession();
+    Query query = session.createQuery(where.toString());
+    query.setParameter("windowId", windowID);
+
+    return (List<String>) query.list();
+  }
+
+  private Date getLastUpdated(Set<String> preferenceSet, Date lastUpdatedParam) {
+
+    StringBuilder where = new StringBuilder();
+    where.append(" select max(p.updated)");
+    where.append(" from ADPreference p");
+    where.append(" where p.propertyList = true");
+    where.append(" and p.property in :properties");
+    where.append(" and p.client.id = '0'");
+    where.append(" and p.organization = '0'");
+    where.append(" and coalesce(p.visibleAtClient, '0') = '0'");
+    where.append(" and coalesce(p.visibleAtOrganization, '0') = '0'");
+
+    Session session = OBDal.getInstance().getSession();
+    Query query = session.createQuery(where.toString());
+    query.setParameterList("properties", preferenceSet);
+    Date lastUpdated = (Date) query.uniqueResult();
+    if (lastUpdated == null) {
+      lastUpdated = lastUpdatedParam;
+    }
+    return lastUpdated;
+
+  }
 }
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/WindowSettingsActionHandler.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/WindowSettingsActionHandler.java	Wed Jan 25 05:32:50 2017 +0000
@@ -11,7 +11,7 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2011-2015 Openbravo SLU 
+ * All portions are Copyright (C) 2011-2016 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -99,7 +99,7 @@
       final String autoSaveStr = Preferences.getPreferenceValue("Autosave", false, OBContext
           .getOBContext().getCurrentClient(), OBContext.getOBContext().getCurrentOrganization(),
           OBContext.getOBContext().getUser(), OBContext.getOBContext().getRole(), window);
-      json.put("autoSave", "Y".equals(autoSaveStr));
+      json.put("autoSave", Preferences.YES.equals(autoSaveStr));
 
       try {
         json.put("personalization", personalizationHandler.getPersonalizationForWindow(window));
@@ -112,7 +112,7 @@
           false, OBContext.getOBContext().getCurrentClient(), OBContext.getOBContext()
               .getCurrentOrganization(), OBContext.getOBContext().getUser(), OBContext
               .getOBContext().getRole(), window);
-      json.put("showAutoSaveConfirmation", "Y".equals(showConfirmationStr));
+      json.put("showAutoSaveConfirmation", Preferences.YES.equals(showConfirmationStr));
 
       // Field Level Roles
       final JSONArray tabs = new JSONArray();
@@ -164,8 +164,8 @@
       // - None of the above: permission is inherited from window
       boolean securedProcess = false;
       try {
-        securedProcess = "Y".equals(Preferences.getPreferenceValue("SecuredProcess", true,
-            OBContext.getOBContext().getCurrentClient(), OBContext.getOBContext()
+        securedProcess = Preferences.YES.equals(Preferences.getPreferenceValue("SecuredProcess",
+            true, OBContext.getOBContext().getCurrentClient(), OBContext.getOBContext()
                 .getCurrentOrganization(), OBContext.getOBContext().getUser(), OBContext
                 .getOBContext().getRole(), window));
       } catch (PropertyException e) {
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachImplementationManager.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachImplementationManager.java	Wed Jan 25 05:32:50 2017 +0000
@@ -92,6 +92,9 @@
   @Inject
   private ApplicationDictionaryCachedStructures adcs;
 
+  private static final int DATA_TYPE_MAX_LENGTH = ModelProvider.getInstance()
+      .getEntity(Attachment.class).getProperty(Attachment.PROPERTY_DATATYPE).getFieldLength();
+
   /**
    * Method to upload files. This method calls needed handler class
    * 
@@ -152,7 +155,10 @@
         strDataType = new Tika().detect(file);
       } catch (IOException ignore) {
       }
-      attachment.setDataType(strDataType);
+
+      if (strDataType != null && strDataType.length() <= DATA_TYPE_MAX_LENGTH) {
+        attachment.setDataType(strDataType);
+      }
 
       OBDal.getInstance().save(attachment);
 
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/CoreAttachImplementation.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/CoreAttachImplementation.java	Wed Jan 25 05:32:50 2017 +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-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -148,7 +148,7 @@
       saveAttachmentsOldWay = "N";
     }
 
-    if ("Y".equals(saveAttachmentsOldWay)) {
+    if (Preferences.YES.equals(saveAttachmentsOldWay)) {
       return fileFolderPath;
     } else {
       fileFolderPath = tableID + "/" + splitPath(recordID);
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/CloneOrderActionHandler.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/CloneOrderActionHandler.java	Wed Jan 25 05:32:50 2017 +0000
@@ -28,11 +28,13 @@
 import org.codehaus.jettison.json.JSONObject;
 import org.hibernate.Query;
 import org.openbravo.base.exception.OBException;
+import org.openbravo.base.weld.WeldUtils;
 import org.openbravo.client.kernel.BaseActionHandler;
 import org.openbravo.dal.core.DalUtil;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.dal.service.OBQuery;
+import org.openbravo.erpCommon.businessUtility.CloneOrderHookCaller;
 import org.openbravo.model.ad.access.User;
 import org.openbravo.model.common.order.Order;
 import org.openbravo.model.common.order.OrderLine;
@@ -89,6 +91,10 @@
       objCloneOrder.setGrandTotalAmount(BigDecimal.ZERO);
       objCloneOrder.setSummedLineAmount(BigDecimal.ZERO);
 
+      // Calling Clone Order Hook
+      WeldUtils.getInstanceFromStaticBeanManager(CloneOrderHookCaller.class).executeHook(
+          objCloneOrder);
+
       // save the cloned order object
       OBDal.getInstance().save(objCloneOrder);
 
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/NoteEventHandler.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/NoteEventHandler.java	Wed Jan 25 05:32:50 2017 +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 Openbravo SLU 
+ * All portions are Copyright (C) 2013-2016 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -56,24 +56,21 @@
     return entities;
   }
 
-  public void onUpdate(@Observes
-  EntityUpdateEvent event) {
+  public void onUpdate(@Observes EntityUpdateEvent event) {
     if (!isValidEvent(event)) {
       return;
     }
     isReadOnly();
   }
 
-  public void onNew(@Observes
-  EntityNewEvent event) {
+  public void onNew(@Observes EntityNewEvent event) {
     if (!isValidEvent(event)) {
       return;
     }
     isReadOnly();
   }
 
-  public void onDelete(@Observes
-  EntityDeleteEvent event) {
+  public void onDelete(@Observes EntityDeleteEvent event) {
     if (!isValidEvent(event)) {
       return;
     }
@@ -99,7 +96,7 @@
         disableNotesForReadOnly = "N";
       }
 
-      if ("Y".equals(disableNotesForReadOnly)) {
+      if (Preferences.YES.equals(disableNotesForReadOnly)) {
         tabId = RequestContext.get().getRequestParameter("tabId");
         roleId = OBContext.getOBContext().getRole().getId();
 
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/PreferenceEventHandler.java	Tue Jan 24 05:37:19 2017 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +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) 2015-2016 Openbravo SLU
- * All Rights Reserved.
- * Contributor(s):  ______________________________________.
- ************************************************************************
- */
-
-package org.openbravo.client.application.event;
-
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
-
-import org.apache.log4j.Logger;
-import org.openbravo.base.model.Entity;
-import org.openbravo.base.model.ModelProvider;
-import org.openbravo.client.application.CachedPreference;
-import org.openbravo.client.kernel.event.EntityDeleteEvent;
-import org.openbravo.client.kernel.event.EntityNewEvent;
-import org.openbravo.client.kernel.event.EntityPersistenceEventObserver;
-import org.openbravo.client.kernel.event.EntityUpdateEvent;
-import org.openbravo.model.ad.domain.Preference;
-
-/**
- * Listens to delete, update and save events for the {@link Preference} entity. If it detects a
- * change in any of the cached preferences it invalidates its cached value.
- */
-public class PreferenceEventHandler extends EntityPersistenceEventObserver {
-
-  private static Entity[] entities = { ModelProvider.getInstance()
-      .getEntity(Preference.ENTITY_NAME) };
-  protected Logger logger = Logger.getLogger(this.getClass());
-  @Inject
-  private CachedPreference cachedPreference;
-
-  @Override
-  protected Entity[] getObservedEntities() {
-    return entities;
-  }
-
-  public void onSave(@Observes EntityNewEvent event) {
-    if (!isValidEvent(event)) {
-      return;
-    }
-    final Preference preference = (Preference) event.getTargetInstance();
-    invalidateCachedPreferenceValue(preference.getProperty());
-  }
-
-  public void onUpdate(@Observes EntityUpdateEvent event) {
-    if (!isValidEvent(event)) {
-      return;
-    }
-    final Preference preference = (Preference) event.getTargetInstance();
-    invalidateCachedPreferenceValue(preference.getProperty());
-  }
-
-  public void onDelete(@Observes EntityDeleteEvent event) {
-    if (!isValidEvent(event)) {
-      return;
-    }
-    final Preference preference = (Preference) event.getTargetInstance();
-    invalidateCachedPreferenceValue(preference.getProperty());
-  }
-
-  private void invalidateCachedPreferenceValue(String property) {
-    if (cachedPreference.isCachedPreference(property)) {
-      cachedPreference.invalidatePreferenceValue(property);
-    }
-  }
-}
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickLaunchDataSource.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickLaunchDataSource.java	Wed Jan 25 05:32:50 2017 +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-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -121,7 +121,7 @@
         } else if (menuOption.isForm()) {
           data.put(OPTION_TYPE, OPTION_TYPE_URL);
           data.put(FORM_ID, menuOption.getFormId());
-        } else if (menuOption.isReport()) {
+        } else if (menuOption.isReport() && !menuOption.isProcessDefinition()) {
           data.put(OPTION_TYPE, OPTION_TYPE_URL);
           data.put(PROCESS_ID, menuOption.getMenu().getProcess().getId());
         } else if (menuOption.isProcessDefinition()) {
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/application-menu.js.ftl	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/application-menu.js.ftl	Wed Jan 25 05:32:50 2017 +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-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -45,7 +45,7 @@
         , type: 'processManual'
         , manualUrl: '${menuOption.id?js_string}'
         , manualProcessId: '${menuOption.menu.process.id}'
-    <#elseif menuOption.report>
+    <#elseif menuOption.report && !menuOption.processDefinition>
         , type: 'report'
         , manualUrl: '${menuOption.id?js_string}'
         , manualProcessId: '${menuOption.menu.process.id}'
@@ -64,6 +64,7 @@
     <#elseif menuOption.processDefinition>
         , type: 'processDefinition'
         , viewId: 'processDefinition_${menuOption.menu.oBUIAPPProcessDefinition.id}'
+        , uiPattern: '${menuOption.menu.oBUIAPPProcessDefinition.uIPattern?js_string}'
     </#if>
     , singleRecord: ${menuOption.singleRecordStringValue}
     , readOnly: ${menuOption.readOnlyStringValue}
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java	Wed Jan 25 05:32:50 2017 +0000
@@ -178,8 +178,8 @@
 
       if (!checkPermission) {
         try {
-          checkPermission = "Y".equals(Preferences.getPreferenceValue("SecuredProcess", true,
-              OBContext.getOBContext().getCurrentClient(), OBContext.getOBContext()
+          checkPermission = Preferences.YES.equals(Preferences.getPreferenceValue("SecuredProcess",
+              true, OBContext.getOBContext().getCurrentClient(), OBContext.getOBContext()
                   .getCurrentOrganization(), OBContext.getOBContext().getUser(), OBContext
                   .getOBContext().getRole(), window));
         } catch (PropertyException e) {
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/report/BaseReportActionHandler.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/report/BaseReportActionHandler.java	Wed Jan 25 05:32:50 2017 +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-2015 Openbravo SLU 
+ * All portions are Copyright (C) 2014-2016 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -38,6 +38,7 @@
 import org.codehaus.jettison.json.JSONArray;
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
+import org.openbravo.base.HttpBaseUtils;
 import org.openbravo.base.exception.OBException;
 import org.openbravo.base.model.Entity;
 import org.openbravo.base.model.ModelProvider;
@@ -62,24 +63,28 @@
 import org.openbravo.client.kernel.reference.UIDefinitionController;
 import org.openbravo.dal.core.DalContextListener;
 import org.openbravo.dal.service.OBDal;
+import org.openbravo.database.ConnectionProvider;
 import org.openbravo.erpCommon.utility.OBMessageUtils;
 import org.openbravo.userinterface.selector.reference.FKMultiSelectorUIDefinition;
 import org.openbravo.utils.FileUtility;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import net.sf.jasperreports.engine.JRDataSource;
+
 /**
- * Action Handler used as base for jasper reports generated from process defition. This handler can
- * be extended to customize its behavior.
+ * Action Handler used as base for jasper reports generated from process definition. This handler
+ * can be extended to customize its behavior.
  * 
  */
 public class BaseReportActionHandler extends BaseProcessActionHandler {
   private static final Logger log = LoggerFactory.getLogger(BaseReportActionHandler.class);
   private static final String JASPER_PARAM_PROCESS = "jasper_process";
+  protected static final String JASPER_REPORT_PARAMETERS = "JASPER_REPORT_PARAMETERS";
 
   /**
-   * execute() method overridden to add the logic to download the report file stored in the
-   * temporary folder.
+   * execute() method overridden to add the logic to download or display the report file stored in
+   * the temporary folder.
    */
   @Override
   public void execute() {
@@ -89,25 +94,20 @@
       mode = "Default";
     }
     if ("DOWNLOAD".equals(mode)) {
-      final Map<String, Object> parameterMap = new HashMap<String, Object>();
-      for (Enumeration<?> keys = request.getParameterNames(); keys.hasMoreElements();) {
-        final String key = (String) keys.nextElement();
-        if (request.getParameterValues(key) != null && request.getParameterValues(key).length > 1) {
-          parameterMap.put(key, request.getParameterValues(key));
-        } else {
-          parameterMap.put(key, request.getParameter(key));
-        }
-      }
-      // also add the Http Stuff
-      parameterMap.put(KernelConstants.HTTP_SESSION, request.getSession(false));
-      parameterMap.put(KernelConstants.HTTP_REQUEST, request);
       try {
-        doDownload(request, parameterMap);
+        doDownload(request);
       } catch (Exception e) {
         // Error downloading file
         log.error("Error downloading the file: " + e.getMessage(), e);
       }
       return;
+    } else if ("BROWSE".equals(mode)) {
+      try {
+        doBrowse(request);
+      } catch (IOException e) {
+        log.error("Error browsing the file: " + e.getMessage(), e);
+      }
+      return;
     }
     super.execute();
   }
@@ -149,12 +149,32 @@
   }
 
   /**
+   * Returns the report output. The file containing the output is stored in a temporary folder with
+   * a generated name. Its content is sent back to the browser to be shown in a new Openbravo tab.
+   * Once the process is finished the file is removed from the server.
+   *
+   * @param request
+   *          The HTTP request for this handler.
+   */
+  private void doBrowse(HttpServletRequest request) throws IOException {
+    final Map<String, Object> parameters = getParameterMapFromRequest(request);
+    final String strFileName = (String) parameters.get("fileName");
+    final String tmpFileName = (String) parameters.get("tmpfileName");
+    ExportType expType = ExportType.HTML;
+
+    handleReportResponse(request, expType, strFileName, tmpFileName, false);
+  }
+
+  /**
    * Downloads the file with the report result. The file is stored in a temporary folder with a
-   * generated name. It is renamed and download as an attachment of the response. Once it is
+   * generated name. It is renamed and download as an attachment of the HTTP response. Once it is
    * finished the file is removed from the server.
+   *
+   * @param request
+   *          The HTTP request for this handler.
    */
-  private void doDownload(HttpServletRequest request, Map<String, Object> parameters)
-      throws IOException {
+  private void doDownload(HttpServletRequest request) throws IOException {
+    final Map<String, Object> parameters = getParameterMapFromRequest(request);
     final String strFileName = (String) parameters.get("fileName");
     final String tmpFileName = (String) parameters.get("tmpfileName");
     ExportType expType = null;
@@ -168,31 +188,35 @@
           + strFileName);
     }
 
+    handleReportResponse(request, expType, strFileName, tmpFileName, true);
+  }
+
+  private void handleReportResponse(HttpServletRequest request, ExportType expType,
+      String strFileName, String tmpFileName, boolean includeReportAsAttachment) throws IOException {
     if (!expType.isValidTemporaryFileName(tmpFileName)) {
       throw new IllegalArgumentException("Trying to download report with invalid name "
           + strFileName);
     }
-
     final String tmpDirectory = ReportingUtils.getTempFolder();
     final File file = new File(tmpDirectory, tmpFileName);
     FileUtility fileUtil = new FileUtility(tmpDirectory, tmpFileName, false, true);
     try {
       final HttpServletResponse response = RequestContext.get().getResponse();
-
       response.setHeader("Content-Type", expType.getContentType());
       response.setContentType(expType.getContentType());
       response.setCharacterEncoding("UTF-8");
-      // TODO: Compatibility code with IE8. To be reviewed when its support is stopped.
-      // see issue #29109
-      String userAgent = request.getHeader("user-agent");
-      if (userAgent.contains("MSIE")) {
-        response.setHeader("Content-Disposition",
-            "attachment; filename=\"" + URLEncoder.encode(strFileName, "utf-8") + "\"");
-      } else {
-        response.setHeader("Content-Disposition",
-            "attachment; filename=\"" + MimeUtility.encodeWord(strFileName, "utf-8", "Q") + "\"");
+      if (includeReportAsAttachment) {
+        // TODO: Compatibility code with IE8. To be reviewed when its support is stopped.
+        // see issue #29109
+        String userAgent = request.getHeader("user-agent");
+        if (userAgent.contains("MSIE")) {
+          response.setHeader("Content-Disposition",
+              "attachment; filename=\"" + URLEncoder.encode(strFileName, "utf-8") + "\"");
+        } else {
+          response.setHeader("Content-Disposition",
+              "attachment; filename=\"" + MimeUtility.encodeWord(strFileName, "utf-8", "Q") + "\"");
+        }
       }
-
       fileUtil.dumpFile(response.getOutputStream());
       response.getOutputStream().flush();
       response.getOutputStream().close();
@@ -203,39 +227,55 @@
     }
   }
 
+  private Map<String, Object> getParameterMapFromRequest(HttpServletRequest request) {
+    Map<String, Object> parameterMap = new HashMap<String, Object>();
+    for (Enumeration<?> keys = request.getParameterNames(); keys.hasMoreElements();) {
+      final String key = (String) keys.nextElement();
+      if (request.getParameterValues(key) != null && request.getParameterValues(key).length > 1) {
+        parameterMap.put(key, request.getParameterValues(key));
+      } else {
+        parameterMap.put(key, request.getParameter(key));
+      }
+    }
+    parameterMap.put(KernelConstants.HTTP_SESSION, request.getSession(false));
+    parameterMap.put(KernelConstants.HTTP_REQUEST, request);
+    return parameterMap;
+  }
+
   /**
-   * Manages the report generation. It sets the proper response actions to download the generated
-   * file.
+   * Get the PDF, XLS or HTML template path from the Report Definition. Override this method to add
+   * custom logic to get report template paths.
    * 
-   * @param result
-   *          JSONObject with the response that is returned to the client.
-   * @param parameters
-   *          Map including the parameters of the call.
+   * @param expType
+   *          The export type.
+   * @param report
+   *          The Report Definition.
    * @param jsonContent
-   *          JSONObject with the values set in the filter parameters.
-   * @param action
-   *          String with the output type of the report.
-   * @throws OBException
-   *           Exception thrown when a validation fails.
+   *          JSONObject with the values set in the filter parameters, used by the classes extending
+   *          this one when generating reports which use more than one template. In that case, the
+   *          selection of the template can be done based on the values of the parameters present in
+   *          this JSONObject.
+   * @return The template path.
    */
-  private void doGenerateReport(JSONObject result, Map<String, Object> parameters,
-      JSONObject jsonContent, String action) throws JSONException, OBException {
-    JSONObject params = jsonContent.getJSONObject("_params");
-    final ReportDefinition report = OBDal.getInstance().get(ReportDefinition.class,
-        parameters.get("reportId"));
 
-    doValidations(report, parameters, jsonContent);
-    final ExportType expType = ExportType.getExportType(action);
-
-    String strFileName = getPDFFileName(report, parameters, expType);
-    String strTmpFileName = UUID.randomUUID().toString() + "." + expType.getExtension();
+  protected String getReportTemplatePath(ExportType expType, ReportDefinition report,
+      JSONObject jsonContent) throws JSONException, OBException {
     String strJRPath = "";
     switch (expType) {
     case XLS:
-      strJRPath = report.getXLSTemplate();
-      if (StringUtils.isNotEmpty(strJRPath) || !report.isUsePDFAsXLSTemplate()) {
-        break;
+      if (report.isUsePDFAsXLSTemplate()) {
+        strJRPath = report.getPDFTemplate();
+      } else {
+        strJRPath = report.getXLSTemplate();
       }
+      break;
+    case HTML:
+      if (report.isUsePDFAsHTMLTemplate()) {
+        strJRPath = report.getPDFTemplate();
+      } else {
+        strJRPath = report.getHTMLTemplate();
+      }
+      break;
     case PDF:
       strJRPath = report.getPDFTemplate();
       break;
@@ -246,18 +286,58 @@
     if (StringUtils.isEmpty(strJRPath)) {
       throw new OBException(OBMessageUtils.messageBD("OBUIAPP_NoJRTemplateFound"));
     }
+    return strJRPath;
+  }
+
+  /**
+   * Manages the report generation. It sets the proper response actions to download the generated
+   * file or to open it in a new Openbravo tab.
+   * 
+   * @param result
+   *          JSONObject with the response that is returned to the client.
+   * @param parameters
+   *          Map including the parameters of the call.
+   * @param jsonContent
+   *          JSONObject with the values set in the filter parameters.
+   * @param action
+   *          String with the output type of the report.
+   *
+   * @throws JSONException
+   * @throws OBException
+   *           Exception thrown when a validation fails.
+   */
+
+  private void doGenerateReport(JSONObject result, Map<String, Object> parameters,
+      JSONObject jsonContent, String action) throws JSONException, OBException {
+    JSONObject params = jsonContent.getJSONObject("_params");
+    final ReportDefinition report = OBDal.getInstance().get(ReportDefinition.class,
+        parameters.get("reportId"));
+
+    doValidations(report, parameters, jsonContent);
+    final ExportType expType = ExportType.getExportType(action);
+
+    String strFileName = getReportFileName(report, parameters, expType);
+    String strTmpFileName = UUID.randomUUID().toString() + "." + expType.getExtension();
+    String strJRPath = getReportTemplatePath(expType, report, jsonContent);
 
     if (!strJRPath.startsWith("/")) {
       // Tomcat 8 forces getRealPath to start with a slash
       strJRPath = "/" + strJRPath;
     }
     final String jrTemplatePath = DalContextListener.getServletContext().getRealPath(strJRPath);
-    HashMap<String, Object> jrParams = new HashMap<String, Object>();
+
+    Map<String, Object> allParametersMap = new HashMap<>();
+    Map<String, Object> jrParams = new HashMap<>();
     loadFilterParams(jrParams, report, params);
     loadReportParams(jrParams, report, jrTemplatePath, jsonContent);
+    // Include the HTTP session into the parameters that are sent to the report
+    jrParams.put("HTTP_SESSION", parameters.get(KernelConstants.HTTP_SESSION));
+    allParametersMap.putAll(parameters);
+    allParametersMap.put(JASPER_REPORT_PARAMETERS, jrParams);
+
     log.debug("Report: {}. Start export JR process.", report.getId());
     long t1 = System.currentTimeMillis();
-    doJRExport(jrTemplatePath, expType, jrParams, strTmpFileName);
+    doJRExport(jrTemplatePath, expType, strTmpFileName, allParametersMap);
     log.debug("Report: {}. Finish export JR process. Elapsed time: {}", report.getId(),
         System.currentTimeMillis() - t1);
 
@@ -270,7 +350,12 @@
     recordInfo.put("fileName", strFileName);
 
     final JSONObject reportAction = new JSONObject();
-    reportAction.put("OBUIAPP_downloadReport", recordInfo);
+    if (expType.equals(ExportType.HTML)) {
+      recordInfo.put("tabTitle", report.getProcessDefintion().getName());
+      reportAction.put("OBUIAPP_browseReport", recordInfo);
+    } else {
+      reportAction.put("OBUIAPP_downloadReport", recordInfo);
+    }
 
     final JSONArray actions = new JSONArray();
     actions.put(0, reportAction);
@@ -302,7 +387,7 @@
    * @param params
    *          JSONObject with the values set in the filter parameters.
    */
-  private void loadFilterParams(HashMap<String, Object> jrParams, ReportDefinition report,
+  private void loadFilterParams(Map<String, Object> jrParams, ReportDefinition report,
       JSONObject params) throws JSONException {
     for (Parameter param : report.getProcessDefintion().getOBUIAPPParameterList()) {
       String paramName = param.getDBColumnName();
@@ -407,7 +492,7 @@
    * @param jsonContent
    *          JSONObject with the values set in the filter parameters.
    */
-  private void loadReportParams(HashMap<String, Object> jrParams, ReportDefinition report,
+  private void loadReportParams(Map<String, Object> jrParams, ReportDefinition report,
       String jrTemplatePath, JSONObject jsonContent) {
 
     final int lastSegmentIndex = jrTemplatePath.lastIndexOf("/");
@@ -429,7 +514,7 @@
    *         make sense to use the {@link #getSafeFilename(String)} method to ensure the file name
    *         is valid
    */
-  private String getPDFFileName(ReportDefinition report, Map<String, Object> parameters,
+  private String getReportFileName(ReportDefinition report, Map<String, Object> parameters,
       ExportType expType) {
     final SimpleDateFormat dateFormat = new SimpleDateFormat(OBPropertiesProvider.getInstance()
         .getOpenbravoProperties().getProperty("dateTimeFormat.java"));
@@ -457,11 +542,62 @@
       Map<String, Object> parameters) {
   }
 
-  private static void doJRExport(String jrTemplatePath, ExportType expType,
-      Map<String, Object> parameters, String strFileName) {
+  /**
+   * Get the data to pass to the report generation method. Override this method to put logic for
+   * getting the data. The map received as argument contains parameters that can be used to create
+   * some logic to build the report data
+   * 
+   * @param parameters
+   *          map that contains the parameters of the HTTP request and the parameters that will be
+   *          sent to the jasper report
+   *
+   * @return a JRDataSource object containing the report data
+   */
+  protected JRDataSource getReportData(Map<String, Object> parameters) {
+    return null;
+  }
+
+  /**
+   * Get the connection provider to use in report generation. Override this method to put logic for
+   * getting the connection provider
+   *
+   * @return the ConnectionProvider to use during the report generation
+   */
+  protected ConnectionProvider getReportConnectionProvider() {
+    return null;
+  }
+
+  /**
+   * Override this method to define if the sub-reports generated with the handler must be compiled.
+   * If true, it will compile all sub-report jrxml files placed in the same folder as the main
+   * report and whose related parameter name starts with SUBREP_
+   *
+   * @return true if the handler must compile the sub-reports. Otherwise, it returns false.
+   */
+  protected boolean isCompilingSubreports() {
+    return false;
+  }
+
+  private void doJRExport(String jrTemplatePath, ExportType expType, String strFileName,
+      Map<String, Object> parameters) {
     ReportSemaphoreHandling.getInstance().acquire();
+    @SuppressWarnings("unchecked")
+    Map<String, Object> jrParameters = (Map<String, Object>) parameters
+        .get(JASPER_REPORT_PARAMETERS);
+    Map<Object, Object> localExportParameters = null;
     try {
-      ReportingUtils.exportJR(jrTemplatePath, expType, parameters, strFileName);
+      if (ExportType.HTML.equals(expType)) {
+        // Define the parameter for the URI to display images properly
+        localExportParameters = new HashMap<Object, Object>();
+        final String localAddress = HttpBaseUtils
+            .getLocalAddress(RequestContext.get().getRequest());
+        localExportParameters.put(ReportingUtils.IMAGES_URI, localAddress
+            + "/servlets/image?image={0}");
+      }
+      ReportingUtils.exportJR(jrTemplatePath, expType, jrParameters,
+          new File(ReportingUtils.getTempFolder(), strFileName), true,
+          getReportConnectionProvider(), getReportData(parameters), localExportParameters,
+          isCompilingSubreports());
     } finally {
       ReportSemaphoreHandling.getInstance().release();
     }
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportingUtils.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportingUtils.java	Wed Jan 25 05:32:50 2017 +0000
@@ -36,6 +36,24 @@
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpSession;
 
+import org.openbravo.base.ConfigParameters;
+import org.openbravo.base.exception.OBException;
+import org.openbravo.base.session.OBPropertiesProvider;
+import org.openbravo.client.kernel.reference.UIDefinitionController;
+import org.openbravo.client.kernel.reference.UIDefinitionController.FormatDefinition;
+import org.openbravo.dal.core.DalContextListener;
+import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.database.ConnectionProvider;
+import org.openbravo.erpCommon.utility.JRFormatFactory;
+import org.openbravo.erpCommon.utility.OBMessageUtils;
+import org.openbravo.model.ad.utility.FileType;
+import org.openbravo.service.db.DalConnectionProvider;
+import org.openbravo.uiTranslation.TranslationHandler;
+import org.openbravo.utils.Replace;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JRParameter;
@@ -68,24 +86,6 @@
 import net.sf.jasperreports.j2ee.servlets.ImageServlet;
 import net.sf.jasperreports.web.util.WebHtmlResourceHandler;
 
-import org.openbravo.base.ConfigParameters;
-import org.openbravo.base.exception.OBException;
-import org.openbravo.base.session.OBPropertiesProvider;
-import org.openbravo.client.kernel.reference.UIDefinitionController;
-import org.openbravo.client.kernel.reference.UIDefinitionController.FormatDefinition;
-import org.openbravo.dal.core.DalContextListener;
-import org.openbravo.dal.core.OBContext;
-import org.openbravo.dal.service.OBDal;
-import org.openbravo.database.ConnectionProvider;
-import org.openbravo.erpCommon.utility.JRFormatFactory;
-import org.openbravo.erpCommon.utility.OBMessageUtils;
-import org.openbravo.model.ad.utility.FileType;
-import org.openbravo.service.db.DalConnectionProvider;
-import org.openbravo.uiTranslation.TranslationHandler;
-import org.openbravo.utils.Replace;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /** Utilities to generate jasper reports */
 public class ReportingUtils {
   /**
@@ -192,8 +192,8 @@
    *          Additional export parameters than can be added to configure the resulting report.
    * @param compileSubreports
    *          A flag to indicate if the sub-reports should be compiled too. If true, the sub-report
-   *          jrxml files should be placed in the same folder as the main report and their name
-   *          should start with SUBREP_
+   *          jrxml files should be placed in the same folder as the main report and their related
+   *          parameter name should start with SUBREP_
    * @throws OBException
    *           In case there is any error generating the report an exception is thrown with the
    *           error message.
@@ -264,8 +264,8 @@
    *          Additional export parameters than can be added to configure the resulting report.
    * @param compileSubreports
    *          A flag to indicate if the sub-reports should be compiled too. If true, the sub-report
-   *          jrxml files should be placed in the same folder as the main report and their name
-   *          should start with SUBREP_
+   *          jrxml files should be placed in the same folder as the main report and their related
+   *          parameter name should start with SUBREP_
    * @throws OBException
    *           In case there is any error generating the report an exception is thrown with the
    *           error message.
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl	Wed Jan 25 05:32:50 2017 +0000
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2013 Openbravo SLU
+ * All portions are Copyright (C) 2010-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -48,6 +48,11 @@
 // placed here to prevent dependencies of client.kernel on Preferences
 OB.Application.startPage = '${data.startPage}';
 
+// This preference is the one which enables the accessibility for the people with reduced visual capabilities.
+if (OB.PropertyStore.get('EnableScreenReader') === 'Y') {
+    isc.screenReader = true;
+} 
+
 // the OB.Layout contains everything
 OB.Layout = isc.VLayout.create({
   width: '100%',
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-pick-and-execute-grid.js.ftl	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-pick-and-execute-grid.js.ftl	Wed Jan 25 05:32:50 2017 +0000
@@ -46,7 +46,8 @@
   </#if>
   <#if data.lazyFiltering>
   lazyFiltering: ${data.lazyFiltering?string},
-  </#if>  
+  </#if>
+  allowSummaryFunctions: ${data.allowSummaryFunctions?string},
   <#if data.alwaysFilterFksByIdentifier>
   alwaysFilterFksByIdentifier: ${data.alwaysFilterFksByIdentifier?string},
   </#if>
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-pick-and-execute-view-window.js.ftl	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-pick-and-execute-view-window.js.ftl	Wed Jan 25 05:32:50 2017 +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) 2011-2014 Openbravo SLU
+ * All portions are Copyright (C) 2011-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -50,6 +50,9 @@
         <#if data.xlsExport>
             xlsExport: true,
         </#if>
+        <#if data.htmlExport>
+            htmlExport: true,
+        </#if>
     </#if>
     viewProperties: {
       fields: [
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl	Wed Jan 25 05:32:50 2017 +0000
@@ -39,7 +39,8 @@
     </#if>
     <#if data.lazyFiltering>
         lazyFiltering: ${data.lazyFiltering?string},
-    </#if>    
+    </#if>
+    allowSummaryFunctions: ${data.allowSummaryFunctions?string},
     <#if data.alwaysFilterFksByIdentifier>
         alwaysFilterFksByIdentifier: ${data.alwaysFilterFksByIdentifier?string},
     </#if>       
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java	Wed Jan 25 05:32:50 2017 +0000
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2011-2015 Openbravo SLU
+ * All portions are Copyright (C) 2011-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -26,6 +26,10 @@
 import java.util.List;
 import java.util.Map;
 
+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;
@@ -1231,6 +1235,14 @@
 
     public String getGridFieldProperties() {
       String props = uiDefinition.getGridFieldProperties(field);
+      if (!props.contains("canFilter") && field.getTab().isObuiappCanDelete()
+          && field.getTab().getWindow().getWindowType().equals("OBUIAPP_PickAndExecute")) {
+        props = props + ", canFilter: false";
+      }
+      if (!props.contains("canSort") && field.getTab().isObuiappCanAdd()
+          && field.getTab().getWindow().getWindowType().equals("OBUIAPP_PickAndExecute")) {
+        props = props + ", canSort: false";
+      }
       return props;
     }
 
@@ -1535,16 +1547,57 @@
       if (field.isShownInStatusBar()) {
         return false;
       } else {
-        return field.isDisplayed() != null && field.isDisplayed();
+        return field.isDisplayed() != null
+            && field.isDisplayed()
+            && evaluateDisplayLogicAtServerLevel(field.getDisplayLogicEvaluatedInTheServer(),
+                field.getId());
       }
     }
 
+    /**
+     * Evaluates the Display logic at server level and returns true if the field must be shown,
+     * false otherwise
+     * 
+     * @param displayLogicEvaluatedInTheServer
+     *          Display logic to be evaluated
+     * @param fieldId
+     *          Id of the field with the displaylogic to be evaluated
+     * @return True if the field must be shown, false otherwise
+     */
+    private boolean evaluateDisplayLogicAtServerLevel(String displayLogicEvaluatedInTheServer,
+        String fieldId) {
+      if (displayLogicEvaluatedInTheServer == null) {
+        return true;
+      }
+
+      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());
+      } catch (ScriptException e) {
+        log.error(
+            "Error while evaluating the Display Logic at Server Level. Error in field with id: "
+                + fieldId + " in Tab with id: " + tab.getId(), e);
+        result = true;
+      }
+      return result;
+    }
+
     public boolean isStatusBarField() {
       return field.isShownInStatusBar();
     }
 
     public boolean isShowInitiallyInGrid() {
-      return field.isShowInGridView();
+      return field.isShowInGridView()
+          && evaluateDisplayLogicAtServerLevel(field.getDisplayLogicEvaluatedInTheServer(),
+              field.getId());
     }
 
     public int getGridSort() {
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java	Wed Jan 25 05:32:50 2017 +0000
@@ -28,6 +28,7 @@
 import org.openbravo.base.model.Entity;
 import org.openbravo.base.model.ModelProvider;
 import org.openbravo.base.model.Property;
+import org.openbravo.client.application.ApplicationConstants;
 import org.openbravo.client.application.ApplicationUtils;
 import org.openbravo.client.application.GCSystem;
 import org.openbravo.client.application.GCTab;
@@ -403,39 +404,57 @@
    * 'Apply changes' button
    */
   public boolean getLazyFiltering() {
-    Boolean lazyFiltering = null;
-    List<Object> parameterList = new ArrayList<Object>();
+    return isConfigurationPropertyEnabled(GCTab.PROPERTY_ISLAZYFILTERING,
+        GCSystem.PROPERTY_ISLAZYFILTERING, false);
+  }
 
-    String tabConfsHql = " as p where p.tab.id = ? ";
-    parameterList.add(tab.getId());
+  /**
+   * Returns true if the grid allows adding summary functions. If the tab is based on an HQL table,
+   * this method is returning false because grid summaries are not allowed for this kind of tables.
+   */
+  public boolean getAllowSummaryFunctions() {
+    if (isHqlBasedTable(tab.getTable())) {
+      return false;
+    }
+    return isConfigurationPropertyEnabled(GCTab.PROPERTY_ALLOWSUMMARYFUNCTIONS,
+        GCSystem.PROPERTY_ALLOWSUMMARYFUNCTIONS, true);
+  }
+
+  private boolean isConfigurationPropertyEnabled(String propertyNameAtTabLevel,
+      String propertyNameAtSystemLevel, boolean defaultReturnValue) {
+    Boolean propertyEnabled = null;
 
     // Trying to get parameters from "Grid Configuration (Tab/Field)" -> "Tab" window
-    OBQuery<GCTab> query = OBDal.getInstance().createQuery(GCTab.class, tabConfsHql);
-    query.setParameters(parameterList);
-    List<GCTab> tabConfs = query.list();
+    List<GCTab> tabConfs = getGridConfigurationForTab();
     if (!tabConfs.isEmpty()) {
-      if ("Y".equals(tabConfs.get(0).getIsLazyFiltering())) {
-        lazyFiltering = true;
-      } else if ("N".equals(tabConfs.get(0).getIsLazyFiltering())) {
-        lazyFiltering = false;
+      if ("Y".equals(tabConfs.get(0).get(propertyNameAtTabLevel))) {
+        propertyEnabled = true;
+      } else if ("N".equals(tabConfs.get(0).get(propertyNameAtTabLevel))) {
+        propertyEnabled = false;
       }
     }
-    if (lazyFiltering == null) {
+    if (propertyEnabled == null) {
       // Trying to get parameters from "Grid Configuration (System)" window
       List<GCSystem> sysConfs = OBDal.getInstance().createQuery(GCSystem.class, "").list();
       if (!sysConfs.isEmpty()) {
-        if (lazyFiltering == null) {
-          lazyFiltering = sysConfs.get(0).isLazyFiltering();
-        }
+        propertyEnabled = (Boolean) sysConfs.get(0).get(propertyNameAtSystemLevel);
       }
     }
-    if (lazyFiltering != null) {
-      return lazyFiltering;
+    if (propertyEnabled != null) {
+      return propertyEnabled;
     } else {
-      return false;
+      return defaultReturnValue;
     }
   }
 
+  private List<GCTab> getGridConfigurationForTab() {
+    String tabConfsHql = " as p where p.tab.id = :tabId";
+    // Trying to get parameters from "Grid Configuration (Tab/Field)" -> "Tab" window
+    OBQuery<GCTab> query = OBDal.getInstance().createQuery(GCTab.class, tabConfsHql);
+    query.setNamedParameter("tabId", tab.getId());
+    return query.list();
+  }
+
   public boolean getAlwaysFilterFksByIdentifier() {
     DataSource dataSource = tab.getTable().getObserdsDatasource();
     // always filter using the identifier if the grid fetches its data from a manual datasource and
@@ -445,7 +464,11 @@
 
   public String getTableAlias() {
     Table table = tab.getTable();
-    return "HQL".equals(table.getDataOriginType()) && !StringUtils.isBlank(table.getEntityAlias()) ? table
+    return isHqlBasedTable(table) && !StringUtils.isBlank(table.getEntityAlias()) ? table
         .getEntityAlias() : "e";
   }
+
+  private boolean isHqlBasedTable(Table table) {
+    return ApplicationConstants.HQLBASEDTABLE.equals(table.getDataOriginType());
+  }
 }
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java	Wed Jan 25 05:32:50 2017 +0000
@@ -269,7 +269,7 @@
     } catch (PropertyException e) {
       // The property is not defined, so the classic popup tree should not be used
     }
-    boolean useClassicPopupTree = ("Y".equals(useClassicPopupTreeStr));
+    boolean useClassicPopupTree = (Preferences.YES.equals(useClassicPopupTreeStr));
 
     if (tab.getTableTree() != null) {
       if (useClassicPopupTree) {
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ParameterWindowComponent.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ParameterWindowComponent.java	Wed Jan 25 05:32:50 2017 +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-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -30,6 +30,7 @@
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
 import org.hibernate.criterion.Restrictions;
+import org.openbravo.client.application.ApplicationConstants;
 import org.openbravo.client.application.Parameter;
 import org.openbravo.client.application.Process;
 import org.openbravo.client.application.ReportDefinition;
@@ -158,7 +159,7 @@
   }
 
   public boolean isReport() {
-    return "OBUIAPP_Report".equals(process.getUIPattern());
+    return ApplicationConstants.REPORT_UI_PATTERN.equals(process.getUIPattern());
   }
 
   public String getReportId() {
@@ -185,6 +186,14 @@
     return StringUtils.isNotEmpty(report.getPDFTemplate());
   }
 
+  public boolean isHtmlExport() {
+    ReportDefinition report = getReportDefinition();
+    if (report == null) {
+      return false;
+    }
+    return StringUtils.isNotEmpty(report.getHTMLTemplate()) || report.isUsePDFAsHTMLTemplate();
+  }
+
   private ReportDefinition getReportDefinition() {
     if (process.getOBUIAPPReportList().isEmpty()) {
       return null;
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/servlet/CalloutServletConfig.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/servlet/CalloutServletConfig.java	Wed Jan 25 05:32:50 2017 +0000
@@ -1,3 +1,22 @@
+/*
+ *************************************************************************
+ * 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) 2010-2016 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+ */
+
 package org.openbravo.client.application.window.servlet;
 
 import java.util.Enumeration;
@@ -20,9 +39,8 @@
     return context.getInitParameter(name);
   }
 
-  @SuppressWarnings({ "rawtypes" })
   @Override
-  public Enumeration getInitParameterNames() {
+  public Enumeration<String> getInitParameterNames() {
     return context.getInitParameterNames();
   }
 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js	Wed Jan 25 05:32:50 2017 +0000
@@ -139,7 +139,19 @@
     this.Super('destroy', arguments);
   },
 
+  isScreenReaderPreferenceEnabled: function () {
+    return OB.PropertyStore.get('EnableScreenReader') === 'Y';
+  },
+
   setDataSource: function (ds) {
+    var i;
+    if (this.isScreenReaderPreferenceEnabled()) {
+      for (i = 0; i < this.gridFields.length; i++) {
+        this.gridFields[i].filterEditorProperties = {
+          title: OB.I18N.getLabel('OBUIAPP_Filter_By_Column', [this.gridFields[i].title])
+        };
+      }
+    }
     this.Super('setDataSource', [ds, this.gridFields]);
     // Some properties need to be set when the datasource is loaded to avoid errors when form is
     // open the first time.
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js	Wed Jan 25 05:32:50 2017 +0000
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2011-2015 Openbravo SLU
+ * All portions are Copyright (C) 2011-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -331,6 +331,10 @@
         gridCriteria, criteriaFieldName = this.getCriteriaFieldName(),
         me = this;
 
+    function isInPickAndExecuteGrid() {
+      return (me.grid && me.grid.parentElement && me.grid.parentElement.getClassName() === 'OBPickAndExecuteGrid');
+    }
+
     function cleanCriteria(crit, fkItem) {
       var i, criterion, fkFilterOnThisField;
       for (i = crit.length - 1; i >= 0; i--) {
@@ -347,13 +351,29 @@
           crit.removeAt(i);
         }
 
-        if (me.grid && me.grid.parentElement && me.grid.parentElement.getClassName() === 'OBPickAndExecuteGrid' && criterion.fieldName === 'id') {
+        if (isInPickAndExecuteGrid() && criterion.fieldName === 'id') {
           // we're in a P&E grid, selected ids should also be removed from criteria
           crit.removeAt(i);
         }
       }
     }
 
+    function cleanOrCriterion() {
+      if (isInPickAndExecuteGrid() && gridCriteria._OrExpression) {
+        // we're in a P&E grid, _OrExpression parameter should also be removed as it is used as part of the selection criteria
+        if (gridCriteria.criteria.length > 0) {
+          gridCriteria = {
+            operator: 'and',
+            _constructor: 'AdvancedCriteria',
+            criteria: gridCriteria.criteria
+          };
+        } else {
+          gridCriteria = {};
+          gridCriteria.criteria = [];
+        }
+      }
+    }
+
     if (this.form.grid.sourceWidget.lazyFiltering) {
       // Fetch the criteria from the current values of the filter editor
       // Invoke the convertCriteria function to filter by the record selected in the parent tab if needed
@@ -371,6 +391,7 @@
     // remove from criteria the field used for current filter so drop down doesn't
     // restrict its values
     cleanCriteria(gridCriteria.criteria);
+    cleanOrCriterion();
 
     if (this.form.grid.sourceWidget && this.form.grid.sourceWidget.dataSource) {
       gridCriteria = this.form.grid.sourceWidget.dataSource.convertRelativeDates(gridCriteria);
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js	Wed Jan 25 05:32:50 2017 +0000
@@ -230,6 +230,7 @@
   init: function () {
     this.canvasProperties = this.canvasProperties || {};
     this.canvasProperties.parentItem = this;
+    this.canvasProperties.canFocus = true;
     this.Super('init', arguments);
   },
   //This formitem will never be disabled, so even if the form is readonly, click events will still be triggered
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js	Wed Jan 25 05:32:50 2017 +0000
@@ -331,6 +331,14 @@
     if (!this.linkedItemSection) {
       return;
     }
+    if (this.isLinkedItemSectionDisabled()) {
+      // linked items section is hidden by preference
+      if (!this.linkedItemSection.hiddenInForm) {
+        this.linkedItemSection.hiddenInForm = true;
+        this.linkedItemSection.hide();
+      }
+      return;
+    }
     if (enable) {
       this.linkedItemSection.collapseSection(true);
       this.linkedItemSection.setRecordInfo(this.view.entity, this.getValue(OB.Constants.ID), this);
@@ -342,6 +350,10 @@
     }
   },
 
+  isLinkedItemSectionDisabled: function () {
+    return 'Y' === OB.PropertyStore.get('OBUIAPP_DisableLinkedItemsSection', this.view.standardWindow.windowId);
+  },
+
   enableAttachmentsSection: function (enable) {
     if (!this.attachmentsSection) {
       return;
@@ -1577,6 +1589,9 @@
     this.view.messageBar.hide();
     if (this.isNew) {
       this.view.refreshChildViews();
+      // after closing the form, we mark it as not new. In other case, back in grid view this flag
+      // would avoid the required FIC call in 'SETSESSION' mode when selecting a record
+      this.isNew = false;
     }
 
     if (this.view.directNavigation) {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js	Wed Jan 25 05:32:50 2017 +0000
@@ -635,6 +635,10 @@
 
         field.filterEditorProperties.keyDown = this.filterFieldsKeyDown;
 
+        if (OB.PropertyStore.get('EnableScreenReader') === 'Y') {
+          field.filterEditorProperties.title = OB.I18N.getLabel('OBUIAPP_Filter_By_Column', [field.name]);
+        }
+
         if (field.criteriaField) {
           field.filterEditorProperties.criteriaField = field.criteriaField;
         }
@@ -896,6 +900,12 @@
   // creates (or updates) and returns the summaryRow autoChild
   // not called directly -- call 'setShowGridSummary' instead
   getSummaryRow: function () {
+    if (this.summaryRow && (this.isBeingCancelled || this.summaryRowProperties.isBeingReordered)) {
+      if (this.summaryRowProperties.isBeingReordered) {
+        this.summaryRow.reorderField(this.summaryRowProperties.oldPosition, this.summaryRowProperties.newPosition);
+      }
+      return this.summaryRow;
+    }
     if (this.lazyFiltering && this.summaryRow) {
       if (this.getSummaryRowDataSource && this.completeFields) {
         this.summaryRow.setDataSource(this.getSummaryRowDataSource(), this.completeFields.duplicate());
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Wed Jan 25 05:32:50 2017 +0000
@@ -490,10 +490,14 @@
 
     var ret = this.Super('initWidget', arguments);
 
-    // only show summary rows if there are summary functions
-    for (i = 0; i < this.getFields().length; i++) {
-      if (this.getFields()[i].summaryFunction && !this.lazyFiltering) {
-        this.showGridSummary = true;
+    if (!this.allowSummaryFunctions) {
+      this.showGridSummary = false;
+    } else {
+      // only show summary rows if there are summary functions
+      for (i = 0; i < this.getFields().length; i++) {
+        if (this.getFields()[i].summaryFunction && !this.lazyFiltering) {
+          this.showGridSummary = true;
+        }
       }
     }
 
@@ -664,6 +668,20 @@
     }
   },
 
+  setShowGridSummary: function (showGridSummary) {
+    if (!this.allowSummaryFunctions) {
+      return;
+    }
+    this.Super('setShowGridSummary', arguments);
+  },
+
+  markForCalculateSummaries: function () {
+    if (!this.allowSummaryFunctions) {
+      return;
+    }
+    this.Super('markForCalculateSummaries');
+  },
+
   getHeaderContextMenuItems: function (colNum) {
     var field = this.getField(colNum),
         i, summarySubMenu = [],
@@ -683,7 +701,7 @@
       }
     }
 
-    if (field) {
+    if (field && this.allowSummaryFunctions) {
       type = isc.SimpleType.getType(field.type);
       isDate = isc.SimpleType.inheritsFrom(type, 'date');
       isNumber = isc.SimpleType.inheritsFrom(type, 'integer') || isc.SimpleType.inheritsFrom(type, 'float');
@@ -959,11 +977,31 @@
   },
 
   reorderField: function (fieldNum, moveToPosition) {
-    var res = this.Super('reorderField', arguments);
+    var res;
+    if (this.showGridSummary) {
+      res = this.handleSummaryFunctionGrid(fieldNum, moveToPosition);
+    } else {
+      res = this.Super('reorderField', arguments);
+    }
     this.view.standardWindow.storeViewState();
     return res;
   },
 
+  handleSummaryFunctionGrid: function (oldPosition, newPosition) {
+    var res;
+    this.summaryRowProperties = {};
+    this.summaryRowProperties.isBeingReordered = true;
+    this.summaryRowProperties.oldPosition = oldPosition;
+    this.summaryRowProperties.newPosition = newPosition;
+    this.showGridSummary = false;
+    res = this.Super('reorderField', arguments);
+    this.setShowGridSummary(true);
+    delete this.summaryRowProperties.isBeingReordered;
+    delete this.summaryRowProperties.oldPosition;
+    delete this.summaryRowProperties.newPosition;
+    return res;
+  },
+
   hideField: function (field, suppressRelayout) {
     var res;
     this._hidingField = true;
@@ -3349,9 +3387,19 @@
           me.selection.deselect(selectedRecord);
         }
         totalRows = me.data.totalRows;
-        me.data.handleUpdate('remove', [{
-          id: record.id
-        }]);
+        if (this.showGridSummary) {
+          this.showGridSummary = false;
+          this.isBeingCancelled = true;
+          me.data.handleUpdate('remove', [{
+            id: record.id
+          }]);
+          this.setShowGridSummary(true);
+          delete this.isBeingCancelled;
+        } else {
+          me.data.handleUpdate('remove', [{
+            id: record.id
+          }]);
+        }
         // the total rows should be decreased
         if (me.data.totalRows === totalRows) {
           me.data.totalRows = me.data.totalRows - 1;
@@ -4095,7 +4143,7 @@
   },
 
   processColumnValue: function (rowNum, columnName, columnValue) {
-    var field, newValue;
+    var field;
     if (!columnValue) {
       return;
     }
@@ -4103,10 +4151,6 @@
     if (!field) {
       return;
     }
-    newValue = {};
-    if (field) {
-      newValue[field.property] = columnValue.value;
-    }
     this.setEditValue(rowNum, field.property, columnValue.value);
   },
 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-event-handler-registry.js	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-event-handler-registry.js	Wed Jan 25 05:32:50 2017 +0000
@@ -27,8 +27,9 @@
 
   PRESAVE: 'PRESAVE',
   POSTSAVE: 'POSTSAVE',
+  PREDELETE: 'PREDELETE',
 
-  actionTypes: ['PRESAVE', 'POSTSAVE'],
+  actionTypes: ['PRESAVE', 'POSTSAVE', 'PREDELETE'],
 
   isValidElement: function (actionType) {
     var findType;
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Wed Jan 25 05:32:50 2017 +0000
@@ -339,6 +339,10 @@
       OB.Personalization.personalizeForm(personalizationData, this.viewForm);
     }
     this.setMaximizeRestoreButtonState();
+    // The tabIndex of the child tabs will be recalculated to have a higher index number than the tabIndex of their parent elements.
+    if (this.viewForm.view.childTabSet) {
+      this.viewForm.parentElement.updateMemberTabIndex(this.viewForm.view.childTabSet);
+    }
 
   },
 
@@ -2165,11 +2169,31 @@
     this.callSaveActions(OB.EventHandlerRegistry.PRESAVE, eventHandlerParams, saveRowCallback);
   },
 
+  executePreDeleteActions: function (deleteRowCallback) {
+    var eventHandlerParams = {},
+        currentGrid;
+
+    if (this.isShowingTree) {
+      currentGrid = this.treeGrid;
+    } else {
+      currentGrid = this.viewGrid;
+    }
+    eventHandlerParams.recordsToDelete = isc.clone(currentGrid.getSelection());
+    this.callClientEventHandlerActions(OB.EventHandlerRegistry.PREDELETE, eventHandlerParams, deleteRowCallback, true);
+  },
+
   existsAction: function (actionType) {
     return this.tabId && OB.EventHandlerRegistry.hasAction(this.tabId, actionType);
   },
 
   callSaveActions: function (actionType, extraParameters, callback) {
+    if (actionType !== OB.EventHandlerRegistry.PRESAVE && actionType !== OB.EventHandlerRegistry.POSTSAVE) {
+      return;
+    }
+    this.callClientEventHandlerActions(actionType, extraParameters, callback);
+  },
+
+  callClientEventHandlerActions: function (actionType, extraParameters, callback, executeCallback) {
     var params;
     if (this.existsAction(actionType)) {
       params = {
@@ -2182,6 +2206,8 @@
         callback: callback
       };
       OB.EventHandlerRegistry.call(params);
+    } else if (executeCallback && isc.isA.Function(callback)) {
+      callback();
     }
   },
 
@@ -2342,8 +2368,10 @@
           }
         }
       };
-      isc.ask(msg, callback, {
-        title: dialogTitle
+      this.executePreDeleteActions(function () {
+        isc.ask(msg, callback, {
+          title: dialogTitle
+        });
       });
     }
   },
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-application-menu.js	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-application-menu.js	Wed Jan 25 05:32:50 2017 +0000
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2011-2014 Openbravo SLU
+ * All portions are Copyright (C) 2011-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -262,27 +262,31 @@
     this.Super('showMenu', arguments);
   },
 
-  getNodeIcon: function (type) {
+  getNodeIcon: function (node) {
     var iconPath;
-    if (type === 'window') {
+    if (node.type === 'window') {
       iconPath = this.nodeIcons.Window;
-    } else if (type === 'process') {
+    } else if (node.type === 'process') {
       iconPath = this.nodeIcons.Process;
-    } else if (type === 'processManual') {
+    } else if (node.type === 'processManual') {
       iconPath = this.nodeIcons.ProcessManual;
-    } else if (type === 'report') {
+    } else if (node.type === 'report') {
       iconPath = this.nodeIcons.Report;
-    } else if (type === 'task') {
+    } else if (node.type === 'task') {
       iconPath = this.nodeIcons.Task;
-    } else if (type === 'form') {
+    } else if (node.type === 'form') {
       iconPath = this.nodeIcons.Form;
-    } else if (type === 'external') {
+    } else if (node.type === 'external') {
       iconPath = this.nodeIcons.ExternalLink;
-    } else if (type === 'view') {
+    } else if (node.type === 'view') {
       iconPath = this.nodeIcons.View;
-    } else if (type === 'processDefinition') {
-      iconPath = this.nodeIcons.Process;
-    } else if (type === 'folder') {
+    } else if (node.type === 'processDefinition') {
+      if (node.uiPattern === 'OBUIAPP_Report') {
+        iconPath = this.nodeIcons.Report;
+      } else {
+        iconPath = this.nodeIcons.Process;
+      }
+    } else if (node.type === 'folder') {
       iconPath = this.nodeIcons.Folder;
     }
     return iconPath;
@@ -293,7 +297,7 @@
       var i, length = node.length;
       for (i = 0; i < length; i++) {
         if (node[i].type) {
-          node[i].icon = this.getNodeIcon(node[i].type);
+          node[i].icon = this.getNodeIcon(node[i]);
           if (node[i].submenu) {
             this.setNodeIcons(node[i].submenu);
           }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-toolbar.js	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-toolbar.js	Wed Jan 25 05:32:50 2017 +0000
@@ -177,6 +177,7 @@
     },
     disabled: false,
     buttonType: 'manageviews',
+    title: OB.I18N.getLabel('OBUIAPP_ManageViews_Toolbar_Button'),
     prompt: OB.I18N.getLabel('OBUIAPP_ManageViews_Toolbar_Button'),
     updateState: function () {
       this.resetBaseStyle();
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-base-parameter-window-view.js	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-base-parameter-window-view.js	Wed Jan 25 05:32:50 2017 +0000
@@ -452,6 +452,9 @@
       if (this.xlsExport) {
         this.xlsButton.setEnabled(enabled);
       }
+      if (this.htmlExport) {
+        this.htmlButton.setEnabled(enabled);
+      }
     } else {
       if (this.okButton) {
         this.okButton.setEnabled(enabled);
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js	Wed Jan 25 05:32:50 2017 +0000
@@ -35,6 +35,7 @@
   reportId: null,
   pdfExport: false,
   xlsExport: false,
+  htmlExport: false,
 
   gridFields: [],
   defaultsActionHandler: 'org.openbravo.client.application.process.DefaultsProcessActionHandler',
@@ -55,6 +56,9 @@
       if (this.xlsExport) {
         OB.TestRegistry.register('org.openbravo.client.application.ParameterWindow_XLS_Export_' + this.processId, this.xlsExport);
       }
+      if (this.htmlExport) {
+        OB.TestRegistry.register('org.openbravo.client.application.ParameterWindow_HTML_Export_' + this.processId, this.htmlExport);
+      }
     } else {
       OB.TestRegistry.register('org.openbravo.client.application.ParameterWindow_OK_Button_' + this.processId, this.okButton);
     }
@@ -93,6 +97,8 @@
           this.firstFocusedItem = this.pdfButton;
         } else if (this.xlsExport) {
           this.firstFocusedItem = this.xlsButton;
+        } else if (this.htmlExport) {
+          this.firstFocusedItem = this.htmlButton;
         }
       } else {
         this.firstFocusedItem = this.okButton;
@@ -123,6 +129,20 @@
       }
     } else {
       if (this.isReport) {
+        if (this.htmlExport) {
+          this.htmlButton = isc.OBFormButton.create({
+            title: OB.I18N.getLabel('OBUIAPP_HTMLExport'),
+            realTitle: '',
+            _buttonValue: 'HTML',
+            click: actionClick
+          });
+          buttonLayout.push(this.htmlButton);
+          if (this.popup) {
+            buttonLayout.push(isc.LayoutSpacer.create({
+              width: 32
+            }));
+          }
+        }
         if (this.pdfExport) {
           this.pdfButton = isc.OBFormButton.create({
             title: OB.I18N.getLabel('OBUIAPP_PDFExport'),
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js	Wed Jan 25 05:32:50 2017 +0000
@@ -249,6 +249,19 @@
     return ret;
   },
 
+  // overridden to support hover on the header for the checkbox field
+  setFieldProperties: function (field, properties) {
+    var localField = field;
+    if (isc.isA.Number(localField)) {
+      localField = this.fields[localField];
+    }
+    if (this.isCheckboxField(localField) && properties) {
+      properties.showHover = this.checkboxFieldProperties.showHover;
+      properties.prompt = this.checkboxFieldProperties.prompt;
+    }
+    return this.Super('setFieldProperties', arguments);
+  },
+
   overrideFilterItemOnBlur: function () {
     var i, filterFields, filterItem, me = this,
         updatedBlur;
@@ -675,9 +688,9 @@
       }
     }
 
+    rows = this.data.allRows || this.data.localData || [];
     if (selectedLen === 0) {
       // push all *selected* rows into selectedIds cache
-      rows = this.data.allRows || this.data.localData || [];
       len = rows.length;
       for (i = 0; i < len; i++) {
         if (rows[i] && rows[i][this.selectionProperty]) {
@@ -694,6 +707,9 @@
       this.onGridLoadFunction(this);
       this.view.handleButtonsStatus();
     }
+    if (rows.length > 0) {
+      this.updateCheckboxHeaderState();
+    }
   },
 
   recordClick: function (grid, record, recordNum, field, fieldNum, value, rawValue) {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-view.js	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-view.js	Wed Jan 25 05:32:50 2017 +0000
@@ -90,7 +90,7 @@
       saveLocally: (this.viewProperties.allowDelete || this.viewProperties.allowAdd ? true : false),
       autoSaveEdits: (this.viewProperties.allowDelete || this.viewProperties.allowAdd ? true : false),
       neverValidate: (this.viewProperties.allowDelete || this.viewProperties.allowAdd ? true : false),
-      showGridSummary: this.showGridSummary,
+      showGridSummary: this.showGridSummary && this.viewProperties.gridProperties && this.viewProperties.gridProperties.allowSummaryFunctions,
       viewProperties: this.viewProperties,
       parameterName: this.parameterName,
       onGridLoadFunction: this.onGridLoadFunction
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/procurement/ob-procurement.js	Wed Jan 25 05:32:50 2017 +0000
@@ -0,0 +1,86 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2016 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+ */
+
+OB.PROC = OB.PROC || {};
+
+/**
+ * Modify base Quantity when the Aum Quantity changes
+ */
+
+OB.PROC.CreateLinesOnChangeQuantityAum = function (item, view, form, grid) {
+  var aumQty = item.getValue();
+  var record = item.grid.getSelectionObject().lastSelectionItem;
+  var aum = item.form.getItems()[item.grid.getColNum('aum')].getValue();
+  if (aumQty !== undefined) {
+    OB.RemoteCallManager.call('org.openbravo.common.actionhandler.GetConvertedQtyActionHandler', {
+      mProductId: record.product,
+      qty: aumQty,
+      toUOM: aum,
+      reverse: false
+    }, {}, function (response, data, request) {
+      if (data.qty) {
+        item.grid.setEditValue(item.grid.getEditRow(), 'orderedQuantity', data.qty);
+      }
+    });
+  }
+};
+
+/**
+ * Modify base Aum Quantity when the base Quantity changes
+ */
+
+OB.PROC.CreateLinesOnChangeQuantity = function (item, view, form, grid) {
+  var qty = item.getValue();
+  var record = grid.getSelectionObject().lastSelectionItem;
+  var aum = item.grid.getEditValues(item.grid.getRecordIndex(item.record)).aum;
+  if (qty !== undefined) {
+    OB.RemoteCallManager.call('org.openbravo.common.actionhandler.GetConvertedQtyActionHandler', {
+      mProductId: record.product,
+      qty: qty,
+      toUOM: aum,
+      reverse: true
+    }, {}, function (response, data, request) {
+      if (data.qty) {
+        item.grid.setEditValue(item.grid.getEditRow(), 'aumQuantity', data.qty);
+      }
+    });
+  }
+};
+
+/**
+ * Modify base Quantity when the Aum selected changes
+ */
+
+OB.PROC.CreateLinesOnChangeAum = function (item, validator, value, record) {
+  var aum = item.pickList.getSelection()[0].id;
+  var changed_record = item.grid.getSelectionObject().lastSelectionItem;
+  var aumQty = item.grid.getEditValues(item.grid.getRecordIndex(item.record)).aumQuantity;
+  if (aumQty !== undefined) {
+    OB.RemoteCallManager.call('org.openbravo.common.actionhandler.GetConvertedQtyActionHandler', {
+      mProductId: changed_record.product,
+      qty: aumQty,
+      toUOM: aum,
+      reverse: false
+    }, {}, function (response, data, request) {
+      if (data.qty) {
+        item.grid.setEditValue(item.grid.getEditRow(), 'orderedQuantity', data.qty);
+      }
+    });
+  }
+};
\ No newline at end of file
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js	Wed Jan 25 05:32:50 2017 +0000
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2011-2015 Openbravo SLU
+ * All portions are Copyright (C) 2011-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -22,6 +22,30 @@
 /**
  * Check that entered return quantity is less than original inout qty.
  */
+
+OB.RM.RMReturnedUOMValidate = function (item, validator, value, record) {
+  var movementQty = isc.isA.Number(record.movementQuantity) ? new BigDecimal(String(record.movementQuantity)) : BigDecimal.prototype.ZERO,
+      returnedQty = isc.isA.Number(record.returnQtyOtherRM) ? new BigDecimal(String(record.returnQtyOtherRM)) : BigDecimal.prototype.ZERO,
+      newReturnedQty = isc.isA.Number(record.returned) ? new BigDecimal(String(record.returned)) : BigDecimal.prototype.ZERO;
+
+  var applyUOM = OB.PropertyStore.get('UomManagement') !== null && OB.PropertyStore.get('UomManagement') === 'Y' && record.returnedUOM !== record.uOM;
+
+  if (applyUOM) {
+    newReturnedQty = newReturnedQty.multiply(isc.isA.Number(record.aumConversionRate) ? new BigDecimal(String(record.aumConversionRate)) : BigDecimal.prototype.ONE);
+  }
+  if (newReturnedQty.compareTo(movementQty.subtract(returnedQty)) <= 0 && (record.returned > 0)) {
+    item.grid.view.messageBar.hide(true);
+    return true;
+  } else {
+    if (applyUOM) {
+      item.grid.view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null, OB.I18N.getLabel('OBUIAPP_RM_OutOfRange_AUM', [newReturnedQty.toString(), record.uOM$_identifier, movementQty.subtract(returnedQty).toString()]));
+    } else {
+      item.grid.view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null, OB.I18N.getLabel('OBUIAPP_RM_OutOfRange', [movementQty.subtract(returnedQty).toString()]));
+    }
+    return false;
+  }
+};
+
 OB.RM.RMOrderQtyValidate = function (item, validator, value, record) {
   if (!isc.isA.Number(value)) {
     return false;
@@ -33,10 +57,21 @@
   var movementQty = record.movementQuantity !== null ? new BigDecimal(String(record.movementQuantity)) : BigDecimal.prototype.ZERO,
       returnedQty = record.returnQtyOtherRM !== null ? new BigDecimal(String(record.returnQtyOtherRM)) : BigDecimal.prototype.ZERO,
       newReturnedQty = new BigDecimal(String(value));
+
+  var applyUOM = OB.PropertyStore.get('UomManagement') !== null && OB.PropertyStore.get('UomManagement') === 'Y' && record.returnedUOM !== record.uOM;
+
+  if (applyUOM) {
+    newReturnedQty = newReturnedQty.multiply(new BigDecimal(String(record.aumConversionRate)));
+  }
   if ((value !== null) && (newReturnedQty.compareTo(movementQty.subtract(returnedQty))) <= 0 && (value > 0)) {
+    item.grid.view.messageBar.hide(true);
     return true;
   } else {
-    item.grid.view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null, OB.I18N.getLabel('OBUIAPP_RM_OutOfRange', [movementQty.subtract(returnedQty).toString()]));
+    if (applyUOM) {
+      item.grid.view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null, OB.I18N.getLabel('OBUIAPP_RM_OutOfRange_AUM', [newReturnedQty.toString(), record.uOM$_identifier, movementQty.subtract(returnedQty).toString()]));
+    } else {
+      item.grid.view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null, OB.I18N.getLabel('OBUIAPP_RM_OutOfRange', [movementQty.subtract(returnedQty).toString()]));
+    }
     return false;
   }
 };
@@ -123,17 +158,31 @@
     return false;
   }
   // check shipped total quantity for the order line is below pending qty.
+  var isUomManagementEnabled = OB.PropertyStore.get('UomManagement');
   for (i = 0; i < selectedRecordsLength; i++) {
     editedRecord = isc.addProperties({}, selectedRecords[i], item.grid.getEditedRecord(selectedRecords[i]));
     if (editedRecord.orderLine === orderLine) {
-      pendingQty -= editedRecord.movementQuantity;
+      if (isUomManagementEnabled === 'Y') {
+        if (record.returnedUOM === editedRecord.returnedUOM) {
+          pendingQty -= editedRecord.movementQuantity;
+        } else {
+          var movementQuantity = new BigDecimal(String(editedRecord.movementQuantity));
+          var rate = new BigDecimal(String(editedRecord.rate));
+          pendingQty -= (editedRecord.returnedUOM !== editedRecord.uOM) ? movementQuantity.multiply(
+          rate).toString() : movementQuantity.divide(rate).toString();
+        }
+      }
       if (pendingQty < 0) {
-        item.grid.view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null, OB.I18N.getLabel('OBUIAPP_RM_TooMuchShipped', [record.pending]));
+        if (isUomManagementEnabled === 'Y') {
+          item.grid.view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null, OB.I18N.getLabel('OBUIAPP_RM_TooMuchShippedInUomManagement', []));
+        } else {
+          item.grid.view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null, OB.I18N.getLabel('OBUIAPP_RM_TooMuchShipped', [record.pending]));
+        }
         return false;
       }
     }
   }
-
+  item.grid.view.messageBar.hide();
   return true;
 };
 
@@ -158,10 +207,20 @@
       return false;
     }
     // calculate already shipped qty on grid
+    var isUomManagementEnabled = OB.PropertyStore.get('UomManagement');
     for (i = 0; i < selectedRecords.length; i++) {
       editedRecord = isc.addProperties({}, selectedRecords[i], grid.getEditedRecord(selectedRecords[i]));
       if (editedRecord.orderLine === orderLine && selectedRecords[i].id !== record.id) {
-        shippedQty = shippedQty.add(new BigDecimal(String(editedRecord.movementQuantity)));
+        if (isUomManagementEnabled === 'Y') {
+          if (record.returnedUOM === editedRecord.returnedUOM) {
+            shippedQty = shippedQty.add(new BigDecimal(String(editedRecord.movementQuantity)));
+          } else {
+            var movementQuantity = new BigDecimal(String(editedRecord.movementQuantity));
+            var rate = new BigDecimal(String(editedRecord.rate));
+            shippedQty = (editedRecord.returnedUOM !== editedRecord.uOM) ? shippedQty.add(movementQuantity.multiply(rate)) : shippedQty.add(movementQuantity.divide(rate));
+          }
+        }
+
       }
     }
     pending = pending.subtract(shippedQty);
@@ -171,4 +230,45 @@
       record.movementQuantity = availableQty.toString();
     }
   }
+};
+
+
+/**
+ * Update Pending and Available Qty values
+ */
+OB.RM.RMShipmentQtyValuesChange = function (item, view, form, grid) {
+  var record = grid.getSelectionObject().lastSelectionItem;
+  if (typeof record === 'undefined') {
+    record = grid.getSelectedRecord();
+  }
+  if (item.pickList.getSelection()[0].id !== item.getValue()) {
+    grid.setEditValue(item.grid.getEditRow(), 'movementQuantity', record.pendingQtyInAUM);
+    record.movementQuantity = record.pendingQtyInAUM;
+    var pending = record.pending;
+    grid.setEditValue(item.grid.getEditRow(), 'pending', record.pendingQtyInAUM);
+    record.pending = record.pendingQtyInAUM;
+    record.pendingQtyInAUM = pending;
+    var availableQty = record.availableQty;
+    grid.setEditValue(item.grid.getEditRow(), 'availableQty', record.availableQtyInAUM);
+    record.availableQty = record.availableQtyInAUM;
+    record.availableQtyInAUM = availableQty;
+    grid.setEditValue(item.grid.getEditRow(), 'returnedUOM', record.pendingQtyInAUM);
+    record.returnedUOM = item.pickList.getSelection()[0].id;
+  }
+};
+
+/**
+ * Update Pending value
+ */
+OB.RM.RMReceiptQtyValuesChange = function (item, view, form, grid) {
+  var record = grid.getSelectionObject().lastSelectionItem;
+  if (item.pickList.getSelection()[0].id !== item.getValue()) {
+    grid.setEditValue(item.grid.getEditRow(), 'receiving', record.pendingQtyInAUM);
+    record.receiving = record.pendingQtyInAUM;
+    var pending = record.pending;
+    grid.setEditValue(item.grid.getEditRow(), 'pending', record.pendingQtyInAUM);
+    record.pending = record.pendingQtyInAUM;
+    record.pendingQtyInAUM = pending;
+    record.returnedUOM = item.pickList.getSelection()[0].id;
+  }
 };
\ No newline at end of file
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js	Wed Jan 25 05:32:50 2017 +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-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):   Sreedhar Sirigiri (TDS), Mallikarjun M (TDS)
  ************************************************************************
@@ -401,6 +401,9 @@
         this.prompt = OB.I18N.getLabel('OBUIAPP_CreateAttachments');
         this.buttonType = 'attach';
       }
+      if (OB.PropertyStore.get('EnableScreenReader') === 'Y') {
+        this.setAriaState('label', this.prompt);
+      }
       if (!selectedRows || selectedRows.size() === 0) {
         // If there are now selected rows then attachments button will be disabled
         this.setDisabled(true);
@@ -1578,7 +1581,7 @@
   showFocused: true,
   showDown: true,
   showFocusedAsOver: false,
-  title: '.',
+  title: '',
   showHover: true,
   customState: '',
   showMenuButtonImage: false,
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-history-manager.js	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-history-manager.js	Wed Jan 25 05:32:50 2017 +0000
@@ -78,7 +78,7 @@
         tab = OB.MainView.TabSet.tabs[i];
         bookMarkParams = null;
 
-        if (tab.viewName !== 'OBQueryListView' && tab.viewName !== 'OBCalendarWidgetView') {
+        if (tab.viewName !== 'OBQueryListView' && tab.viewName !== 'OBCalendarWidgetView' && !tab.isProcessDefinitionReport) {
           state.bm[i] = {};
 
           // get the original tab object
@@ -109,7 +109,7 @@
             data[i] = tabObject.pane.getState();
           }
         } else {
-          // Not updating history in case of query-list and calendar widgets
+          // Not updating history in case of query-list, calendar widgets and process definition reports
           // https://issues.openbravo.com/view.php?id=29025
           tabWidgetNumber = OB.MainView.TabSet.getTabNumber(tab);
           if (tabWidgetNumber <= state.st) {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-onchange-functions.js	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-onchange-functions.js	Wed Jan 25 05:32:50 2017 +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-2015 Openbravo SLU
+ * All portions are Copyright (C) 2014-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -22,8 +22,7 @@
 OB = window.OB || {};
 OB.OnChange = window.OB.OnChange || {};
 
-
-//** {{{OB.OnChange.organizationCurrency}}} **
+// ** {{{OB.OnChange.organizationCurrency}}} **
 // Used in the 'Organization' window, in the 'Currency' onchange field
 // It shows a warning dialog when currency is changed
 OB.OnChange.organizationCurrency = function (item, view, form, grid) {
@@ -32,10 +31,10 @@
   }
 };
 
-//** {{{OB.OnChange.processDefinitionUIPattern}}} **
-//Used in the 'Process Definition' window, in the 'UI Pattern' field
-//When OBUIAPP_Report is selected and the Action Handler is empty it sets
-//the BaseReportActionHandler as default value.
+// ** {{{OB.OnChange.processDefinitionUIPattern}}} **
+// Used in the 'Process Definition' window, in the 'UI Pattern' field
+// When OBUIAPP_Report is selected and the Action Handler is empty it sets
+// the BaseReportActionHandler as default value.
 OB.OnChange.processDefinitionUIPattern = function (item, view, form, grid) {
   var classNameItem = form.getItem('javaClassName');
   if (item.getValue() === 'OBUIAPP_Report' && !classNameItem.getValue()) {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-action-def.js	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-action-def.js	Wed Jan 25 05:32:50 2017 +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-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -145,10 +145,27 @@
   }
 });
 
+//** {{{ refreshGridParameter }}} **
+//It refreshes a grid parameter defined within a parameter window
+//Parameters:
+//* {{{gridName}}}: The name of the grid parameter
+OB.Utilities.Action.set('refreshGridParameter', function (paramObj) {
+  var processView = paramObj._processView,
+      gridName = paramObj.gridName,
+      gridItem;
+  if (processView && processView.theForm && processView.theForm.getItem && gridName) {
+    gridItem = processView.theForm.getItem(gridName);
+    if (gridItem && gridItem.canvas && gridItem.canvas.viewGrid) {
+      // force parameter grid refresh by invalidating cache
+      gridItem.canvas.viewGrid.invalidateCache();
+    }
+  }
+});
+
 //** {{{ OBUIAPP_downloadReport }}} **
 //This action is used by the BaseReportActionHandler to download the generated file with the
 //report result from the temporary location using the postThroughHiddenForm function. The mode is
-//changed to DOWNLOAD so the BaseReportActionHanlder execute the logic to download the report.
+//changed to DOWNLOAD so the BaseReportActionHandler executes the logic to download the report.
 //Parameters:
 //* {{{processParameters}}}: The process parameters is an object that includes the action handler implementing the download, the report id that it is being executed and the process definition id.
 //* {{{tmpfileName}}}: Name of the temporary file.
@@ -164,4 +181,24 @@
   params.mode = 'DOWNLOAD';
   OB.Utilities.postThroughHiddenForm(OB.Application.contextUrl + 'org.openbravo.client.kernel', params);
 
+});
+
+//** {{{ OBUIAPP_browseReport }}} **
+//This action is used by the BaseReportActionHandler to show in a new tab the generated file with the
+//report result from the temporary location. The mode is changed to BROWSE so the BaseReportActionHandler
+//executes the logic to display the report.
+//Parameters:
+//* {{{processParameters}}}: The process parameters is an object that includes the action handler implementing the browsing, the report id that it is being executed and the process definition id.
+//* {{{tmpfileName}}}: Name of the temporary file.
+//* {{{fileName}}}: The name to be used in the file to download.
+OB.Utilities.Action.set('OBUIAPP_browseReport', function (paramObj) {
+  var processParameters = paramObj.processParameters,
+      params = isc.clone(processParameters);
+  OB.Layout.ViewManager.openView('OBClassicWindow', {
+    tabTitle: paramObj.tabTitle,
+    addToRecents: false,
+    isProcessDefinitionReport: true,
+    obManualURL: '/org.openbravo.client.kernel?_action=' + processParameters.actionHandler + '&reportId=' + processParameters.reportId + '&processId=' + processParameters.processId + '&tmpfileName=' + paramObj.tmpfileName + '&fileName=' + paramObj.fileName + '&mode=BROWSE&vScroll=auto',
+    command: 'DEFAULT'
+  });
 });
\ No newline at end of file
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.31055]]></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[PR16Q4.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	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.31055]]></STARTVERSION>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.31055]]></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[PR16Q4.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	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.31055]]></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.30447]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.31055]]></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.30447]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.31055]]></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/CSSMinimizer.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/CSSMinimizer.java	Wed Jan 25 05:32:50 2017 +0000
@@ -72,8 +72,6 @@
    * 
    * @param input
    *          Where to read the CSS from
-   * @param out
-   *          Where to write the result to
    */
   public static String formatString(String input) {
     StringBuffer generatedSB = new StringBuffer();
@@ -176,7 +174,7 @@
    * 
    * @param selector
    *          The selector; for example, "div { border: solid 1px red; color: blue; }"
-   * @throws Exception
+   * @throws IncompleteSelectorException
    *           If the selector is incomplete and cannot be parsed.
    */
   public Selector(String selector) throws IncompleteSelectorException,
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/RequestContext.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/RequestContext.java	Wed Jan 25 05:32:50 2017 +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-2015 Openbravo SLU 
+ * All portions are Copyright (C) 2009-2016 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -226,7 +226,6 @@
       return delegate.getAttribute(arg0);
     }
 
-    @SuppressWarnings("unchecked")
     public Enumeration<String> getAttributeNames() {
       if (delegate == null) {
         final List<String> names = new ArrayList<String>();
@@ -275,7 +274,6 @@
       return delegate.getParameter(arg0);
     }
 
-    @SuppressWarnings("unchecked")
     public Enumeration<String> getParameterNames() {
       final List<String> names = new ArrayList<String>();
       names.addAll(parameters.keySet());
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java	Wed Jan 25 05:32:50 2017 +0000
@@ -243,7 +243,7 @@
    *          String with the name of the column that has the default value.
    * @param defaultValueExpression
    *          String with the default value expression.
-   * @param window
+   * @param windowId
    *          String with the window id.
    * @return String with the calculated default value.
    */
@@ -451,17 +451,8 @@
     // value is properly selected.
     result.append(", selectOnClick: true");
 
-    Boolean canSort;
-    Boolean canFilter;
-
-    if ((field.getTab().isObuiappCanAdd() || field.getTab().isObuiappCanDelete())
-        && field.getTab().getWindow().getWindowType().equals("OBUIAPP_PickAndExecute")) {
-      canSort = false;
-      canFilter = false;
-    } else {
-      canSort = (Boolean) readGridConfigurationSetting("canSort");
-      canFilter = (Boolean) readGridConfigurationSetting("canFilter");
-    }
+    Boolean canSort = (Boolean) readGridConfigurationSetting("canSort");
+    Boolean canFilter = (Boolean) readGridConfigurationSetting("canFilter");
 
     if (canSort != null) {
       result.append(", canSort: " + canSort.toString());
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinitionController.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinitionController.java	Wed Jan 25 05:32:50 2017 +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-2013 Openbravo SLU 
+ * All portions are Copyright (C) 2009-2016 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -53,9 +53,9 @@
 
   private static UIDefinitionController instance = new UIDefinitionController();
 
-  public static String SHORTFORMAT_QUALIFIER = "Relation";
-  public static String INPUTFORMAT_QUALIFIER = "Edition";
-  public static String NORMALFORMAT_QUALIFIER = "Inform";
+  public static final String SHORTFORMAT_QUALIFIER = "Relation";
+  public static final String INPUTFORMAT_QUALIFIER = "Edition";
+  public static final String NORMALFORMAT_QUALIFIER = "Inform";
 
   private static final String EncryptedStringReferenceID = "16EC6DF4A59747749FDF256B7FBBB058";
   private static final String HashedStringReferenecID = "C5C21C28B39E4683A91779F16C112E40";
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.31055]]></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[PR16Q4.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	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.31055]]></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.30447]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.31055]]></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/web/org.openbravo.client.myob/js/ob-myopenbravo.js	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js	Wed Jan 25 05:32:50 2017 +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-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -91,6 +91,8 @@
   adminMode: false,
   adminLevel: '',
   adminLevelValue: '',
+
+
   createLeftColumnLayout: function () {
     var me = this,
         i, recentViewsLayout, recentViewsLinksLayout, recentDocumentsLayout, recentDocumentsLinksLayout, addWidgetLayout, adminOtherMyOBLayout, refreshLayout;
@@ -191,7 +193,10 @@
       contents: OB.I18N.getLabel('OBKMO_WMO_Refresh'),
       action: function () {
         OB.MyOB.reloadWidgets();
-      }
+      },
+      canFocus: true,
+      showFocused: true,
+      showRollOver: true
     }));
 
     // the available widget classes the user may/can create
@@ -228,7 +233,10 @@
         } else {
           this.doOpen();
         }
-      }
+      },
+      canFocus: true,
+      showFocused: true,
+      showRollOver: true
     }));
 
     if (this.enableAdminMode) {
@@ -265,7 +273,10 @@
           } else {
             this.doOpen();
           }
-        }
+        },
+        canFocus: true,
+        showFocused: true,
+        showRollOver: true
       }));
     }
 
@@ -288,7 +299,6 @@
     this.leftColumnLayout.addMember(isc.VLayout.create({
       height: 10
     }));
-
     this.leftColumnLayout.recentViewsLayout = recentViewsLayout;
     this.leftColumnLayout.recentDocumentsLayout = recentDocumentsLayout;
     this.leftColumnLayout.addWidgetLayout = addWidgetLayout;
@@ -436,7 +446,7 @@
 
   setRecentList: function (layout) {
     var recentList, newRecent, handleClickFunction, recentIndex = 0,
-        recent, lbl, newIcon, entryLayout, icon, destroyFunction;
+        recent, lbl, newIcon, entryLayout, icon, destroyFunction, handleEnterKeyPressFunction;
 
     // start with a fresh content
     layout.destroyAndRemoveMembers(layout.members);
@@ -463,6 +473,13 @@
         }
       };
 
+      handleEnterKeyPressFunction = function () {
+        var keyName = isc.EH.lastEvent.keyName;
+        if (keyName === 'Enter' || keyName === 'Space') {
+          return this.handleClick();
+        }
+      };
+
       destroyFunction = function () {
         this.destroyAndRemoveMembers(this.members);
         this.Super('destroy', arguments);
@@ -504,9 +521,12 @@
             baseStyle: OB.Styles.OBMyOpenbravo.recentViewsLayout.Label.baseStyle,
             handleClick: handleClickFunction,
             iconOrientation: 'left',
-            icon: icon
+            icon: icon,
+            canFocus: true,
+            handleKeyPress: handleEnterKeyPressFunction,
+            showFocused: true,
+            showRollOver: true
           });
-
           entryLayout = isc.HLayout.create({
             defaultLayoutAlign: 'center',
             width: '100%',
@@ -548,7 +568,7 @@
 
   setRecentDocumentsList: function (layout) {
     var recentList, newRecent, recentIndex = 0,
-        recent, lbl, newIcon, entryLayout, icon, handleClickFunction;
+        recent, lbl, newIcon, entryLayout, icon, handleClickFunction, handleEnterKeyPressFunction;
 
     // start with a fresh content
     layout.destroyAndRemoveMembers(layout.members);
@@ -566,6 +586,13 @@
         OB.Layout.ViewManager.openView(this.recent.viewId, this.recent, null, true);
       };
 
+      handleEnterKeyPressFunction = function () {
+        var keyName = isc.EH.lastEvent.keyName;
+        if (keyName === 'Enter' || keyName === 'Space') {
+          this.handleClick();
+        }
+      };
+
       for (; recentIndex < recentList.length; recentIndex++) {
         if (recentList[recentIndex]) {
           recent = recentList[recentIndex];
@@ -582,7 +609,11 @@
             baseStyle: OB.Styles.OBMyOpenbravo.recentDocumentsLayout.Label.baseStyle,
             handleClick: handleClickFunction,
             iconOrientation: 'left',
-            icon: OB.Styles.OBMyOpenbravo.recentDocumentsLayout.Label.icon
+            icon: OB.Styles.OBMyOpenbravo.recentDocumentsLayout.Label.icon,
+            canFocus: true,
+            handleKeyPress: handleEnterKeyPressFunction,
+            showFocused: true,
+            showRollOver: true
           });
 
           entryLayout = isc.HLayout.create({
--- a/modules/org.openbravo.client.myob/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.myob/ob-myopenbravo-styles.css	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.myob/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.myob/ob-myopenbravo-styles.css	Wed Jan 25 05:32:50 2017 +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 Openbravo SLU
+ * All portions are Copyright (C) 2011-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -38,6 +38,9 @@
   padding-right: 12px;
 }
 
+.OBMyOBLeftColumnLinkOver,
+.OBMyOBLeftColumnLinkFocusedOver,
+.OBMyOBLeftColumnLinkFocused,
 .OBMyOBLeftColumnLink {
   color: #000;
   padding-top: 10px;
@@ -45,10 +48,18 @@
   cursor: pointer;
 }
 
+.OBMyOBLeftColumnLinkFocusedOver,
+.OBMyOBLeftColumnLinkOver,
 .OBMyOBLeftColumnLink:hover {
   text-decoration: underline;
 }
 
+.OBMyOBLeftColumnLinkFocusedOver,
+.OBMyOBLeftColumnLinkFocused,
+.OBMyOBLeftColumnLink:focus {
+  color: #fa962f;
+}
+
 
 /* RecentViews */
 .OBMyOBRecentViews {
@@ -57,6 +68,9 @@
   font-weight: bold;
 }
 
+.OBMyOBRecentViewsEntryFocused,
+.OBMyOBRecentViewsEntryFocusedOver,
+.OBMyOBRecentViewsEntryOver,
 .OBMyOBRecentViewsEntry {
   cursor: pointer;
   font-family: 'lucida sans', sans-serif;
@@ -64,10 +78,18 @@
   padding: 4px;
 }
 
+.OBMyOBRecentViewsEntryFocusedOver,
+.OBMyOBRecentViewsEntryOver,
 .OBMyOBRecentViewsEntry:hover {
   text-decoration: underline;
 }
 
+.OBMyOBRecentViewsEntryFocusedOver,
+.OBMyOBRecentViewsEntryFocused,
+.OBMyOBRecentViewsEntry:focus {
+  color: #fa962f;
+}
+
 
 /* Left menu Dialogs */
 .OBMyOBDialog {
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.31055]]></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[PR16Q4.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	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.31055]]></STARTVERSION>
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.client.widgets/src-db/database/model/views/OBWCL_STOCK_BY_WAREHOUSE_V.xml	Wed Jan 25 05:32:50 2017 +0000
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+  <database name="VIEW OBWCL_STOCK_BY_WAREHOUSE_V">
+    <view name="OBWCL_STOCK_BY_WAREHOUSE_V"><![CDATA[SELECT sd.m_product_id || sd.m_storage_detail_id AS obwcl_stock_by_warehouse_v_id, p.ad_client_id, p.isactive, p.created, p.createdby, p.updated, p.updatedby, o.ad_org_id, o.name AS orgname, w.m_warehouse_id, w.name AS warehousename, p.m_product_id, p.value, p.name AS productname, pc.m_product_category_id, pc.name AS categoryname, u.name AS uomname, sd.description, sd.qtyonhand FROM (SELECT max(sd_1.m_storage_detail_id) AS m_storage_detail_id, sd_1.m_product_id, sd_1.c_uom_id, l.m_warehouse_id, a.description, sum(sd_1.qtyonhand) AS qtyonhand FROM m_storage_detail sd_1 JOIN m_locator l ON sd_1.m_locator_id = l.m_locator_id JOIN m_attributesetinstance a ON sd_1.m_attributesetinstance_id = a.m_attributesetinstance_id WHERE COALESCE(sd_1.qtyonhand, 0) <> 0 OR COALESCE(sd_1.qtyorderonhand, 0) <> 0 GROUP BY sd_1.m_product_id, sd_1.c_uom_id, l.m_warehouse_id, a.description HAVING sum(sd_1.qtyonhand) <> 0 OR sum(sd_1.qtyorderonhand) <> 0) sd JOIN m_product p ON sd.m_product_id = p.m_product_id JOIN m_product_category pc ON p.m_product_category_id = pc.m_product_category_id JOIN m_warehouse w ON sd.m_warehouse_id = w.m_warehouse_id JOIN ad_org o ON w.ad_org_id = o.ad_org_id JOIN c_uom u ON sd.c_uom_id = u.c_uom_id WHERE p.isactive = 'Y' AND p.isstocked = 'Y']]></view>
+  </database>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_COLUMN.xml	Wed Jan 25 05:32:50 2017 +0000
@@ -0,0 +1,719 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<data>
+<!--06D974D658C2455FB61B719781A2B637--><AD_COLUMN>
+<!--06D974D658C2455FB61B719781A2B637-->  <AD_COLUMN_ID><![CDATA[06D974D658C2455FB61B719781A2B637]]></AD_COLUMN_ID>
+<!--06D974D658C2455FB61B719781A2B637-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--06D974D658C2455FB61B719781A2B637-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--06D974D658C2455FB61B719781A2B637-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--06D974D658C2455FB61B719781A2B637-->  <NAME><![CDATA[Client]]></NAME>
+<!--06D974D658C2455FB61B719781A2B637-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--06D974D658C2455FB61B719781A2B637-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--06D974D658C2455FB61B719781A2B637-->  <COLUMNNAME><![CDATA[AD_Client_ID]]></COLUMNNAME>
+<!--06D974D658C2455FB61B719781A2B637-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--06D974D658C2455FB61B719781A2B637-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--06D974D658C2455FB61B719781A2B637-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--06D974D658C2455FB61B719781A2B637-->  <DEFAULTVALUE><![CDATA[@AD_CLIENT_ID@]]></DEFAULTVALUE>
+<!--06D974D658C2455FB61B719781A2B637-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--06D974D658C2455FB61B719781A2B637-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--06D974D658C2455FB61B719781A2B637-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--06D974D658C2455FB61B719781A2B637-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--06D974D658C2455FB61B719781A2B637-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--06D974D658C2455FB61B719781A2B637-->  <SEQNO><![CDATA[140]]></SEQNO>
+<!--06D974D658C2455FB61B719781A2B637-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--06D974D658C2455FB61B719781A2B637-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--06D974D658C2455FB61B719781A2B637-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--06D974D658C2455FB61B719781A2B637-->  <AD_ELEMENT_ID><![CDATA[102]]></AD_ELEMENT_ID>
+<!--06D974D658C2455FB61B719781A2B637-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--06D974D658C2455FB61B719781A2B637-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--06D974D658C2455FB61B719781A2B637-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--06D974D658C2455FB61B719781A2B637-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--06D974D658C2455FB61B719781A2B637-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--06D974D658C2455FB61B719781A2B637-->  <POSITION><![CDATA[14]]></POSITION>
+<!--06D974D658C2455FB61B719781A2B637-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--06D974D658C2455FB61B719781A2B637-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--06D974D658C2455FB61B719781A2B637-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--06D974D658C2455FB61B719781A2B637-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--06D974D658C2455FB61B719781A2B637-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--06D974D658C2455FB61B719781A2B637-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--06D974D658C2455FB61B719781A2B637-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--06D974D658C2455FB61B719781A2B637-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--06D974D658C2455FB61B719781A2B637--></AD_COLUMN>
+
+<!--06DDA74009444320B5CB67B3DE99E1FE--><AD_COLUMN>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <AD_COLUMN_ID><![CDATA[06DDA74009444320B5CB67B3DE99E1FE]]></AD_COLUMN_ID>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <NAME><![CDATA[Product Category]]></NAME>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <DESCRIPTION><![CDATA[A classification of items based on similar characteristics or attributes.]]></DESCRIPTION>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <HELP><![CDATA[Identifies the category which this product belongs to.  Product categories are used for pricing.]]></HELP>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <COLUMNNAME><![CDATA[M_Product_Category_ID]]></COLUMNNAME>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <SEQNO><![CDATA[90]]></SEQNO>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <AD_ELEMENT_ID><![CDATA[453]]></AD_ELEMENT_ID>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <POSITION><![CDATA[9]]></POSITION>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--06DDA74009444320B5CB67B3DE99E1FE--></AD_COLUMN>
+
+<!--0FE9B55261314ACEB7235297818D5B41--><AD_COLUMN>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <AD_COLUMN_ID><![CDATA[0FE9B55261314ACEB7235297818D5B41]]></AD_COLUMN_ID>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <NAME><![CDATA[Search Key]]></NAME>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <DESCRIPTION><![CDATA[A fast method for finding a particular record.]]></DESCRIPTION>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <HELP><![CDATA[A search key allows for a fast method of finding a particular record. If you leave the search key empty, the system automatically creates a numeric number originating from a document sequence defined in the  "Document Sequence" window. The sequence naming convention follows a rule "DocumentNo_TableName", where TableName is the actual name of the database table (e.g. C_Order).
+
+Usually, company's internal identifiers for various records (products, customers, etc) are stored here.]]></HELP>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <COLUMNNAME><![CDATA[Value]]></COLUMNNAME>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <FIELDLENGTH><![CDATA[40]]></FIELDLENGTH>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <AD_ELEMENT_ID><![CDATA[620]]></AD_ELEMENT_ID>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <POSITION><![CDATA[5]]></POSITION>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--0FE9B55261314ACEB7235297818D5B41--></AD_COLUMN>
+
+<!--13D633E6F18B4240B912581876AAF521--><AD_COLUMN>
+<!--13D633E6F18B4240B912581876AAF521-->  <AD_COLUMN_ID><![CDATA[13D633E6F18B4240B912581876AAF521]]></AD_COLUMN_ID>
+<!--13D633E6F18B4240B912581876AAF521-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--13D633E6F18B4240B912581876AAF521-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--13D633E6F18B4240B912581876AAF521-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--13D633E6F18B4240B912581876AAF521-->  <NAME><![CDATA[Updated By]]></NAME>
+<!--13D633E6F18B4240B912581876AAF521-->  <DESCRIPTION><![CDATA[User who updated this records]]></DESCRIPTION>
+<!--13D633E6F18B4240B912581876AAF521-->  <HELP><![CDATA[The Updated By field indicates the user who updated this record.]]></HELP>
+<!--13D633E6F18B4240B912581876AAF521-->  <COLUMNNAME><![CDATA[Updatedby]]></COLUMNNAME>
+<!--13D633E6F18B4240B912581876AAF521-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--13D633E6F18B4240B912581876AAF521-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--13D633E6F18B4240B912581876AAF521-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--13D633E6F18B4240B912581876AAF521-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--13D633E6F18B4240B912581876AAF521-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--13D633E6F18B4240B912581876AAF521-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--13D633E6F18B4240B912581876AAF521-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--13D633E6F18B4240B912581876AAF521-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--13D633E6F18B4240B912581876AAF521-->  <SEQNO><![CDATA[190]]></SEQNO>
+<!--13D633E6F18B4240B912581876AAF521-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--13D633E6F18B4240B912581876AAF521-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--13D633E6F18B4240B912581876AAF521-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--13D633E6F18B4240B912581876AAF521-->  <AD_ELEMENT_ID><![CDATA[608]]></AD_ELEMENT_ID>
+<!--13D633E6F18B4240B912581876AAF521-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--13D633E6F18B4240B912581876AAF521-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--13D633E6F18B4240B912581876AAF521-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--13D633E6F18B4240B912581876AAF521-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--13D633E6F18B4240B912581876AAF521-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--13D633E6F18B4240B912581876AAF521-->  <POSITION><![CDATA[19]]></POSITION>
+<!--13D633E6F18B4240B912581876AAF521-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--13D633E6F18B4240B912581876AAF521-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--13D633E6F18B4240B912581876AAF521-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--13D633E6F18B4240B912581876AAF521-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--13D633E6F18B4240B912581876AAF521-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--13D633E6F18B4240B912581876AAF521-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--13D633E6F18B4240B912581876AAF521-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--13D633E6F18B4240B912581876AAF521-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--13D633E6F18B4240B912581876AAF521--></AD_COLUMN>
+
+<!--21B675B173D34598B4E21FFC80531EF7--><AD_COLUMN>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <AD_COLUMN_ID><![CDATA[21B675B173D34598B4E21FFC80531EF7]]></AD_COLUMN_ID>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <NAME><![CDATA[Quantity on Hand]]></NAME>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <DESCRIPTION><![CDATA[On Hand Quantity]]></DESCRIPTION>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <HELP><![CDATA[The On Hand Quantity indicates the quantity of a product that is on hand in a warehouse.]]></HELP>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <COLUMNNAME><![CDATA[Qtyonhand]]></COLUMNNAME>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <AD_REFERENCE_ID><![CDATA[29]]></AD_REFERENCE_ID>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <AD_ELEMENT_ID><![CDATA[530]]></AD_ELEMENT_ID>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <POSITION><![CDATA[11]]></POSITION>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--21B675B173D34598B4E21FFC80531EF7--></AD_COLUMN>
+
+<!--2A299D4DCE1043529CFBFC933DA2A4FD--><AD_COLUMN>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <AD_COLUMN_ID><![CDATA[2A299D4DCE1043529CFBFC933DA2A4FD]]></AD_COLUMN_ID>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <NAME><![CDATA[Warehouse Name]]></NAME>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <COLUMNNAME><![CDATA[Warehousename]]></COLUMNNAME>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <AD_ELEMENT_ID><![CDATA[83F192931C7142E7872BFE1428EE5C66]]></AD_ELEMENT_ID>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <POSITION><![CDATA[3]]></POSITION>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD--></AD_COLUMN>
+
+<!--39C7E523BBED43C5846CCE4F5AB02739--><AD_COLUMN>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <AD_COLUMN_ID><![CDATA[39C7E523BBED43C5846CCE4F5AB02739]]></AD_COLUMN_ID>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <NAME><![CDATA[Product Name]]></NAME>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <COLUMNNAME><![CDATA[Productname]]></COLUMNNAME>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <AD_ELEMENT_ID><![CDATA[C30C07EF67E648AB9DDCA74E8449B866]]></AD_ELEMENT_ID>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <POSITION><![CDATA[6]]></POSITION>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--39C7E523BBED43C5846CCE4F5AB02739--></AD_COLUMN>
+
+<!--54916FD9A1EC4090B2E6877E1A78B968--><AD_COLUMN>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <AD_COLUMN_ID><![CDATA[54916FD9A1EC4090B2E6877E1A78B968]]></AD_COLUMN_ID>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <NAME><![CDATA[Description]]></NAME>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <DESCRIPTION><![CDATA[A space to write additional related information.]]></DESCRIPTION>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <HELP><![CDATA[A description is limited to 255 characters.]]></HELP>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <COLUMNNAME><![CDATA[Description]]></COLUMNNAME>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <FIELDLENGTH><![CDATA[255]]></FIELDLENGTH>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <SEQNO><![CDATA[120]]></SEQNO>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <AD_ELEMENT_ID><![CDATA[275]]></AD_ELEMENT_ID>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <POSITION><![CDATA[12]]></POSITION>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--54916FD9A1EC4090B2E6877E1A78B968--></AD_COLUMN>
+
+<!--6117F7BC72F946E6A1D628381E7D7245--><AD_COLUMN>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <AD_COLUMN_ID><![CDATA[6117F7BC72F946E6A1D628381E7D7245]]></AD_COLUMN_ID>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <NAME><![CDATA[Created By]]></NAME>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <DESCRIPTION><![CDATA[User who created this records]]></DESCRIPTION>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <HELP><![CDATA[The Created By field indicates the user who created this record.]]></HELP>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <COLUMNNAME><![CDATA[Createdby]]></COLUMNNAME>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <SEQNO><![CDATA[170]]></SEQNO>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <AD_ELEMENT_ID><![CDATA[246]]></AD_ELEMENT_ID>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <POSITION><![CDATA[17]]></POSITION>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--6117F7BC72F946E6A1D628381E7D7245--></AD_COLUMN>
+
+<!--64F5D19FD3A84FE984B4E2879700FFA0--><AD_COLUMN>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <AD_COLUMN_ID><![CDATA[64F5D19FD3A84FE984B4E2879700FFA0]]></AD_COLUMN_ID>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <NAME><![CDATA[Updated]]></NAME>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <SEQNO><![CDATA[180]]></SEQNO>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <AD_ELEMENT_ID><![CDATA[607]]></AD_ELEMENT_ID>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <POSITION><![CDATA[18]]></POSITION>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--64F5D19FD3A84FE984B4E2879700FFA0--></AD_COLUMN>
+
+<!--744A1539F3544FA09AD8E6118D0247C4--><AD_COLUMN>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <AD_COLUMN_ID><![CDATA[744A1539F3544FA09AD8E6118D0247C4]]></AD_COLUMN_ID>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <NAME><![CDATA[Product Category Name]]></NAME>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <COLUMNNAME><![CDATA[Categoryname]]></COLUMNNAME>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <AD_ELEMENT_ID><![CDATA[FD26CDBF9E664164AA0E5DA365F44F44]]></AD_ELEMENT_ID>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <POSITION><![CDATA[8]]></POSITION>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--744A1539F3544FA09AD8E6118D0247C4--></AD_COLUMN>
+
+<!--91F12EFDBB0041268CB300DC098DF148--><AD_COLUMN>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <AD_COLUMN_ID><![CDATA[91F12EFDBB0041268CB300DC098DF148]]></AD_COLUMN_ID>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <NAME><![CDATA[Warehouse]]></NAME>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <DESCRIPTION><![CDATA[The location where products arrive to or are sent from.]]></DESCRIPTION>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <HELP><![CDATA[The Warehouse identifies a unique Warehouse where products are stored or Services are provided.]]></HELP>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <COLUMNNAME><![CDATA[M_Warehouse_ID]]></COLUMNNAME>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <SEQNO><![CDATA[130]]></SEQNO>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <AD_ELEMENT_ID><![CDATA[459]]></AD_ELEMENT_ID>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <POSITION><![CDATA[13]]></POSITION>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--91F12EFDBB0041268CB300DC098DF148--></AD_COLUMN>
+
+<!--9D7286015DBD48FEAE695D83265CFEBA--><AD_COLUMN>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <AD_COLUMN_ID><![CDATA[9D7286015DBD48FEAE695D83265CFEBA]]></AD_COLUMN_ID>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <NAME><![CDATA[Orgname]]></NAME>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <COLUMNNAME><![CDATA[Orgname]]></COLUMNNAME>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <AD_ELEMENT_ID><![CDATA[4DD6EF0E4F104300975B5B49ABCB3484]]></AD_ELEMENT_ID>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <POSITION><![CDATA[2]]></POSITION>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--9D7286015DBD48FEAE695D83265CFEBA--></AD_COLUMN>
+
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2--><AD_COLUMN>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <AD_COLUMN_ID><![CDATA[A6EB6CB9E7384043B0B65D7094CD4CC2]]></AD_COLUMN_ID>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <NAME><![CDATA[Creation Date]]></NAME>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <DESCRIPTION><![CDATA[The date that this record is completed.]]></DESCRIPTION>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <HELP><![CDATA[The Created field indicates the date that this record was created.]]></HELP>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <COLUMNNAME><![CDATA[Created]]></COLUMNNAME>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <SEQNO><![CDATA[160]]></SEQNO>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <AD_ELEMENT_ID><![CDATA[245]]></AD_ELEMENT_ID>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <POSITION><![CDATA[16]]></POSITION>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2--></AD_COLUMN>
+
+<!--AEC8374FCF604585B9D944C5921E69DF--><AD_COLUMN>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <AD_COLUMN_ID><![CDATA[AEC8374FCF604585B9D944C5921E69DF]]></AD_COLUMN_ID>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <NAME><![CDATA[Active]]></NAME>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <HELP><![CDATA[There are two methods of making records unavailable in the system: One is to delete the record, the other is to de-activate the record. A de-activated record is not available for selection, but available for reporting. There are two reasons for de-activating and not deleting records: 
+(1) The system requires the record for auditing purposes.
+(2) The record is referenced by other records. E.g., you cannot delete a Business Partner, if there are existing invoices for it. By de-activating the Business Partner you prevent it from being used in future transactions.]]></HELP>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <COLUMNNAME><![CDATA[Isactive]]></COLUMNNAME>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <SEQNO><![CDATA[150]]></SEQNO>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <AD_ELEMENT_ID><![CDATA[348]]></AD_ELEMENT_ID>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <POSITION><![CDATA[15]]></POSITION>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--AEC8374FCF604585B9D944C5921E69DF--></AD_COLUMN>
+
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5--><AD_COLUMN>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <AD_COLUMN_ID><![CDATA[BCEF7EAA55144BF6A83BC4D76AD64CD5]]></AD_COLUMN_ID>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <NAME><![CDATA[Organization]]></NAME>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <DEFAULTVALUE><![CDATA[@AD_ORG_ID@]]></DEFAULTVALUE>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <POSITION><![CDATA[4]]></POSITION>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5--></AD_COLUMN>
+
+<!--C7BEA57889594B81A8388FF58B8FED62--><AD_COLUMN>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <AD_COLUMN_ID><![CDATA[C7BEA57889594B81A8388FF58B8FED62]]></AD_COLUMN_ID>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <NAME><![CDATA[Stock By Warehouse View]]></NAME>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <COLUMNNAME><![CDATA[Obwcl_Stock_By_Warehouse_V_ID]]></COLUMNNAME>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <FIELDLENGTH><![CDATA[64]]></FIELDLENGTH>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ISKEY><![CDATA[Y]]></ISKEY>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <SEQNO><![CDATA[200]]></SEQNO>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <AD_ELEMENT_ID><![CDATA[A6C7103ED87049F3B87CC96C05F56722]]></AD_ELEMENT_ID>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--C7BEA57889594B81A8388FF58B8FED62--></AD_COLUMN>
+
+<!--C9B0AC9139444AB599AABF5E762D27E8--><AD_COLUMN>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <AD_COLUMN_ID><![CDATA[C9B0AC9139444AB599AABF5E762D27E8]]></AD_COLUMN_ID>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <NAME><![CDATA[UOM Name]]></NAME>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <COLUMNNAME><![CDATA[Uomname]]></COLUMNNAME>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <SEQNO><![CDATA[100]]></SEQNO>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <AD_ELEMENT_ID><![CDATA[7C0B2441091D498A8B7885FEE83F38DF]]></AD_ELEMENT_ID>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <POSITION><![CDATA[10]]></POSITION>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--C9B0AC9139444AB599AABF5E762D27E8--></AD_COLUMN>
+
+<!--CBDDD2456D1743C6AB544BBA2478091C--><AD_COLUMN>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <AD_COLUMN_ID><![CDATA[CBDDD2456D1743C6AB544BBA2478091C]]></AD_COLUMN_ID>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <NAME><![CDATA[Product]]></NAME>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <DESCRIPTION><![CDATA[An item produced by a process.]]></DESCRIPTION>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <HELP><![CDATA[Identifies an item which is either purchased or sold in this organization.]]></HELP>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <COLUMNNAME><![CDATA[M_Product_ID]]></COLUMNNAME>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <AD_REFERENCE_VALUE_ID><![CDATA[800060]]></AD_REFERENCE_VALUE_ID>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <AD_ELEMENT_ID><![CDATA[454]]></AD_ELEMENT_ID>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <POSITION><![CDATA[7]]></POSITION>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--CBDDD2456D1743C6AB544BBA2478091C--></AD_COLUMN>
+
+</data>
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_ELEMENT.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_ELEMENT.xml	Wed Jan 25 05:32:50 2017 +0000
@@ -12,6 +12,42 @@
 <!--32873C7A39ED464F9D781AB4BE08323B-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--32873C7A39ED464F9D781AB4BE08323B--></AD_ELEMENT>
 
+<!--4DD6EF0E4F104300975B5B49ABCB3484--><AD_ELEMENT>
+<!--4DD6EF0E4F104300975B5B49ABCB3484-->  <AD_ELEMENT_ID><![CDATA[4DD6EF0E4F104300975B5B49ABCB3484]]></AD_ELEMENT_ID>
+<!--4DD6EF0E4F104300975B5B49ABCB3484-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4DD6EF0E4F104300975B5B49ABCB3484-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4DD6EF0E4F104300975B5B49ABCB3484-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4DD6EF0E4F104300975B5B49ABCB3484-->  <COLUMNNAME><![CDATA[Orgname]]></COLUMNNAME>
+<!--4DD6EF0E4F104300975B5B49ABCB3484-->  <NAME><![CDATA[Orgname]]></NAME>
+<!--4DD6EF0E4F104300975B5B49ABCB3484-->  <PRINTNAME><![CDATA[Orgname]]></PRINTNAME>
+<!--4DD6EF0E4F104300975B5B49ABCB3484-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--4DD6EF0E4F104300975B5B49ABCB3484-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--4DD6EF0E4F104300975B5B49ABCB3484--></AD_ELEMENT>
+
+<!--7C0B2441091D498A8B7885FEE83F38DF--><AD_ELEMENT>
+<!--7C0B2441091D498A8B7885FEE83F38DF-->  <AD_ELEMENT_ID><![CDATA[7C0B2441091D498A8B7885FEE83F38DF]]></AD_ELEMENT_ID>
+<!--7C0B2441091D498A8B7885FEE83F38DF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7C0B2441091D498A8B7885FEE83F38DF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7C0B2441091D498A8B7885FEE83F38DF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7C0B2441091D498A8B7885FEE83F38DF-->  <COLUMNNAME><![CDATA[Uomname]]></COLUMNNAME>
+<!--7C0B2441091D498A8B7885FEE83F38DF-->  <NAME><![CDATA[UOM Name]]></NAME>
+<!--7C0B2441091D498A8B7885FEE83F38DF-->  <PRINTNAME><![CDATA[UOM Name]]></PRINTNAME>
+<!--7C0B2441091D498A8B7885FEE83F38DF-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--7C0B2441091D498A8B7885FEE83F38DF-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--7C0B2441091D498A8B7885FEE83F38DF--></AD_ELEMENT>
+
+<!--83F192931C7142E7872BFE1428EE5C66--><AD_ELEMENT>
+<!--83F192931C7142E7872BFE1428EE5C66-->  <AD_ELEMENT_ID><![CDATA[83F192931C7142E7872BFE1428EE5C66]]></AD_ELEMENT_ID>
+<!--83F192931C7142E7872BFE1428EE5C66-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--83F192931C7142E7872BFE1428EE5C66-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--83F192931C7142E7872BFE1428EE5C66-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--83F192931C7142E7872BFE1428EE5C66-->  <COLUMNNAME><![CDATA[Warehousename]]></COLUMNNAME>
+<!--83F192931C7142E7872BFE1428EE5C66-->  <NAME><![CDATA[Warehouse Name]]></NAME>
+<!--83F192931C7142E7872BFE1428EE5C66-->  <PRINTNAME><![CDATA[Warehouse Name]]></PRINTNAME>
+<!--83F192931C7142E7872BFE1428EE5C66-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--83F192931C7142E7872BFE1428EE5C66-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--83F192931C7142E7872BFE1428EE5C66--></AD_ELEMENT>
+
 <!--9C7735D7BEB33C9EE040A8C0EB06271C--><AD_ELEMENT>
 <!--9C7735D7BEB33C9EE040A8C0EB06271C-->  <AD_ELEMENT_ID><![CDATA[9C7735D7BEB33C9EE040A8C0EB06271C]]></AD_ELEMENT_ID>
 <!--9C7735D7BEB33C9EE040A8C0EB06271C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -122,4 +158,40 @@
 <!--9C7735D7BEC33C9EE040A8C0EB06271C-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9C7735D7BEC33C9EE040A8C0EB06271C--></AD_ELEMENT>
 
+<!--A6C7103ED87049F3B87CC96C05F56722--><AD_ELEMENT>
+<!--A6C7103ED87049F3B87CC96C05F56722-->  <AD_ELEMENT_ID><![CDATA[A6C7103ED87049F3B87CC96C05F56722]]></AD_ELEMENT_ID>
+<!--A6C7103ED87049F3B87CC96C05F56722-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A6C7103ED87049F3B87CC96C05F56722-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A6C7103ED87049F3B87CC96C05F56722-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A6C7103ED87049F3B87CC96C05F56722-->  <COLUMNNAME><![CDATA[Obwcl_Stock_By_Warehouse_V_ID]]></COLUMNNAME>
+<!--A6C7103ED87049F3B87CC96C05F56722-->  <NAME><![CDATA[Stock By Warehouse View]]></NAME>
+<!--A6C7103ED87049F3B87CC96C05F56722-->  <PRINTNAME><![CDATA[Stock By Warehouse View]]></PRINTNAME>
+<!--A6C7103ED87049F3B87CC96C05F56722-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--A6C7103ED87049F3B87CC96C05F56722-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--A6C7103ED87049F3B87CC96C05F56722--></AD_ELEMENT>
+
+<!--C30C07EF67E648AB9DDCA74E8449B866--><AD_ELEMENT>
+<!--C30C07EF67E648AB9DDCA74E8449B866-->  <AD_ELEMENT_ID><![CDATA[C30C07EF67E648AB9DDCA74E8449B866]]></AD_ELEMENT_ID>
+<!--C30C07EF67E648AB9DDCA74E8449B866-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C30C07EF67E648AB9DDCA74E8449B866-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C30C07EF67E648AB9DDCA74E8449B866-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C30C07EF67E648AB9DDCA74E8449B866-->  <COLUMNNAME><![CDATA[Productname]]></COLUMNNAME>
+<!--C30C07EF67E648AB9DDCA74E8449B866-->  <NAME><![CDATA[Product Name]]></NAME>
+<!--C30C07EF67E648AB9DDCA74E8449B866-->  <PRINTNAME><![CDATA[Product Name]]></PRINTNAME>
+<!--C30C07EF67E648AB9DDCA74E8449B866-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--C30C07EF67E648AB9DDCA74E8449B866-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--C30C07EF67E648AB9DDCA74E8449B866--></AD_ELEMENT>
+
+<!--FD26CDBF9E664164AA0E5DA365F44F44--><AD_ELEMENT>
+<!--FD26CDBF9E664164AA0E5DA365F44F44-->  <AD_ELEMENT_ID><![CDATA[FD26CDBF9E664164AA0E5DA365F44F44]]></AD_ELEMENT_ID>
+<!--FD26CDBF9E664164AA0E5DA365F44F44-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FD26CDBF9E664164AA0E5DA365F44F44-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FD26CDBF9E664164AA0E5DA365F44F44-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FD26CDBF9E664164AA0E5DA365F44F44-->  <COLUMNNAME><![CDATA[Categoryname]]></COLUMNNAME>
+<!--FD26CDBF9E664164AA0E5DA365F44F44-->  <NAME><![CDATA[Product Category Name]]></NAME>
+<!--FD26CDBF9E664164AA0E5DA365F44F44-->  <PRINTNAME><![CDATA[Product Category Name]]></PRINTNAME>
+<!--FD26CDBF9E664164AA0E5DA365F44F44-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--FD26CDBF9E664164AA0E5DA365F44F44-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--FD26CDBF9E664164AA0E5DA365F44F44--></AD_ELEMENT>
+
 </data>
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.31055]]></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[PR16Q4.2]]></VERSION_LABEL>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--FF8080812D842086012D844F3CC0003E-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--FF8080812D842086012D844F3CC0003E-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--FF8080812D842086012D844F3CC0003E--></AD_MODULE>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DBPREFIX.xml	Wed Jan 25 05:32:50 2017 +0000
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<data>
+<!--DDD987A4FCC3430F9E8DE9DCF06EFA45--><AD_MODULE_DBPREFIX>
+<!--DDD987A4FCC3430F9E8DE9DCF06EFA45-->  <AD_MODULE_DBPREFIX_ID><![CDATA[DDD987A4FCC3430F9E8DE9DCF06EFA45]]></AD_MODULE_DBPREFIX_ID>
+<!--DDD987A4FCC3430F9E8DE9DCF06EFA45-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DDD987A4FCC3430F9E8DE9DCF06EFA45-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DDD987A4FCC3430F9E8DE9DCF06EFA45-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DDD987A4FCC3430F9E8DE9DCF06EFA45-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--DDD987A4FCC3430F9E8DE9DCF06EFA45-->  <NAME><![CDATA[OBWCL]]></NAME>
+<!--DDD987A4FCC3430F9E8DE9DCF06EFA45--></AD_MODULE_DBPREFIX>
+
+</data>
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.31055]]></STARTVERSION>
 <!--FF8080812D842086012D845002070046-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080812D842086012D845002070046-->  <DEPENDANT_MODULE_NAME><![CDATA[Workspace & Widgets]]></DEPENDANT_MODULE_NAME>
 <!--FF8080812D842086012D845002070046-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_PACKAGE.xml	Wed Jan 25 05:32:50 2017 +0000
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<data>
+<!--FEEE36C196994F6CAFC1B81C905B07B2--><AD_PACKAGE>
+<!--FEEE36C196994F6CAFC1B81C905B07B2-->  <AD_PACKAGE_ID><![CDATA[FEEE36C196994F6CAFC1B81C905B07B2]]></AD_PACKAGE_ID>
+<!--FEEE36C196994F6CAFC1B81C905B07B2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FEEE36C196994F6CAFC1B81C905B07B2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FEEE36C196994F6CAFC1B81C905B07B2-->  <NAME><![CDATA[org.openbravo.client.widgets]]></NAME>
+<!--FEEE36C196994F6CAFC1B81C905B07B2-->  <JAVAPACKAGE><![CDATA[org.openbravo.client.widgets]]></JAVAPACKAGE>
+<!--FEEE36C196994F6CAFC1B81C905B07B2-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--FEEE36C196994F6CAFC1B81C905B07B2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FEEE36C196994F6CAFC1B81C905B07B2--></AD_PACKAGE>
+
+</data>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_TABLE.xml	Wed Jan 25 05:32:50 2017 +0000
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<data>
+<!--8729F059389F45EAA096F2CB9C36CC65--><AD_TABLE>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <NAME><![CDATA[OBWCL_StockByWarehouseView]]></NAME>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <TABLENAME><![CDATA[OBWCL_Stock_By_Warehouse_V]]></TABLENAME>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <CLASSNAME><![CDATA[OBWCL_StockByWarehouseView]]></CLASSNAME>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <ISVIEW><![CDATA[Y]]></ISVIEW>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <ISSECURITYENABLED><![CDATA[N]]></ISSECURITYENABLED>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <ISDELETEABLE><![CDATA[N]]></ISDELETEABLE>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <ISHIGHVOLUME><![CDATA[N]]></ISHIGHVOLUME>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <IMPORTTABLE><![CDATA[N]]></IMPORTTABLE>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <ISCHANGELOG><![CDATA[N]]></ISCHANGELOG>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <ISDEFAULTACCT><![CDATA[N]]></ISDEFAULTACCT>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <AD_PACKAGE_ID><![CDATA[FEEE36C196994F6CAFC1B81C905B07B2]]></AD_PACKAGE_ID>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <ISTREE><![CDATA[N]]></ISTREE>
+<!--8729F059389F45EAA096F2CB9C36CC65--></AD_TABLE>
+
+</data>
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBCQL_QUERY_COLUMN.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBCQL_QUERY_COLUMN.xml	Wed Jan 25 05:32:50 2017 +0000
@@ -35,6 +35,25 @@
 <!--28F920CD36E14AFBB2025802363E8B02-->  <CAN_BE_FILTERED><![CDATA[N]]></CAN_BE_FILTERED>
 <!--28F920CD36E14AFBB2025802363E8B02--></OBCQL_QUERY_COLUMN>
 
+<!--321C5D48888745C3A042FF005E7375AC--><OBCQL_QUERY_COLUMN>
+<!--321C5D48888745C3A042FF005E7375AC-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[321C5D48888745C3A042FF005E7375AC]]></OBCQL_QUERY_COLUMN_ID>
+<!--321C5D48888745C3A042FF005E7375AC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--321C5D48888745C3A042FF005E7375AC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--321C5D48888745C3A042FF005E7375AC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--321C5D48888745C3A042FF005E7375AC-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[97FD9C124D5D409DB94BB6500A418A60]]></OBCQL_WIDGET_QUERY_ID>
+<!--321C5D48888745C3A042FF005E7375AC-->  <DISPLAY_EXPRESSION><![CDATA[store]]></DISPLAY_EXPRESSION>
+<!--321C5D48888745C3A042FF005E7375AC-->  <NAME><![CDATA[Organization]]></NAME>
+<!--321C5D48888745C3A042FF005E7375AC-->  <WIDTH><![CDATA[10]]></WIDTH>
+<!--321C5D48888745C3A042FF005E7375AC-->  <LINK_EXPRESSION><![CDATA[orgid]]></LINK_EXPRESSION>
+<!--321C5D48888745C3A042FF005E7375AC-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--321C5D48888745C3A042FF005E7375AC-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--321C5D48888745C3A042FF005E7375AC-->  <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
+<!--321C5D48888745C3A042FF005E7375AC-->  <HAS_LINK><![CDATA[Y]]></HAS_LINK>
+<!--321C5D48888745C3A042FF005E7375AC-->  <AD_TAB_ID><![CDATA[143]]></AD_TAB_ID>
+<!--321C5D48888745C3A042FF005E7375AC-->  <CAN_BE_FILTERED><![CDATA[Y]]></CAN_BE_FILTERED>
+<!--321C5D48888745C3A042FF005E7375AC-->  <WHERECLAUSE_LEFT_PART><![CDATA[orgName]]></WHERECLAUSE_LEFT_PART>
+<!--321C5D48888745C3A042FF005E7375AC--></OBCQL_QUERY_COLUMN>
+
 <!--39ECC838BD604F49BA07220A64D855A3--><OBCQL_QUERY_COLUMN>
 <!--39ECC838BD604F49BA07220A64D855A3-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[39ECC838BD604F49BA07220A64D855A3]]></OBCQL_QUERY_COLUMN_ID>
 <!--39ECC838BD604F49BA07220A64D855A3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -68,6 +87,44 @@
 <!--3A8324D4520B42B08DDED26BD05F98B5-->  <CAN_BE_FILTERED><![CDATA[N]]></CAN_BE_FILTERED>
 <!--3A8324D4520B42B08DDED26BD05F98B5--></OBCQL_QUERY_COLUMN>
 
+<!--3DA8615A37CD447EB85FE4B9386E8622--><OBCQL_QUERY_COLUMN>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[3DA8615A37CD447EB85FE4B9386E8622]]></OBCQL_QUERY_COLUMN_ID>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[97FD9C124D5D409DB94BB6500A418A60]]></OBCQL_WIDGET_QUERY_ID>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <DISPLAY_EXPRESSION><![CDATA[category]]></DISPLAY_EXPRESSION>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <NAME><![CDATA[Product Category]]></NAME>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <WIDTH><![CDATA[10]]></WIDTH>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <LINK_EXPRESSION><![CDATA[pcid]]></LINK_EXPRESSION>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <HAS_LINK><![CDATA[Y]]></HAS_LINK>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <AD_TAB_ID><![CDATA[189]]></AD_TAB_ID>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <CAN_BE_FILTERED><![CDATA[Y]]></CAN_BE_FILTERED>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <WHERECLAUSE_LEFT_PART><![CDATA[productCategoryName]]></WHERECLAUSE_LEFT_PART>
+<!--3DA8615A37CD447EB85FE4B9386E8622--></OBCQL_QUERY_COLUMN>
+
+<!--5CE9158CF68C406199B5D7E501F0AE0E--><OBCQL_QUERY_COLUMN>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[5CE9158CF68C406199B5D7E501F0AE0E]]></OBCQL_QUERY_COLUMN_ID>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[97FD9C124D5D409DB94BB6500A418A60]]></OBCQL_WIDGET_QUERY_ID>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <DISPLAY_EXPRESSION><![CDATA[warehouse]]></DISPLAY_EXPRESSION>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <NAME><![CDATA[Warehouse]]></NAME>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <WIDTH><![CDATA[10]]></WIDTH>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <LINK_EXPRESSION><![CDATA[whid]]></LINK_EXPRESSION>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <INCLUDE_IN><![CDATA[M]]></INCLUDE_IN>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <HAS_LINK><![CDATA[Y]]></HAS_LINK>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <AD_TAB_ID><![CDATA[178]]></AD_TAB_ID>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <CAN_BE_FILTERED><![CDATA[Y]]></CAN_BE_FILTERED>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <WHERECLAUSE_LEFT_PART><![CDATA[warehouseName]]></WHERECLAUSE_LEFT_PART>
+<!--5CE9158CF68C406199B5D7E501F0AE0E--></OBCQL_QUERY_COLUMN>
+
 <!--7D6F8F4432754AB5872B925CF2BD1E37--><OBCQL_QUERY_COLUMN>
 <!--7D6F8F4432754AB5872B925CF2BD1E37-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[7D6F8F4432754AB5872B925CF2BD1E37]]></OBCQL_QUERY_COLUMN_ID>
 <!--7D6F8F4432754AB5872B925CF2BD1E37-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -242,6 +299,38 @@
 <!--D3C5848B4225429A90B63B888EA5E1C6-->  <CAN_BE_FILTERED><![CDATA[N]]></CAN_BE_FILTERED>
 <!--D3C5848B4225429A90B63B888EA5E1C6--></OBCQL_QUERY_COLUMN>
 
+<!--DA677F18E1234D25850C4016B02CFB45--><OBCQL_QUERY_COLUMN>
+<!--DA677F18E1234D25850C4016B02CFB45-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[DA677F18E1234D25850C4016B02CFB45]]></OBCQL_QUERY_COLUMN_ID>
+<!--DA677F18E1234D25850C4016B02CFB45-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DA677F18E1234D25850C4016B02CFB45-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DA677F18E1234D25850C4016B02CFB45-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DA677F18E1234D25850C4016B02CFB45-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[97FD9C124D5D409DB94BB6500A418A60]]></OBCQL_WIDGET_QUERY_ID>
+<!--DA677F18E1234D25850C4016B02CFB45-->  <DISPLAY_EXPRESSION><![CDATA[qtyonhand]]></DISPLAY_EXPRESSION>
+<!--DA677F18E1234D25850C4016B02CFB45-->  <NAME><![CDATA[Quantity On Hand]]></NAME>
+<!--DA677F18E1234D25850C4016B02CFB45-->  <WIDTH><![CDATA[10]]></WIDTH>
+<!--DA677F18E1234D25850C4016B02CFB45-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--DA677F18E1234D25850C4016B02CFB45-->  <AD_REFERENCE_ID><![CDATA[29]]></AD_REFERENCE_ID>
+<!--DA677F18E1234D25850C4016B02CFB45-->  <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
+<!--DA677F18E1234D25850C4016B02CFB45-->  <HAS_LINK><![CDATA[N]]></HAS_LINK>
+<!--DA677F18E1234D25850C4016B02CFB45-->  <CAN_BE_FILTERED><![CDATA[N]]></CAN_BE_FILTERED>
+<!--DA677F18E1234D25850C4016B02CFB45--></OBCQL_QUERY_COLUMN>
+
+<!--DE3F5D2B067645B6A0F1266BFCB9F821--><OBCQL_QUERY_COLUMN>
+<!--DE3F5D2B067645B6A0F1266BFCB9F821-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[DE3F5D2B067645B6A0F1266BFCB9F821]]></OBCQL_QUERY_COLUMN_ID>
+<!--DE3F5D2B067645B6A0F1266BFCB9F821-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DE3F5D2B067645B6A0F1266BFCB9F821-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DE3F5D2B067645B6A0F1266BFCB9F821-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DE3F5D2B067645B6A0F1266BFCB9F821-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[97FD9C124D5D409DB94BB6500A418A60]]></OBCQL_WIDGET_QUERY_ID>
+<!--DE3F5D2B067645B6A0F1266BFCB9F821-->  <DISPLAY_EXPRESSION><![CDATA[attr]]></DISPLAY_EXPRESSION>
+<!--DE3F5D2B067645B6A0F1266BFCB9F821-->  <NAME><![CDATA[Product Attribute]]></NAME>
+<!--DE3F5D2B067645B6A0F1266BFCB9F821-->  <WIDTH><![CDATA[10]]></WIDTH>
+<!--DE3F5D2B067645B6A0F1266BFCB9F821-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--DE3F5D2B067645B6A0F1266BFCB9F821-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--DE3F5D2B067645B6A0F1266BFCB9F821-->  <INCLUDE_IN><![CDATA[M]]></INCLUDE_IN>
+<!--DE3F5D2B067645B6A0F1266BFCB9F821-->  <HAS_LINK><![CDATA[N]]></HAS_LINK>
+<!--DE3F5D2B067645B6A0F1266BFCB9F821-->  <CAN_BE_FILTERED><![CDATA[N]]></CAN_BE_FILTERED>
+<!--DE3F5D2B067645B6A0F1266BFCB9F821--></OBCQL_QUERY_COLUMN>
+
 <!--E4755A4156FE4E87AFC771FDCE3F9A0B--><OBCQL_QUERY_COLUMN>
 <!--E4755A4156FE4E87AFC771FDCE3F9A0B-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[E4755A4156FE4E87AFC771FDCE3F9A0B]]></OBCQL_QUERY_COLUMN_ID>
 <!--E4755A4156FE4E87AFC771FDCE3F9A0B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -297,4 +386,23 @@
 <!--F80128948ADD4FDFBAC82BF7EBF0FEFD-->  <CAN_BE_FILTERED><![CDATA[N]]></CAN_BE_FILTERED>
 <!--F80128948ADD4FDFBAC82BF7EBF0FEFD--></OBCQL_QUERY_COLUMN>
 
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB--><OBCQL_QUERY_COLUMN>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[FCD6D2F3AAA34DF7BA0B97B11A7A15CB]]></OBCQL_QUERY_COLUMN_ID>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[97FD9C124D5D409DB94BB6500A418A60]]></OBCQL_WIDGET_QUERY_ID>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <DISPLAY_EXPRESSION><![CDATA[product]]></DISPLAY_EXPRESSION>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <NAME><![CDATA[Product]]></NAME>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <WIDTH><![CDATA[10]]></WIDTH>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <LINK_EXPRESSION><![CDATA[pid]]></LINK_EXPRESSION>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <HAS_LINK><![CDATA[Y]]></HAS_LINK>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <AD_TAB_ID><![CDATA[180]]></AD_TAB_ID>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <CAN_BE_FILTERED><![CDATA[Y]]></CAN_BE_FILTERED>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <WHERECLAUSE_LEFT_PART><![CDATA[productName]]></WHERECLAUSE_LEFT_PART>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB--></OBCQL_QUERY_COLUMN>
+
 </data>
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBCQL_WIDGET_QUERY.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBCQL_WIDGET_QUERY.xml	Wed Jan 25 05:32:50 2017 +0000
@@ -23,6 +23,21 @@
 <!--53389C2060AD4DBEA1F9009A3C82B63F-->  <TYPE><![CDATA[HQL]]></TYPE>
 <!--53389C2060AD4DBEA1F9009A3C82B63F--></OBCQL_WIDGET_QUERY>
 
+<!--97FD9C124D5D409DB94BB6500A418A60--><OBCQL_WIDGET_QUERY>
+<!--97FD9C124D5D409DB94BB6500A418A60-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[97FD9C124D5D409DB94BB6500A418A60]]></OBCQL_WIDGET_QUERY_ID>
+<!--97FD9C124D5D409DB94BB6500A418A60-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--97FD9C124D5D409DB94BB6500A418A60-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--97FD9C124D5D409DB94BB6500A418A60-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--97FD9C124D5D409DB94BB6500A418A60-->  <OBKMO_WIDGET_CLASS_ID><![CDATA[5291D3D3B07B4CFC87928071377740E8]]></OBKMO_WIDGET_CLASS_ID>
+<!--97FD9C124D5D409DB94BB6500A418A60-->  <HQL><![CDATA[select orgname as store, warehouseName as warehouse, organization.id as orgid, searchKey as identifier, productName as product, product.id as pid, productCategoryName as category, productCategory.id as pcid, uOMName as uom, quantityOnHand as qtyonhand, description as attr, warehouse.id as whid
+from OBWCL_StockByWarehouseView sbw
+where sbw.client.id=:client
+and sbw.organization.id IN (:organizationList)
+and @optional_filters@
+order by qtyonhand desc]]></HQL>
+<!--97FD9C124D5D409DB94BB6500A418A60-->  <TYPE><![CDATA[HQL]]></TYPE>
+<!--97FD9C124D5D409DB94BB6500A418A60--></OBCQL_WIDGET_QUERY>
+
 <!--CFDF8EE593F04CFE9709F5AD19A3A573--><OBCQL_WIDGET_QUERY>
 <!--CFDF8EE593F04CFE9709F5AD19A3A573-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[CFDF8EE593F04CFE9709F5AD19A3A573]]></OBCQL_WIDGET_QUERY_ID>
 <!--CFDF8EE593F04CFE9709F5AD19A3A573-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml	Wed Jan 25 05:32:50 2017 +0000
@@ -50,6 +50,23 @@
 <!--35002C82027448708D173B75FB27D037-->  <AVAILABLE_IN_WORKSPACE><![CDATA[Y]]></AVAILABLE_IN_WORKSPACE>
 <!--35002C82027448708D173B75FB27D037--></OBKMO_WIDGET_CLASS>
 
+<!--5291D3D3B07B4CFC87928071377740E8--><OBKMO_WIDGET_CLASS>
+<!--5291D3D3B07B4CFC87928071377740E8-->  <OBKMO_WIDGET_CLASS_ID><![CDATA[5291D3D3B07B4CFC87928071377740E8]]></OBKMO_WIDGET_CLASS_ID>
+<!--5291D3D3B07B4CFC87928071377740E8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5291D3D3B07B4CFC87928071377740E8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5291D3D3B07B4CFC87928071377740E8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5291D3D3B07B4CFC87928071377740E8-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--5291D3D3B07B4CFC87928071377740E8-->  <TITLE><![CDATA[Simple Stock By Warehouse]]></TITLE>
+<!--5291D3D3B07B4CFC87928071377740E8-->  <HEIGHT><![CDATA[300]]></HEIGHT>
+<!--5291D3D3B07B4CFC87928071377740E8-->  <DESCRIPTION><![CDATA[Stock product by warehouse, attribute and unit of measure]]></DESCRIPTION>
+<!--5291D3D3B07B4CFC87928071377740E8-->  <ALLOW_ANONYMOUS_ACCESS><![CDATA[Y]]></ALLOW_ANONYMOUS_ACCESS>
+<!--5291D3D3B07B4CFC87928071377740E8-->  <ISSUPERCLASS><![CDATA[N]]></ISSUPERCLASS>
+<!--5291D3D3B07B4CFC87928071377740E8-->  <WIDGET_SUPERCLASS_ID><![CDATA[2A32CF26F3F64FE39C7F94E9D82497D1]]></WIDGET_SUPERCLASS_ID>
+<!--5291D3D3B07B4CFC87928071377740E8-->  <CAN_MAXIMIZE><![CDATA[N]]></CAN_MAXIMIZE>
+<!--5291D3D3B07B4CFC87928071377740E8-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
+<!--5291D3D3B07B4CFC87928071377740E8-->  <AVAILABLE_IN_WORKSPACE><![CDATA[Y]]></AVAILABLE_IN_WORKSPACE>
+<!--5291D3D3B07B4CFC87928071377740E8--></OBKMO_WIDGET_CLASS>
+
 <!--5B41A19E11494C519BE33BBED6012DAE--><OBKMO_WIDGET_CLASS>
 <!--5B41A19E11494C519BE33BBED6012DAE-->  <OBKMO_WIDGET_CLASS_ID><![CDATA[5B41A19E11494C519BE33BBED6012DAE]]></OBKMO_WIDGET_CLASS_ID>
 <!--5B41A19E11494C519BE33BBED6012DAE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Wed Jan 25 05:32:50 2017 +0000
@@ -24,6 +24,28 @@
 <!--04718E066E4E4C71BC35BBE44433BBC1-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[8A6B99392E2D9088012E2DCFC39B005F]]></EM_OBKMO_WIDGET_CLASS_ID>
 <!--04718E066E4E4C71BC35BBE44433BBC1--></OBUIAPP_PARAMETER>
 
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C--><OBUIAPP_PARAMETER>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <OBUIAPP_PARAMETER_ID><![CDATA[0DE3BBDF680446F3A88ADC7F3FAF174C]]></OBUIAPP_PARAMETER_ID>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <NAME><![CDATA[Number of Rows]]></NAME>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <SEQNO><![CDATA[0]]></SEQNO>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <COLUMNNAME><![CDATA[RowsNumber]]></COLUMNNAME>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <AD_ELEMENT_ID><![CDATA[9A0C92898CF17AC8E040007F01003160]]></AD_ELEMENT_ID>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <ISFIXED><![CDATA[N]]></ISFIXED>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[5291D3D3B07B4CFC87928071377740E8]]></EM_OBKMO_WIDGET_CLASS_ID>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C--></OBUIAPP_PARAMETER>
+
 <!--14A332D4D9534D5D84F399FF8128462E--><OBUIAPP_PARAMETER>
 <!--14A332D4D9534D5D84F399FF8128462E-->  <OBUIAPP_PARAMETER_ID><![CDATA[14A332D4D9534D5D84F399FF8128462E]]></OBUIAPP_PARAMETER_ID>
 <!--14A332D4D9534D5D84F399FF8128462E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -215,6 +237,30 @@
 <!--5DA6BE86940349C58FF5A3CC9A3F8FFF-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[5B41A19E11494C519BE33BBED6012DAE]]></EM_OBKMO_WIDGET_CLASS_ID>
 <!--5DA6BE86940349C58FF5A3CC9A3F8FFF--></OBUIAPP_PARAMETER>
 
+<!--5F280DC1145E425AAAFC34586DB10B74--><OBUIAPP_PARAMETER>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <OBUIAPP_PARAMETER_ID><![CDATA[5F280DC1145E425AAAFC34586DB10B74]]></OBUIAPP_PARAMETER_ID>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <NAME><![CDATA[Client]]></NAME>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <COLUMNNAME><![CDATA[client]]></COLUMNNAME>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <AD_ELEMENT_ID><![CDATA[9C7735D7BEB73C9EE040A8C0EB06271C]]></AD_ELEMENT_ID>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <ISFIXED><![CDATA[Y]]></ISFIXED>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <FIXEDVALUE><![CDATA[OB.getContext().getCurrentClient().id]]></FIXEDVALUE>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <EVALUATEFIXEDVALUE><![CDATA[Y]]></EVALUATEFIXEDVALUE>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[5291D3D3B07B4CFC87928071377740E8]]></EM_OBKMO_WIDGET_CLASS_ID>
+<!--5F280DC1145E425AAAFC34586DB10B74--></OBUIAPP_PARAMETER>
+
 <!--61C0446937F449BC9FC32EC62857C504--><OBUIAPP_PARAMETER>
 <!--61C0446937F449BC9FC32EC62857C504-->  <OBUIAPP_PARAMETER_ID><![CDATA[61C0446937F449BC9FC32EC62857C504]]></OBUIAPP_PARAMETER_ID>
 <!--61C0446937F449BC9FC32EC62857C504-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -384,6 +430,29 @@
 <!--A7EBA6BDA2C248378C86EF1B162423AE-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[5B41A19E11494C519BE33BBED6012DAE]]></EM_OBKMO_WIDGET_CLASS_ID>
 <!--A7EBA6BDA2C248378C86EF1B162423AE--></OBUIAPP_PARAMETER>
 
+<!--A8FC8FF493734DDEACCA0202963EC9C1--><OBUIAPP_PARAMETER>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <OBUIAPP_PARAMETER_ID><![CDATA[A8FC8FF493734DDEACCA0202963EC9C1]]></OBUIAPP_PARAMETER_ID>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <NAME><![CDATA[Show all data]]></NAME>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <COLUMNNAME><![CDATA[showAll]]></COLUMNNAME>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <DEFAULTVALUE><![CDATA[false]]></DEFAULTVALUE>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <AD_ELEMENT_ID><![CDATA[9A0C92898CEE7AC8E040007F01003160]]></AD_ELEMENT_ID>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <ISFIXED><![CDATA[N]]></ISFIXED>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[5291D3D3B07B4CFC87928071377740E8]]></EM_OBKMO_WIDGET_CLASS_ID>
+<!--A8FC8FF493734DDEACCA0202963EC9C1--></OBUIAPP_PARAMETER>
+
 <!--B181513A8B0141FB953295A0F1D02DDA--><OBUIAPP_PARAMETER>
 <!--B181513A8B0141FB953295A0F1D02DDA-->  <OBUIAPP_PARAMETER_ID><![CDATA[B181513A8B0141FB953295A0F1D02DDA]]></OBUIAPP_PARAMETER_ID>
 <!--B181513A8B0141FB953295A0F1D02DDA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -466,6 +535,30 @@
 <!--B838E24559DD4B4B98B7B0D1CC10E2D0-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[8A6B99392E2B4192012E2B58F5790056]]></EM_OBKMO_WIDGET_CLASS_ID>
 <!--B838E24559DD4B4B98B7B0D1CC10E2D0--></OBUIAPP_PARAMETER>
 
+<!--D1BE41F04FD14C3A9E6980369BC97E87--><OBUIAPP_PARAMETER>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <OBUIAPP_PARAMETER_ID><![CDATA[D1BE41F04FD14C3A9E6980369BC97E87]]></OBUIAPP_PARAMETER_ID>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <NAME><![CDATA[Organization List]]></NAME>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <COLUMNNAME><![CDATA[organizationList]]></COLUMNNAME>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <AD_ELEMENT_ID><![CDATA[32873C7A39ED464F9D781AB4BE08323B]]></AD_ELEMENT_ID>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <ISFIXED><![CDATA[Y]]></ISFIXED>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <FIXEDVALUE><![CDATA[OB.getContext().getReadableOrganizations()]]></FIXEDVALUE>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <EVALUATEFIXEDVALUE><![CDATA[Y]]></EVALUATEFIXEDVALUE>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[5291D3D3B07B4CFC87928071377740E8]]></EM_OBKMO_WIDGET_CLASS_ID>
+<!--D1BE41F04FD14C3A9E6980369BC97E87--></OBUIAPP_PARAMETER>
+
 <!--D57E85EA046B475C94EEE74A9CF67C78--><OBUIAPP_PARAMETER>
 <!--D57E85EA046B475C94EEE74A9CF67C78-->  <OBUIAPP_PARAMETER_ID><![CDATA[D57E85EA046B475C94EEE74A9CF67C78]]></OBUIAPP_PARAMETER_ID>
 <!--D57E85EA046B475C94EEE74A9CF67C78-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.31055]]></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[PR16Q4.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	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.31055]]></STARTVERSION>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.31055]]></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[PR16Q4.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	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.31055]]></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-db/database/sourcedata/AD_TEXTINTERFACES.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Wed Jan 25 05:32:50 2017 +0000
@@ -1,5 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <data>
+<!--1264AC4A209749BD9709EF88CAB71153--><AD_TEXTINTERFACES>
+<!--1264AC4A209749BD9709EF88CAB71153-->  <AD_TEXTINTERFACES_ID><![CDATA[1264AC4A209749BD9709EF88CAB71153]]></AD_TEXTINTERFACES_ID>
+<!--1264AC4A209749BD9709EF88CAB71153-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1264AC4A209749BD9709EF88CAB71153-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1264AC4A209749BD9709EF88CAB71153-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1264AC4A209749BD9709EF88CAB71153-->  <TEXT><![CDATA[Show quantities in AUM]]></TEXT>
+<!--1264AC4A209749BD9709EF88CAB71153-->  <FILENAME><![CDATA[/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.html]]></FILENAME>
+<!--1264AC4A209749BD9709EF88CAB71153-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--1264AC4A209749BD9709EF88CAB71153-->  <AD_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_MODULE_ID>
+<!--1264AC4A209749BD9709EF88CAB71153--></AD_TEXTINTERFACES>
+
 <!--D217B67C621E11DEBEE4001B388C05F0--><AD_TEXTINTERFACES>
 <!--D217B67C621E11DEBEE4001B388C05F0-->  <AD_TEXTINTERFACES_ID><![CDATA[D217B67C621E11DEBEE4001B388C05F0]]></AD_TEXTINTERFACES_ID>
 <!--D217B67C621E11DEBEE4001B388C05F0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.html	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.html	Wed Jan 25 05:32:50 2017 +0000
@@ -13,7 +13,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-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -314,8 +314,8 @@
                     <select name="inpOrg" id="inpOrg" class="Combo Combo_TwoCells_width">
                       <option value=""> <div id="reportAD_ORGID"></div></option>
                     </select></td>
-		          <td class="TitleCell"></td>
-                  <td class="ContentCell"></td>
+		          <td class="TitleCell"><span id="showInAumLabel" class="LabelText" style="display:xx;">Show quantities in AUM</span></td>
+                  <td class="ContentCell"><input id="showInAumVal" name="inpShowInAumVal" type="checkbox"  style="display:xx;"/></td>
                   <td class="ContentCell"></td>
                 </tr>
                 <tr>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.java	Wed Jan 25 05:32:50 2017 +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-2015 Openbravo SLU 
+ * All portions are Copyright (C) 2009-2016 Openbravo SLU 
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -20,6 +20,8 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
 import java.util.HashMap;
 
 import javax.servlet.ServletException;
@@ -36,6 +38,7 @@
 import org.openbravo.erpCommon.utility.OBError;
 import org.openbravo.erpCommon.utility.ToolBar;
 import org.openbravo.erpCommon.utility.Utility;
+import org.openbravo.materialmgmt.UOMUtil;
 import org.openbravo.xmlEngine.XmlDocument;
 
 public class ReportOrderNotShipped extends HttpSecureAppServlet {
@@ -164,6 +167,11 @@
     } catch (Exception ex) {
       throw new ServletException(ex);
     }
+
+    xmlDocument.setParameter("isUomManagementEnabled", "none");
+    if (UOMUtil.isUomManagementEnabled()) {
+      xmlDocument.setParameter("isUomManagementEnabled", "table-cell");
+    }
     response.setContentType("text/html; charset=UTF-8");
     PrintWriter out = response.getWriter();
     out.println(xmlDocument.print());
@@ -188,6 +196,25 @@
     // Launch the report as usual, calling the JRXML file
     String strReportName = "@basedesign@/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.jrxml";
 
+    String strShowInAUM = vars.getRequestGlobalVariable("inpShowInAumVal",
+        "ReportOrderNotShipped|showInAum");
+    if (!strShowInAUM.isEmpty() && strShowInAUM.equalsIgnoreCase("on")) {
+      DecimalFormat df = Utility.getFormat(vars, "priceEdition");
+      for (int i = 0; i < data.length; i++) {
+        data[i].orderedqty = df.format(UOMUtil.getConvertedAumQty(data[i].mProductId,
+            new BigDecimal(data[i].orderedvalue), data[i].aum));
+        data[i].pendingqty = df.format(UOMUtil.getConvertedAumQty(data[i].mProductId,
+            new BigDecimal(data[i].pendingvalue), data[i].aum));
+        try {
+          data[i].qtyinstock = UOMUtil.getConvertedAumQty(data[i].mProductId,
+              new BigDecimal(data[i].stockvalue), data[i].aum).toString();
+        } catch (NumberFormatException nfe) {
+          data[i].qtyinstock = null;
+          data[i].aumsymbol = " ";
+        }
+      }
+    }
+
     if (strOutput.equals("pdf"))
       response.setHeader("Content-disposition", "inline; filename=OrdersAwaitingDelivery.pdf");
 
@@ -197,6 +224,7 @@
 
     HashMap<String, Object> parameters = new HashMap<String, Object>();
     parameters.put("REPORT_SUBTITLE", strSubTitle);
+    parameters.put("showInAUM", !strShowInAUM.isEmpty() && strShowInAUM.equalsIgnoreCase("on"));
     renderJR(vars, response, strReportName, strOutput, parameters, data, null);
   }
 
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.jrxml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.jrxml	Wed Jan 25 05:32:50 2017 +0000
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.0.0.final using JasperReports Library version 6.0.0  -->
+<!-- 2016-07-13T22:59:47 -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="ReportOrderNotShipped" pageWidth="842" pageHeight="595" columnWidth="782" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20" uuid="b2108c38-f573-4cc5-8aee-4725a42348b0">
 	<property name="ireport.scriptlethandling" value="0"/>
 	<property name="ireport.encoding" value="UTF-8"/>
@@ -37,7 +39,9 @@
 	<style name="Total_Gray" mode="Opaque" forecolor="#000000" backcolor="#CCCCCC"/>
 	<parameter name="REPORT_TITLE" class="java.lang.String" isForPrompting="false"/>
 	<parameter name="REPORT_SUBTITLE" class="java.lang.String" isForPrompting="false"/>
-	<queryString>
+	<parameter name="NUMBERFORMAT" class="java.text.DecimalFormat" isForPrompting="false"/>
+	<parameter name="showInAUM" class="java.lang.Boolean" isForPrompting="false"/>
+	<queryString language="SQL">
 		<![CDATA[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,
@@ -98,6 +102,9 @@
 	<field name="orderedqty" class="java.lang.String"/>
 	<field name="pendingqty" class="java.lang.String"/>
 	<field name="qtyinstock" class="java.lang.String"/>
+	<field name="aumsymbol" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
 	<group name="orgname">
 		<groupExpression><![CDATA[$F{orgname}]]></groupExpression>
 		<groupHeader>
@@ -135,7 +142,12 @@
 		<groupFooter>
 			<band height="10" splitType="Stretch">
 				<line>
-					<reportElement key="line-6" x="0" y="9" width="782" height="1" forecolor="#555555" uuid="29106dfd-c1be-45d1-ac29-f830c90b2186"/>
+					<reportElement key="line-6" x="1" y="9" width="780" height="1" forecolor="#555555" uuid="29106dfd-c1be-45d1-ac29-f830c90b2186">
+						<property name="local_mesure_unitx" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
 				</line>
 				<line>
 					<reportElement key="line-17" stretchType="RelativeToBandHeight" x="0" y="0" width="1" height="10" forecolor="#555555" uuid="087d9158-0fe9-4a01-a7c9-e4b1d1037584"/>
@@ -201,7 +213,12 @@
 					<reportElement key="line-19" stretchType="RelativeToBandHeight" x="781" y="0" width="1" height="10" forecolor="#555555" uuid="40b3b316-9823-4dea-9e8d-9154dd8d9020"/>
 				</line>
 				<line>
-					<reportElement key="line-21" x="20" y="9" width="762" height="1" forecolor="#555555" uuid="1d92dfc8-554f-44c4-adad-2ed3d6e7a549"/>
+					<reportElement key="line-21" x="21" y="9" width="760" height="1" forecolor="#555555" uuid="1d92dfc8-554f-44c4-adad-2ed3d6e7a549">
+						<property name="local_mesure_unitx" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
 				</line>
 				<line>
 					<reportElement key="line-23" stretchType="RelativeToBandHeight" x="20" y="0" width="1" height="10" forecolor="#555555" uuid="b36ef598-0de5-4fa6-843b-08a61d37aeab"/>
@@ -213,6 +230,8 @@
 		<groupExpression><![CDATA[$F{documentno}]]></groupExpression>
 		<groupHeader>
 			<band height="60" splitType="Stretch">
+				<property name="local_mesure_unitheight" value="pixel"/>
+				<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				<staticText>
 					<reportElement key="staticText" style="GroupHeader_DarkGray" x="39" y="0" width="159" height="20" forecolor="#FFFFFF" uuid="f6c1bbcd-938d-4d6f-876b-31c117009da7"/>
 					<box>
@@ -349,7 +368,7 @@
 					<text><![CDATA[Delivery Location]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText" style="GroupHeader_DarkGray" x="62" y="40" width="214" height="20" forecolor="#FFFFFF" uuid="8a4b8527-7a8b-4c0b-82a1-7a2a8db30030"/>
+					<reportElement key="staticText" style="GroupHeader_DarkGray" x="61" y="40" width="215" height="20" forecolor="#FFFFFF" uuid="8a4b8527-7a8b-4c0b-82a1-7a2a8db30030"/>
 					<box leftPadding="5">
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -363,7 +382,7 @@
 					<text><![CDATA[Product]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText" style="GroupHeader_DarkGray" x="276" y="40" width="161" height="20" forecolor="#FFFFFF" uuid="12e657ab-c95c-4bb0-a3f0-4ea66c6a5f87"/>
+					<reportElement key="staticText" style="GroupHeader_DarkGray" x="276" y="40" width="144" height="20" forecolor="#FFFFFF" uuid="12e657ab-c95c-4bb0-a3f0-4ea66c6a5f87"/>
 					<box>
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -377,7 +396,7 @@
 					<text><![CDATA[Ordered Quantity]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText" style="GroupHeader_DarkGray" x="437" y="40" width="151" height="20" forecolor="#FFFFFF" uuid="7333cea3-abaf-4a3e-bc5c-c373cf253d70"/>
+					<reportElement key="staticText" style="GroupHeader_DarkGray" x="420" y="40" width="130" height="20" forecolor="#FFFFFF" uuid="7333cea3-abaf-4a3e-bc5c-c373cf253d70"/>
 					<box>
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -391,7 +410,10 @@
 					<text><![CDATA[Pending Quantity]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText" style="GroupHeader_DarkGray" x="588" y="40" width="194" height="20" forecolor="#FFFFFF" uuid="5e1d0a2b-7ec5-4229-87ac-66f99550f6c6"/>
+					<reportElement key="staticText" style="GroupHeader_DarkGray" x="550" y="40" width="170" height="20" forecolor="#FFFFFF" uuid="5e1d0a2b-7ec5-4229-87ac-66f99550f6c6">
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
 					<box>
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -416,10 +438,57 @@
 				<line>
 					<reportElement key="line-13" stretchType="RelativeToBandHeight" x="781" y="20" width="1" height="20" forecolor="#555555" uuid="b96c6afe-79e1-44e5-826a-292c2dcfb286"/>
 				</line>
+				<line>
+					<reportElement key="line-26" stretchType="RelativeToBandHeight" x="781" y="40" width="1" height="20" forecolor="#555555" uuid="a42679da-b29e-4450-a1c5-c9786720dd4d"/>
+				</line>
+				<staticText>
+					<reportElement key="staticText" style="GroupHeader_DarkGray" positionType="FixRelativeToBottom" x="720" y="40" width="61" height="20" forecolor="#FFFFFF" uuid="0efad178-dc21-4bcd-b219-bae0adb342cb">
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<printWhenExpression><![CDATA[$P{showInAUM}==true]]></printWhenExpression>
+					</reportElement>
+					<box>
+						<pen lineWidth="0.0"/>
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<bottomPen lineWidth="0.0" lineColor="#000000"/>
+						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font fontName="Bitstream Vera Sans" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[Unit]]></text>
+				</staticText>
+				<line>
+					<reportElement key="line-8" stretchType="RelativeToBandHeight" x="60" y="40" width="1" height="20" forecolor="#555555" uuid="7ca66ccd-2a54-439f-b8a1-4634046bd4ff"/>
+				</line>
+				<staticText>
+					<reportElement key="staticText" style="GroupHeader_DarkGray" x="550" y="40" width="231" height="20" forecolor="#FFFFFF" uuid="0e18d02c-d9d8-410b-9370-fb2f05e4ff84">
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="local_mesure_unitx" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+						<property name="local_mesure_unity" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.y" value="px"/>
+						<printWhenExpression><![CDATA[$P{showInAUM}==false]]></printWhenExpression>
+					</reportElement>
+					<box>
+						<pen lineWidth="0.0"/>
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<bottomPen lineWidth="0.0" lineColor="#000000"/>
+						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font fontName="Bitstream Vera Sans" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[Quantity in Stock]]></text>
+				</staticText>
 			</band>
 		</groupHeader>
 		<groupFooter>
 			<band height="10" splitType="Stretch">
+				<property name="local_mesure_unitheight" value="pixel"/>
 				<line>
 					<reportElement key="line-15" stretchType="RelativeToBandHeight" x="0" y="0" width="1" height="10" forecolor="#555555" uuid="47ea2eca-d4d8-4a25-8672-f3f1e00cc8e7"/>
 				</line>
@@ -433,10 +502,22 @@
 					<reportElement key="line-24" stretchType="RelativeToBandHeight" x="39" y="0" width="1" height="10" forecolor="#555555" uuid="d8b0e0fb-f55d-4449-bcb5-f76902bb3ff2"/>
 				</line>
 				<line>
-					<reportElement key="line-25" x="39" y="9" width="742" height="1" forecolor="#555555" uuid="73752f52-4456-400a-ab96-8892dec30ce3"/>
+					<reportElement key="line-25" x="40" y="9" width="741" height="1" forecolor="#555555" uuid="73752f52-4456-400a-ab96-8892dec30ce3">
+						<property name="local_mesure_unitx" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
 				</line>
 				<line>
-					<reportElement key="line-27" x="60" y="0" width="722" height="1" forecolor="#555555" uuid="e9d4f804-36a6-47a9-998a-572e739381aa"/>
+					<reportElement key="line-27" x="61" y="0" width="720" height="1" forecolor="#555555" uuid="e9d4f804-36a6-47a9-998a-572e739381aa">
+						<property name="local_mesure_unitx" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="local_mesure_unity" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					</reportElement>
 				</line>
 			</band>
 		</groupFooter>
@@ -486,8 +567,10 @@
 	</columnHeader>
 	<detail>
 		<band height="20" splitType="Stretch">
+			<property name="local_mesure_unitheight" value="pixel"/>
+			<property name="com.jaspersoft.studio.unit.height" value="px"/>
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement key="textField" style="Detail_Task" x="62" y="0" width="214" height="20" forecolor="#000000" uuid="1704bcd6-5519-4584-a72e-559a0c5bda4d"/>
+				<reportElement key="textField" style="Detail_Task" x="61" y="0" width="215" height="20" forecolor="#000000" uuid="1704bcd6-5519-4584-a72e-559a0c5bda4d"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -500,7 +583,7 @@
 				<textFieldExpression><![CDATA[$F{prodname}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement key="textField" style="Detail_Task" x="276" y="0" width="161" height="20" forecolor="#000000" uuid="d5dfd9df-9bef-4534-b7dc-ef4524bf09a1"/>
+				<reportElement key="textField" style="Detail_Task" x="276" y="0" width="144" height="20" forecolor="#000000" uuid="d5dfd9df-9bef-4534-b7dc-ef4524bf09a1"/>
 				<box rightPadding="5">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -513,7 +596,7 @@
 				<textFieldExpression><![CDATA[$F{orderedqty}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement key="textField" style="Detail_Task" x="437" y="0" width="151" height="20" forecolor="#000000" uuid="9fe4f1f8-849b-446f-8aad-a702f97532a4"/>
+				<reportElement key="textField" style="Detail_Task" x="420" y="0" width="130" height="20" forecolor="#000000" uuid="9fe4f1f8-849b-446f-8aad-a702f97532a4"/>
 				<box rightPadding="5">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -526,7 +609,9 @@
 				<textFieldExpression><![CDATA[$F{pendingqty}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement key="textField" style="Detail_Task" x="588" y="0" width="192" height="20" forecolor="#000000" uuid="bc400d8e-f7c9-4a15-a321-b9b3f7a80feb"/>
+				<reportElement key="textField" style="Detail_Task" x="550" y="0" width="170" height="20" forecolor="#000000" uuid="bc400d8e-f7c9-4a15-a321-b9b3f7a80feb">
+					<printWhenExpression><![CDATA[$P{showInAUM}==true]]></printWhenExpression>
+				</reportElement>
 				<box rightPadding="5">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -539,20 +624,66 @@
 				<textFieldExpression><![CDATA[($F{qtyinstock}!=null)?$F{qtyinstock}:new String(" ")]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement key="line-5" stretchType="RelativeToBandHeight" x="0" y="-2" width="1" height="22" forecolor="#555555" uuid="797cfc33-4975-4047-af18-c34c3a551856"/>
+				<reportElement key="line-5" stretchType="RelativeToBandHeight" x="0" y="0" width="1" height="20" forecolor="#555555" uuid="797cfc33-4975-4047-af18-c34c3a551856">
+					<property name="local_mesure_unitheight" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					<property name="local_mesure_unity" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+				</reportElement>
 			</line>
 			<line>
 				<reportElement key="line-8" stretchType="RelativeToBandHeight" x="39" y="0" width="1" height="20" forecolor="#555555" uuid="8c871f52-989e-416f-9a35-20d4ce1c4c1b"/>
 			</line>
 			<line>
-				<reportElement key="line-9" stretchType="RelativeToBandHeight" x="60" y="-20" width="1" height="40" forecolor="#555555" uuid="ebe986df-8d25-4b21-9736-4286979e872b"/>
-			</line>
-			<line>
-				<reportElement key="line-12" stretchType="RelativeToBandHeight" x="20" y="-2" width="1" height="22" forecolor="#555555" uuid="f2bc874f-009b-48fd-bb92-603034693de0"/>
+				<reportElement key="line-12" stretchType="RelativeToBandHeight" x="20" y="0" width="1" height="20" forecolor="#555555" uuid="f2bc874f-009b-48fd-bb92-603034693de0">
+					<property name="local_mesure_unity" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="local_mesure_unitheight" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
 			</line>
 			<line>
 				<reportElement key="line-26" stretchType="RelativeToBandHeight" x="781" y="0" width="1" height="20" forecolor="#555555" uuid="1b0001f6-cbb1-4e30-bd3c-ee69a14713c9"/>
 			</line>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement key="textField" style="Detail_Task" x="720" y="0" width="61" height="20" forecolor="#000000" uuid="affab195-eb89-42f0-b576-d39ea85f4a60">
+					<printWhenExpression><![CDATA[$P{showInAUM}==true]]></printWhenExpression>
+				</reportElement>
+				<box rightPadding="5">
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="Bitstream Vera Sans" size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{aumsymbol}]]></textFieldExpression>
+			</textField>
+			<line>
+				<reportElement key="line-8" stretchType="RelativeToBandHeight" x="60" y="0" width="1" height="20" forecolor="#555555" uuid="55f2d804-357e-49c2-9efe-5c25a802e588"/>
+			</line>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement key="textField" style="Detail_Task" x="550" y="0" width="231" height="20" forecolor="#000000" uuid="dea74cff-1396-482d-b3c5-c9ce80e22013">
+					<property name="local_mesure_unitx" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					<property name="local_mesure_unity" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="local_mesure_unitwidth" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					<printWhenExpression><![CDATA[$P{showInAUM}==false]]></printWhenExpression>
+				</reportElement>
+				<box rightPadding="5">
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="Bitstream Vera Sans" size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[($F{qtyinstock}!=null)?$F{qtyinstock}:new String(" ")]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<columnFooter>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.xml	Wed Jan 25 05:32:50 2017 +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 Openbravo SLU 
+* All portions are Copyright (C) 20016 Openbravo SLU 
 * All Rights Reserved. 
 * Contributor(s):  ______________________________________.
 ************************************************************************
@@ -50,5 +50,7 @@
   <SUBREPORT id="reportAD_ORGID" name="reportAD_ORGID" report="org/openbravo/erpCommon/reference/List">
     <ARGUMENT name="parameterListSelected" withId="paramAD_ORGID"/>
   </SUBREPORT>
+  <PARAMETER id="showInAumLabel" name="isUomManagementEnabled" attribute="style" replace="xx"/>
+  <PARAMETER id="showInAumVal" name="isUomManagementEnabled" attribute="style" replace="xx"/>
   <DISCARD id="discard"/>
 </REPORT>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped_data.xsql	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped_data.xsql	Wed Jan 25 05:32:50 2017 +0000
@@ -42,7 +42,25 @@
         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
+    ) || ' ' || 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, 
+    OL.M_PRODUCT_ID, OL.QTYORDERED AS ORDEREDVALUE, (OL.QTYORDERED-OL.QTYDELIVERED) AS PENDINGVALUE,
+    (
+      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
+      )
+    ) AS STOCKVALUE     
     FROM C_ORDER O
     JOIN AD_ORG ORG ON O.AD_ORG_ID = ORG.AD_ORG_ID
     JOIN C_BPARTNER BP ON O.C_BPARTNER_ID = BP.C_BPARTNER_ID
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></VERSION>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.31055]]></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[PR16Q4.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	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></STARTVERSION>
+<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.31055]]></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.30447]]></STARTVERSION>
+<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.31055]]></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.30447]]></STARTVERSION>
+<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.31055]]></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.30447]]></STARTVERSION>
+<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.31055]]></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.30447]]></STARTVERSION>
+<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.31055]]></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	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/BaseDataSourceService.java	Wed Jan 25 05:32:50 2017 +0000
@@ -34,6 +34,7 @@
 import org.openbravo.client.kernel.Template;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
+import org.openbravo.erpCommon.businessUtility.Preferences;
 import org.openbravo.model.ad.ui.Tab;
 import org.openbravo.model.common.order.Order;
 import org.openbravo.service.json.JsonConstants;
@@ -157,8 +158,7 @@
         OBContext.setAdminMode(true);
         try {
           Selector sel = OBDal.getInstance().get(Selector.class, selectorId);
-          entityToCheck = ModelProvider.getInstance().getEntityByTableId(
-              sel.getTable().getId());
+          entityToCheck = ModelProvider.getInstance().getEntityByTableId(sel.getTable().getId());
         } finally {
           OBContext.restorePreviousMode();
         }
@@ -213,7 +213,7 @@
   }
 
   protected void handleExceptionUnsecuredDSAccess(OBSecurityException securityException) {
-    if (!"Y".equals(cachedPreference
+    if (!Preferences.YES.equals(cachedPreference
         .getPreferenceValue(CachedPreference.ALLOW_UNSECURED_DS_REQUEST))) {
       throw new OBSecurityException(securityException);
     } else {
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/CheckTreeOperationManager.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/CheckTreeOperationManager.java	Wed Jan 25 05:32:50 2017 +0000
@@ -28,8 +28,12 @@
  * 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:
  * 
- * @ApplicationScoped
- * @Qualifier("entityName"), entityName being the name of the DAL entity associated with the tree
+ * <code>
+ * <p>
+ * &#64;ApplicationScoped
+ * <p>
+ * &#64;Qualifier("entityName"), entityName being the name of the DAL entity associated with the tree
+ * </code>
  * 
  */
 public abstract class CheckTreeOperationManager {
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java	Wed Jan 25 05:32:50 2017 +0000
@@ -53,6 +53,7 @@
 import org.openbravo.base.exception.OBException;
 import org.openbravo.base.exception.OBSecurityException;
 import org.openbravo.base.model.Entity;
+import org.openbravo.base.model.ModelProvider;
 import org.openbravo.base.model.Property;
 import org.openbravo.base.model.domaintype.EnumerateDomainType;
 import org.openbravo.base.secureApp.VariablesSecureApp;
@@ -61,6 +62,7 @@
 import org.openbravo.client.application.Process;
 import org.openbravo.client.application.RefWindow;
 import org.openbravo.client.application.process.BaseProcessActionHandler;
+import org.openbravo.client.application.window.ApplicationDictionaryCachedStructures;
 import org.openbravo.client.application.window.OBViewUtil;
 import org.openbravo.client.kernel.BaseKernelServlet;
 import org.openbravo.client.kernel.KernelUtils;
@@ -118,6 +120,9 @@
   @Inject
   private DataSourceServiceProvider dataSourceServiceProvider;
 
+  @Inject
+  private ApplicationDictionaryCachedStructures cachedStructures;
+
   @Override
   public void init(ServletConfig config) {
     if (config.getInitParameter(DataSourceConstants.URL_NAME_PARAM) != null) {
@@ -254,8 +259,8 @@
           response.setHeader("Content-Disposition", "attachment; filename=ExportedData.csv");
           QueryJSONWriterToCSV writer;
           if (getDataSource(request) instanceof DefaultDataSourceService) {
-            writer = new QueryJSONWriterToCSV(request, response, parameters, getDataSource(request)
-                .getEntity());
+            writer = new QueryJSONWriterToCSV(request, response, parameters, getDataSourceEntity(
+                request, parameters));
             // when exporting a OB grid, the isActive filter should not be set
             parameters.put(JsonConstants.NO_ACTIVE_FILTER, "true");
             ((DefaultDataSourceService) getDataSource(request)).fetch(parameters, writer);
@@ -263,8 +268,8 @@
             String result = getDataSource(request).fetch(parameters);
             JSONObject jsonResult = new JSONObject(result);
             JSONArray data = jsonResult.getJSONObject("response").getJSONArray("data");
-            writer = new QueryJSONWriterToCSV(request, response, parameters, getDataSource(request)
-                .getEntity());
+            writer = new QueryJSONWriterToCSV(request, response, parameters, getDataSourceEntity(
+                request, parameters));
             for (int i = 0; i < data.length(); i++) {
               writer.write(data.getJSONObject(i));
             }
@@ -285,6 +290,19 @@
     }
   }
 
+  private Entity getDataSourceEntity(HttpServletRequest request, Map<String, String> parameters) {
+    Entity entity = getDataSource(request).getEntity();
+    if (entity == null && !JsonUtils.isValueEmpty(parameters.get("tabId"))) {
+      Tab tab = cachedStructures.getTab(parameters.get("tabId"));
+      if (tab.getTable() != null) {
+        return ModelProvider.getInstance().getEntityByTableId(tab.getTable().getId());
+      } else {
+        log.error("Could not find the table for the tab with id: " + tab.getId());
+      }
+    }
+    return entity;
+  }
+
   private class QueryJSONWriterToCSV extends DefaultJsonDataService.QueryResultWriter {
 
     private static final String YES_NO_REFERENCE_ID = "20";
@@ -539,7 +557,7 @@
     private boolean translateYesNoReferencesInCsv(Window windowToCsv) {
       boolean shouldCheck = false;
       try {
-        shouldCheck = "Y".equals(Preferences.getPreferenceValue(
+        shouldCheck = Preferences.YES.equals(Preferences.getPreferenceValue(
             "OBSERDS_CSVExportTranslateYesNoReference", true, OBContext.getOBContext()
                 .getCurrentClient(), OBContext.getOBContext().getCurrentOrganization(), OBContext
                 .getOBContext().getUser(), OBContext.getOBContext().getRole(), windowToCsv));
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DefaultDataSourceService.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DefaultDataSourceService.java	Wed Jan 25 05:32:50 2017 +0000
@@ -44,6 +44,7 @@
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.dal.service.OBQuery;
+import org.openbravo.erpCommon.businessUtility.Preferences;
 import org.openbravo.erpCommon.utility.OBMessageUtils;
 import org.openbravo.model.ad.ui.Field;
 import org.openbravo.model.ad.ui.Tab;
@@ -168,7 +169,8 @@
   }
 
   private boolean manualWhereClausePreferenceIsEnabled() {
-    return "Y".equals(cachedPreference.getPreferenceValue(CachedPreference.ALLOW_WHERE_PARAMETER));
+    return Preferences.YES.equals(cachedPreference
+        .getPreferenceValue(CachedPreference.ALLOW_WHERE_PARAMETER));
   }
 
   private boolean whereParameterIsNotBlank(Map<String, String> parameters) {
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></VERSION>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.31055]]></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[PR16Q4.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	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></STARTVERSION>
+<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.31055]]></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.30447]]></STARTVERSION>
+<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.31055]]></STARTVERSION>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></VERSION>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.31055]]></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[PR16Q4.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	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></STARTVERSION>
+<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.31055]]></STARTVERSION>
 <!--FF8080813141B198013141B8B21B0006-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813141B198013141B8B21B0006-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813141B198013141B8B21B0006-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></VERSION>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.31055]]></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[PR16Q4.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	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></STARTVERSION>
+<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.31055]]></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	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java	Wed Jan 25 05:32:50 2017 +0000
@@ -1626,8 +1626,13 @@
             joinDefinitions.add(joinDefinition);
           }
         }
-
-        sb.append(createIdentifierLeftClause(newIdentifierProperties, newPrefix + DalUtil.DOT));
+        if (prop.isMandatory()) {
+          sb.append(createIdentifierLeftClause(newIdentifierProperties, newPrefix + DalUtil.DOT));
+        } else {
+          sb.append("COALESCE(to_char("
+              + createIdentifierLeftClause(newIdentifierProperties, newPrefix + DalUtil.DOT)
+              + "),'')");
+        }
       }
     }
 
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java	Wed Jan 25 05:32:50 2017 +0000
@@ -49,6 +49,7 @@
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.dal.service.OBQuery;
 import org.openbravo.database.SessionInfo;
+import org.openbravo.erpCommon.businessUtility.Preferences;
 import org.openbravo.erpCommon.utility.OBMessageUtils;
 import org.openbravo.model.ad.system.Client;
 import org.openbravo.model.common.enterprise.Organization;
@@ -579,7 +580,7 @@
 
         // for standard tab and selector datasources pagination is mandatory
         throw new OBException(OBMessageUtils.messageBD("OBJSON_NoPagedFetch"));
-      } else if (!"Y".equals(cachedPreference
+      } else if (!Preferences.YES.equals(cachedPreference
           .getPreferenceValue(CachedPreference.ALLOW_UNPAGED_DS_MANUAL_REQUEST)) && !isWsCall) {
         throw new OBException(OBMessageUtils.messageBD("OBJSON_NoPagedFetchManual"));
       }
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonUtils.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonUtils.java	Wed Jan 25 05:32:50 2017 +0000
@@ -31,6 +31,7 @@
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
 import org.hibernate.QueryTimeoutException;
+import org.openbravo.authentication.AuthenticationManager;
 import org.openbravo.base.exception.OBException;
 import org.openbravo.base.exception.OBSecurityException;
 import org.openbravo.base.model.Entity;
@@ -216,9 +217,19 @@
         log.error(e.getMessage(), e);
       }
 
-      final VariablesSecureApp vars = RequestContext.get().getVariablesSecureApp();
-      final OBError obError = Utility.translateError(new DalConnectionProvider(), vars, OBContext
-          .getOBContext().getLanguage().getLanguage(), localThrowable.getMessage());
+      OBError obError;
+      VariablesSecureApp vars = null;
+
+      // in case of stateless then prevent creation of a http session when an error is reported
+      if (AuthenticationManager.isStatelessRequest(RequestContext.get().getRequest())) {
+        obError = new OBError();
+        obError.setType("Error");
+        obError.setMessage(throwable.getMessage());
+      } else {
+        vars = RequestContext.get().getVariablesSecureApp();
+        obError = Utility.translateError(new DalConnectionProvider(), vars, OBContext
+            .getOBContext().getLanguage().getLanguage(), localThrowable.getMessage());
+      }
 
       if (localThrowable instanceof OBSecurityException) {
         final JSONObject error = new JSONObject();
@@ -230,10 +241,14 @@
           || (localThrowable.getCause() instanceof PSQLException && PG_QUERY_CANCELED
               .equals(((PSQLException) localThrowable.getCause()).getSQLState()))) {
         final JSONObject error = new JSONObject();
-        error.put(
-            "message",
-            Utility.messageBD(new DalConnectionProvider(false), "OBUIAPP_QueryTimeOut",
-                vars.getLanguage()));
+        if (vars != null) {
+          error.put(
+              "message",
+              Utility.messageBD(new DalConnectionProvider(false), "OBUIAPP_QueryTimeOut",
+                  vars.getLanguage()));
+        } else {
+          error.put("message", "OBUIAPP_QueryTimeOut");
+        }
         error.put("messageType", obError.getType());
         error.put("title", obError.getTitle());
         jsonResponse.put(JsonConstants.RESPONSE_ERROR, error);
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></VERSION>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.31055]]></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[PR16Q4.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	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></STARTVERSION>
+<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.31055]]></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.30447]]></STARTVERSION>
+<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.31055]]></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.30447]]></STARTVERSION>
+<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.31055]]></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.30447]]></STARTVERSION>
+<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.31055]]></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.30447]]></STARTVERSION>
+<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.31055]]></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.30447]]></STARTVERSION>
+<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.31055]]></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/SelectorDataSourceFilter.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDataSourceFilter.java	Wed Jan 25 05:32:50 2017 +0000
@@ -47,6 +47,7 @@
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
+import org.openbravo.erpCommon.businessUtility.Preferences;
 import org.openbravo.erpCommon.utility.OBMessageUtils;
 import org.openbravo.model.ad.domain.Validation;
 import org.openbravo.service.datasource.DataSourceFilter;
@@ -438,7 +439,8 @@
   }
 
   private boolean manualWhereClausePreferenceIsEnabled() {
-    return "Y".equals(cachedPreference.getPreferenceValue(CachedPreference.ALLOW_WHERE_PARAMETER));
+    return Preferences.YES.equals(cachedPreference
+        .getPreferenceValue(CachedPreference.ALLOW_WHERE_PARAMETER));
   }
 
   private boolean whereParameterIsNotBlank(Map<String, String> parameters) {
--- a/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js	Wed Jan 25 05:32:50 2017 +0000
@@ -672,7 +672,7 @@
 
     // check if the whole item identifier has been entered
     // see issue https://issues.openbravo.com/view.php?id=22821
-    if (OB.Utilities.isUUID(this.mapDisplayToValue(identifier)) && this._notUpdatingManually !== true) {
+    if (OB.Utilities.isUUID(this.mapDisplayToValue(identifier)) && this._notUpdatingManually !== true && !this.valuePicked) {
       this.fullIdentifierEntered = true;
     } else {
       delete this.fullIdentifierEntered;
@@ -1004,10 +1004,13 @@
   },
 
   pickValue: function (value) {
+    var selectedRecord, ret;
     // get the selected record before calling the super, as this super call
     // will deselect the record
-    var selectedRecord = this.pickList.getSelectedRecord(),
-        ret = this.Super('pickValue', arguments);
+    selectedRecord = this.pickList.getSelectedRecord();
+    this.valuePicked = true;
+    ret = this.Super('pickValue', arguments);
+    delete this.valuePicked;
     this.setValueFromRecord(selectedRecord);
     delete this.fullIdentifierEntered;
     return ret;
--- a/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></VERSION>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.31055]]></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[PR16Q4.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	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></STARTVERSION>
+<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.31055]]></STARTVERSION>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></VERSION>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.31055]]></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[PR16Q4.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	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></STARTVERSION>
+<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.31055]]></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.30447]]></STARTVERSION>
+<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.31055]]></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.30447]]></STARTVERSION>
+<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.31055]]></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/isomorphic/ISC_Combined.js	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js	Wed Jan 25 05:32:50 2017 +0000
@@ -2955,7 +2955,7 @@
 if(_1.contains("B")){_2.B=_2.BL=_2.BR=true}
 if(_1.contains("L")){_2.L=_2.TL=_2.BL=true}
 if(_1.contains("R")){_2.R=_2.TR=_2.BR=true}}
-this.updateEdgeSizes()},isc.A.updateEdgeSizes=function isc_EdgedCanvas_updateEdgeSizes(){var _1=this.edgeSize;this.$y4=this.$du(this.edgeLeft,_1);this.$y5=this.$du(this.edgeRight,_1);this.$y6=this.$du(this.edgeTop,_1);this.$y7=this.$du(this.edgeBottom,_1);var _2=this.shownEdges,_3=this.edgeOffset;if(_2.L)this.$tb=this.$du(this.edgeOffsetLeft,_3,this.$y4);if(_2.R)this.$tc=this.$du(this.edgeOffsetRight,_3,this.$y5);if(_2.T)this.$td=this.$du(this.edgeOffsetTop,_3,this.$y6);if(_2.B)this.$te=this.$du(this.edgeOffsetBottom,_3,this.$y7);this.markForRedraw()},isc.A.getInnerWidth=function isc_EdgedCanvas_getInnerWidth(_1,_2,_3){var _4=this.invokeSuper(isc.EdgedCanvas,"getInnerWidth",_1,_2,_3);return _4-this.$tb-this.$tc},isc.A.getInnerHeight=function isc_EdgedCanvas_getInnerHeight(_1,_2,_3){var _4=this.invokeSuper(isc.EdgedCanvas,"getInnerHeight",_1,_2,_3);return _4-this.$td-this.$te},isc.A.getInnerHTML=function isc_EdgedCanvas_getInnerHTML(){var _1=isc.SB.create(),_2=this.edgeImage,_3=_2.lastIndexOf(isc.dot),_4=_2.substring(0,_3),_5=_2.substring(_3),_6=this.getImgURL(_4),_7="<TD HEIGHT=",_8="<TD",_9,_10,_11;if((!isc.Browser.isChrome||isc.Browser.version<56)&&!isc.Browser.isIE10&&!isc.Browser.isEdge&&!((isc.Browser.isStrict&&isc.Browser.isIE&&isc.Browser.version>=8)||(isc.Browser.isMoz&&isc.Browser.isUnix)))
+this.updateEdgeSizes()},isc.A.updateEdgeSizes=function isc_EdgedCanvas_updateEdgeSizes(){var _1=this.edgeSize;this.$y4=this.$du(this.edgeLeft,_1);this.$y5=this.$du(this.edgeRight,_1);this.$y6=this.$du(this.edgeTop,_1);this.$y7=this.$du(this.edgeBottom,_1);var _2=this.shownEdges,_3=this.edgeOffset;if(_2.L)this.$tb=this.$du(this.edgeOffsetLeft,_3,this.$y4);if(_2.R)this.$tc=this.$du(this.edgeOffsetRight,_3,this.$y5);if(_2.T)this.$td=this.$du(this.edgeOffsetTop,_3,this.$y6);if(_2.B)this.$te=this.$du(this.edgeOffsetBottom,_3,this.$y7);this.markForRedraw()},isc.A.getInnerWidth=function isc_EdgedCanvas_getInnerWidth(_1,_2,_3){var _4=this.invokeSuper(isc.EdgedCanvas,"getInnerWidth",_1,_2,_3);return _4-this.$tb-this.$tc},isc.A.getInnerHeight=function isc_EdgedCanvas_getInnerHeight(_1,_2,_3){var _4=this.invokeSuper(isc.EdgedCanvas,"getInnerHeight",_1,_2,_3);return _4-this.$td-this.$te},isc.A.getInnerHTML=function isc_EdgedCanvas_getInnerHTML(){var _1=isc.SB.create(),_2=this.edgeImage,_3=_2.lastIndexOf(isc.dot),_4=_2.substring(0,_3),_5=_2.substring(_3),_6=this.getImgURL(_4),_7="<TD HEIGHT=",_8="<TD",_9,_10,_11;if(!isc.Browser.isIE10&&!isc.Browser.isEdge&&!((isc.Browser.isStrict&&isc.Browser.isIE&&isc.Browser.version>=8)||(isc.Browser.isMoz&&isc.Browser.isUnix)))
 {var _12=isc.EdgedCanvas.$y8;if(!_12){_12=isc.EdgedCanvas.$y8={width:"100%",height:"100%"};if(isc.Browser.isSafari)_12.align="middle";if(isc.Browser.isStrict&&!isc.Browser.isTransitional){_12.extraCSSText="display:block"}}
 _12.src=_2;var _13=this.imgHTML(_12);if(isc.Browser.isSafari){_13="<DIV style='overflow:hidden;width:100%;height:100%'>"+_13+"</DIV>"}
 var _14=_13.lastIndexOf(isc.dot);_9=this.$oa+_13.substring(0,_14);_10=_13.substring(_14);_11="</TD>"}else{_9=" STYLE='background:url("+_6;_10=_5+");"
--- a/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></VERSION>
+<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION><![CDATA[1.0.31055]]></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[PR16Q4.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	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></STARTVERSION>
+<!--86EBD30DEB8045508185B457896C9F6D-->  <STARTVERSION><![CDATA[2.1.31055]]></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.utility.cleanup.log/src/org/openbravo/utility/cleanup/log/LogCleanUpProcess.java	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.utility.cleanup.log/src/org/openbravo/utility/cleanup/log/LogCleanUpProcess.java	Wed Jan 25 05:32:50 2017 +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-2015 Openbravo SLU 
+ * All portions are Copyright (C) 2013-2016 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -90,8 +90,7 @@
         long t = System.currentTimeMillis();
         // force reload of log clean up configuration to prevent LazyInitializationException
         config = OBDal.getInstance().get(LogCleanUpConfig.class, config.getId());
-        Entity entity = ModelProvider.getInstance().getEntityByTableId(
-            config.getTable().getId());
+        Entity entity = ModelProvider.getInstance().getEntityByTableId(config.getTable().getId());
 
         if (config.isTruncateTable()) {
           // tables to be truncated don't use CleanEntity
@@ -221,14 +220,14 @@
         }
       }
     } catch (SQLException e1) {
-      log.error("Errer executing vacuum", e1);
-      bgLogger.equals("Error executing vacuum: " + e1.getMessage());
+      log.error("Error executing vacuum", e1);
+      bgLogger.log("Error executing vacuum: " + e1.getMessage());
     } finally {
       // resetting auto commit to properly release DAL trx
       try {
         con.setAutoCommit(false);
       } catch (SQLException e) {
-        log.error("Errer executing vacuum", e);
+        log.error("Error executing vacuum", e);
       }
     }
   }
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></VERSION>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.31055]]></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[PR16Q4.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	Tue Jan 24 05:37:19 2017 +0000
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jan 25 05:32:50 2017 +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.30447]]></STARTVERSION>
+<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.31055]]></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.30447]]></STARTVERSION>
+<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.31055]]></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.30447]]></STARTVERSION>
+<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.31055]]></STARTVERSION>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <DEPENDANT_MODULE_NAME><![CDATA[Orders Awaiting Delivery]]></DEPENDANT_MODULE_NAME>
<