Merged from PI
authorAsier Martirena <asier.martirena@openbravo.com>
Mon, 31 Oct 2016 09:08:25 +0100
changeset 30834 7480dfe0a257
parent 30648 474b4d4048c1 (current diff)
parent 30833 a9ab872b6dee (diff)
child 30835 6102e353865f
Merged from PI
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FINPaymentEventHandler.java
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/lib/runtime/cal10n-api-0.7.4.jar
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.base.weld/src/org/openbravo/base/weld/WeldUtils.java
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.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.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseKernelServlet.java
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.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
src-core/.settings/org.eclipse.wst.common.component
src-core/.settings/org.eclipse.wst.common.project.facet.core.xml
src-db/database/lib/dbsourcemanager.jar
src-db/database/model/tables/M_INOUT.xml
src-db/database/model/triggers/AD_ROLE_ORGACCESS_TRG.xml
src-db/database/model/views/C_INVOICE_CANDIDATE_V.xml
src-db/database/sourcedata/AD_AUXILIARINPUT.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_ELEMENT.xml
src-db/database/sourcedata/AD_FIELD.xml
src-db/database/sourcedata/AD_MESSAGE.xml
src-db/database/sourcedata/AD_MODULE.xml
src-db/database/sourcedata/AD_REF_LIST.xml
src-db/database/sourcedata/AD_TAB.xml
src-db/database/sourcedata/AD_TABLE.xml
src-trl/.settings/org.eclipse.jdt.core.prefs
src-trl/.settings/org.eclipse.jdt.ui.prefs
src/org/openbravo/base/secureApp/LoginHandler.java
src/org/openbravo/base/secureApp/LoginUtils.java
src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java
--- a/.classpath.template	Fri Oct 28 14:01:24 2016 +0200
+++ b/.classpath.template	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/.hgsigs	Mon Oct 31 09:08:25 2016 +0100
@@ -200,3 +200,4 @@
 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
--- a/.hgtags	Fri Oct 28 14:01:24 2016 +0200
+++ b/.hgtags	Mon Oct 31 09:08:25 2016 +0100
@@ -211,3 +211,4 @@
 6db3d7641170254dbd658eb774e36b092c68dd04 3.0PR16Q2.3
 ec10d529b9bbe8caa83f2ea72b29b94bd3473cae 3.0PR16Q3
 d0dee6596f281e29afcd159544992498896e93ff 3.0PR16Q3.1
+f252db9dde915c15574e3d5fa505bd1154e39c74 3.0PR16Q3.2
--- a/.settings/org.eclipse.jdt.core.prefs	Fri Oct 28 14:01:24 2016 +0200
+++ b/.settings/org.eclipse.jdt.core.prefs	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/WebContent/META-INF/MANIFEST.MF	Mon Oct 31 09:08:25 2016 +0100
@@ -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/config/eclipse/Openbravo-eclipse-prefs.epf	Fri Oct 28 14:01:24 2016 +0200
+++ b/config/eclipse/Openbravo-eclipse-prefs.epf	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/legal/Licensing.txt	Mon Oct 31 09:08:25 2016 +0100
@@ -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
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_PMT_CHECK_TRG.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_PMT_CHECK_TRG.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -28,7 +28,7 @@
   END IF;
 
   IF (UPDATING) THEN
-    IF(:OLD.PROCESSED='Y' AND ((COALESCE(:OLD.AD_ORG_ID, '0') <> COALESCE(:NEW.AD_ORG_ID, '0'))
+    IF(:OLD.PROCESSED='Y' AND :NEW.PROCESSED='Y' AND ((COALESCE(:OLD.AD_ORG_ID, '0') <> COALESCE(:NEW.AD_ORG_ID, '0'))
       OR(COALESCE(:OLD.DOCUMENTNO, '0') <> COALESCE(:NEW.DOCUMENTNO, '0'))
       OR(COALESCE(:OLD.C_CURRENCY_ID, '0') <> COALESCE(:NEW.C_CURRENCY_ID, '0'))
       OR(COALESCE(:OLD.C_BPARTNER_ID, '0') <> COALESCE(:NEW.C_BPARTNER_ID, '0'))
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODEL_OBJECT.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODEL_OBJECT.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.30402]]></VERSION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements.
 If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.30402]]></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.30377]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.30402]]></STARTVERSION>
 <!--B97FC854C6DD41E692161585645A900F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FINPaymentEventHandler.java	Fri Oct 28 14:01:24 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-/*
- *************************************************************************
- * 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.event;
-
-import java.math.BigDecimal;
-
-import javax.enterprise.event.Observes;
-
-import org.apache.log4j.Logger;
-import org.openbravo.base.model.Entity;
-import org.openbravo.base.model.ModelProvider;
-import org.openbravo.base.model.Property;
-import org.openbravo.client.kernel.event.EntityDeleteEvent;
-import org.openbravo.client.kernel.event.EntityNewEvent;
-import org.openbravo.client.kernel.event.EntityPersistenceEvent;
-import org.openbravo.client.kernel.event.EntityPersistenceEventObserver;
-import org.openbravo.client.kernel.event.EntityUpdateEvent;
-import org.openbravo.erpCommon.businessUtility.CancelAndReplaceUtils;
-import org.openbravo.model.financialmgmt.payment.FIN_Payment;
-
-public class FINPaymentEventHandler extends EntityPersistenceEventObserver {
-  private static Entity[] entities = { ModelProvider.getInstance().getEntity(
-      FIN_Payment.ENTITY_NAME) };
-  protected Logger logger = Logger.getLogger(this.getClass());
-
-  @Override
-  protected Entity[] getObservedEntities() {
-    return entities;
-  }
-
-  public void onUpdate(@Observes
-  EntityUpdateEvent event) {
-    if (!isValidEvent(event)) {
-      return;
-    }
-    FIN_Payment payment = (FIN_Payment) event.getTargetInstance();
-    final Entity paymentEntity = ModelProvider.getInstance().getEntity(FIN_Payment.ENTITY_NAME);
-    final Property paymentAmountProperty = paymentEntity.getProperty(FIN_Payment.PROPERTY_AMOUNT);
-    BigDecimal oldPaymentAmount = (BigDecimal) event.getPreviousState(paymentAmountProperty);
-    String documentNo = payment.getDocumentNo();
-    int documentNoLength = payment.getDocumentNo().length();
-    if (payment.getAmount().compareTo(BigDecimal.ZERO) == 0) {
-      // Payment has no already an *Z* at the end of the document number
-      if (!CancelAndReplaceUtils.ZERO_PAYMENT_SUFIX.equals(documentNo
-          .substring(documentNoLength - 3))) {
-        String newDocumentNo = documentNo + CancelAndReplaceUtils.ZERO_PAYMENT_SUFIX;
-        setDocumentNoToPayment(payment, event, newDocumentNo);
-      }
-    } else if (oldPaymentAmount.compareTo(BigDecimal.ZERO) == 0) {
-      if (CancelAndReplaceUtils.ZERO_PAYMENT_SUFIX.equals(documentNo
-          .substring(documentNoLength - 3))) {
-        String newDocumentNo = documentNo.substring(0, documentNoLength - 3);
-        setDocumentNoToPayment(payment, event, newDocumentNo);
-      }
-    }
-  }
-
-  public void onSave(@Observes
-  EntityNewEvent event) {
-    if (!isValidEvent(event)) {
-      return;
-    }
-    FIN_Payment payment = (FIN_Payment) event.getTargetInstance();
-    final Entity paymentEntity = ModelProvider.getInstance().getEntity(FIN_Payment.ENTITY_NAME);
-    final Property processedProperty = paymentEntity.getProperty(FIN_Payment.PROPERTY_PROCESSED);
-    if (payment.getAmount().compareTo(BigDecimal.ZERO) == 0) {
-      String newDocumentNo = payment.getDocumentNo();
-      boolean processed = false;
-      Object oProcessed = (processedProperty == null ? false : event
-          .getCurrentState(processedProperty));
-      if (oProcessed instanceof String) {
-        processed = "Y".equals(oProcessed.toString());
-      } else if (oProcessed instanceof Boolean) {
-        processed = (Boolean) oProcessed;
-      }
-      if (newDocumentNo.startsWith("<") && newDocumentNo.endsWith(">") && !processed) {
-        // Remove "<" and ">" characters from documentNo if payment is not processed
-        newDocumentNo = newDocumentNo.substring(1, newDocumentNo.length() - 1);
-      }
-      newDocumentNo = newDocumentNo + CancelAndReplaceUtils.ZERO_PAYMENT_SUFIX;
-      setDocumentNoToPayment(payment, event, newDocumentNo);
-    }
-  }
-
-  public void onDelete(@Observes
-  EntityDeleteEvent event) {
-    if (!isValidEvent(event)) {
-      return;
-    }
-  }
-
-  private void setDocumentNoToPayment(FIN_Payment payment, EntityPersistenceEvent event,
-      String newDocumentNo) {
-    String truncatedDocumentNo = (newDocumentNo.length() > 30) ? newDocumentNo.substring(0, 30)
-        : newDocumentNo.toString();
-    final Entity paymentEntity = ModelProvider.getInstance().getEntity(FIN_Payment.ENTITY_NAME);
-    final Property paymentDocumentNoProperty = paymentEntity
-        .getProperty(FIN_Payment.PROPERTY_DOCUMENTNO);
-    event.setCurrentState(paymentDocumentNoProperty, truncatedDocumentNo);
-  }
-}
\ No newline at end of file
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_PaymentEventListener.java	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_PaymentEventListener.java	Mon Oct 31 09:08:25 2016 +0100
@@ -11,13 +11,14 @@
  * 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):  ______________________________________.
  *************************************************************************
  */
 package org.openbravo.advpaymentmngt.event;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 import javax.enterprise.event.Observes;
@@ -30,11 +31,13 @@
 import org.openbravo.base.model.ModelProvider;
 import org.openbravo.base.model.Property;
 import org.openbravo.client.kernel.event.EntityDeleteEvent;
+import org.openbravo.client.kernel.event.EntityPersistenceEvent;
 import org.openbravo.client.kernel.event.EntityPersistenceEventObserver;
 import org.openbravo.client.kernel.event.EntityUpdateEvent;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.database.ConnectionProvider;
+import org.openbravo.erpCommon.businessUtility.CancelAndReplaceUtils;
 import org.openbravo.erpCommon.utility.Utility;
 import org.openbravo.model.financialmgmt.payment.FIN_Payment;
 import org.openbravo.model.financialmgmt.payment.FIN_PaymentDetail;
@@ -55,7 +58,51 @@
       return;
     }
 
-    manageAPRMPendingPaymentFromInvoiceRecord(event);
+    final FIN_Payment payment = (FIN_Payment) event.getTargetInstance();
+    final Entity paymentEntity = ModelProvider.getInstance().getEntity(FIN_Payment.ENTITY_NAME);
+    final Property paymentProcessedProperty = paymentEntity
+        .getProperty(FIN_Payment.PROPERTY_PROCESSED);
+    final Boolean currentPaymentProcessed = (Boolean) event
+        .getCurrentState(paymentProcessedProperty);
+    final Boolean oldPaymentProcessed = (Boolean) event.getPreviousState(paymentProcessedProperty);
+    final Property paymentAmountProperty = paymentEntity.getProperty(FIN_Payment.PROPERTY_AMOUNT);
+    final BigDecimal currentPaymentAmount = (BigDecimal) event
+        .getCurrentState(paymentAmountProperty);
+    final BigDecimal oldPaymentAmount = (BigDecimal) event.getPreviousState(paymentAmountProperty);
+    final Property paymentStatusProperty = paymentEntity.getProperty(FIN_Payment.PROPERTY_STATUS);
+    final String currentPaymentStatus = (String) event.getCurrentState(paymentStatusProperty);
+    final String oldPaymentStatus = (String) event.getPreviousState(paymentStatusProperty);
+
+    final String documentNo = payment.getDocumentNo();
+    final int documentNoLength = documentNo.length();
+
+    if (!oldPaymentProcessed
+        && currentPaymentProcessed
+        && currentPaymentAmount.compareTo(BigDecimal.ZERO) == 0
+        && (documentNoLength < CancelAndReplaceUtils.ZERO_PAYMENT_SUFIX.length() || !CancelAndReplaceUtils.ZERO_PAYMENT_SUFIX
+            .equals(documentNo.substring(documentNoLength
+                - CancelAndReplaceUtils.ZERO_PAYMENT_SUFIX.length())))) {
+      // Processing a zero payment: add sufix
+      final int documentNoLimit = CancelAndReplaceUtils.PAYMENT_DOCNO_LENGTH
+          - CancelAndReplaceUtils.ZERO_PAYMENT_SUFIX.length();
+      String newDocumentNo = (documentNoLength > documentNoLimit ? documentNo.substring(0,
+          documentNoLimit) : documentNo) + CancelAndReplaceUtils.ZERO_PAYMENT_SUFIX;
+      setDocumentNoToPayment(event, newDocumentNo);
+    }
+
+    else if (oldPaymentProcessed
+        && !currentPaymentProcessed
+        && oldPaymentAmount.compareTo(BigDecimal.ZERO) == 0
+        && documentNoLength > CancelAndReplaceUtils.ZERO_PAYMENT_SUFIX.length()
+        && CancelAndReplaceUtils.ZERO_PAYMENT_SUFIX.equals(documentNo.substring(documentNoLength
+            - CancelAndReplaceUtils.ZERO_PAYMENT_SUFIX.length()))) {
+      // Reactivating a zero payment: remove sufix
+      String newDocumentNo = documentNo.substring(0, documentNoLength
+          - CancelAndReplaceUtils.ZERO_PAYMENT_SUFIX.length());
+      setDocumentNoToPayment(event, newDocumentNo);
+    }
+
+    manageAPRMPendingPaymentFromInvoiceRecord(payment, currentPaymentStatus, oldPaymentStatus);
   }
 
   public void onDelete(@Observes EntityDeleteEvent event) {
@@ -88,18 +135,12 @@
    * Returns the number of records updated or deleted (0 or 1)
    * 
    */
-  private int manageAPRMPendingPaymentFromInvoiceRecord(final EntityUpdateEvent event) {
+  private int manageAPRMPendingPaymentFromInvoiceRecord(FIN_Payment payment,
+      String currentPaymentStatus, String oldPaymentStatus) {
     try {
       OBContext.setAdminMode(true);
-
       int rowCount = 0;
 
-      final FIN_Payment payment = (FIN_Payment) event.getTargetInstance();
-      final Entity paymentEntity = ModelProvider.getInstance().getEntity(FIN_Payment.ENTITY_NAME);
-      final Property paymentStatusProperty = paymentEntity.getProperty(FIN_Payment.PROPERTY_STATUS);
-      final String currentPaymentStatus = (String) event.getCurrentState(paymentStatusProperty);
-      final String oldPaymentStatus = (String) event.getPreviousState(paymentStatusProperty);
-
       if (StringUtils.equals("RPAE", currentPaymentStatus)) {
         final PaymentExecutionProcess executionProcess = new AdvPaymentMngtDao()
             .getExecutionProcess(payment);
@@ -165,4 +206,11 @@
     rowCount = updateQry.executeUpdate();
     return rowCount;
   }
+
+  private void setDocumentNoToPayment(EntityPersistenceEvent event, String newDocumentNo) {
+    final Entity paymentEntity = ModelProvider.getInstance().getEntity(FIN_Payment.ENTITY_NAME);
+    final Property paymentDocumentNoProperty = paymentEntity
+        .getProperty(FIN_Payment.PROPERTY_DOCUMENTNO);
+    event.setCurrentState(paymentDocumentNoProperty, newDocumentNo);
+  }
 }
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddPaymentReadOnlyLogicsHandler.java	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddPaymentReadOnlyLogicsHandler.java	Mon Oct 31 09:08:25 2016 +0100
@@ -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.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></VERSION>
+<!--8A098711BB324335A19833286BDB093D-->  <VERSION><![CDATA[1.0.30402]]></VERSION>
 <!--8A098711BB324335A19833286BDB093D-->  <DESCRIPTION><![CDATA[Apache External Connection Pool]]></DESCRIPTION>
 <!--8A098711BB324335A19833286BDB093D-->  <HELP><![CDATA[This module implements the Apache JDBC Connection Pool (http://wiki.openbravo.com/wiki/Modules:Apache_JDBC_Connection_Pool).]]></HELP>
 <!--8A098711BB324335A19833286BDB093D-->  <TYPE><![CDATA[M]]></TYPE>
--- a/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></STARTVERSION>
+<!--1467C397BC5F4999A5606F39CD6FF8A4-->  <STARTVERSION><![CDATA[2.1.30402]]></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>
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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.30402]]></VERSION>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <DESCRIPTION><![CDATA[JBoss Weld]]></DESCRIPTION>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <HELP><![CDATA[Provides the JBoss Weld framework: Java Contexts and Dependency Injection for the Java EE platform (CDI). For more information see http://seamframework.org/Weld]]></HELP>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL>
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.30402]]></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/org/openbravo/base/weld/WeldUtils.java	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.base.weld/src/org/openbravo/base/weld/WeldUtils.java	Mon Oct 31 09:08:25 2016 +0100
@@ -31,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;
@@ -47,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.
--- a/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_SYSTEM.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_SYSTEM.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_TAB.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_REPORT.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/model/triggers/OBUIAPP_REPORT_MOD_TRG.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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>
@@ -1231,6 +1243,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>
@@ -1538,7 +1562,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>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.30402]]></VERSION>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <DESCRIPTION><![CDATA[Provides the main application components for the openbravo user interface]]></DESCRIPTION>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <HELP><![CDATA[Provides the main application components for the openbravo user interface. The main layout incorporates a navigation bar and a main view area.]]></HELP>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.30402]]></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.30377]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.30402]]></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.30377]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.30402]]></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.30377]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.30402]]></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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REF_LIST.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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>
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/HeartBeatPopupActionHandler.java	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/HeartBeatPopupActionHandler.java	Mon Oct 31 09:08:25 2016 +0100
@@ -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/WindowSettingsActionHandler.java	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/WindowSettingsActionHandler.java	Mon Oct 31 09:08:25 2016 +0100
@@ -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/CoreAttachImplementation.java	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/CoreAttachImplementation.java	Mon Oct 31 09:08:25 2016 +0100
@@ -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/event/NoteEventHandler.java	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/NoteEventHandler.java	Mon Oct 31 09:08:25 2016 +0100
@@ -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/process/BaseProcessActionHandler.java	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/report/BaseReportActionHandler.java	Mon Oct 31 09:08:25 2016 +0100
@@ -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,15 +63,18 @@
 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 {
@@ -78,8 +82,8 @@
   private static final String JASPER_PARAM_PROCESS = "jasper_process";
 
   /**
-   * 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 +93,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 +148,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 +187,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 +226,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,6 +285,39 @@
     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
@@ -255,9 +327,12 @@
     HashMap<String, Object> jrParams = new HashMap<String, Object>();
     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));
     log.debug("Report: {}. Start export JR process.", report.getId());
     long t1 = System.currentTimeMillis();
-    doJRExport(jrTemplatePath, expType, jrParams, strTmpFileName);
+    doJRExport(jrTemplatePath, expType, jrParams, strTmpFileName, getReportConnectionProvider(),
+        getReportData(parameters));
     log.debug("Report: {}. Finish export JR process. Elapsed time: {}", report.getId(),
         System.currentTimeMillis() - t1);
 
@@ -270,7 +345,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);
@@ -429,7 +509,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 +537,45 @@
       Map<String, Object> parameters) {
   }
 
+  /**
+   * Get the data to pass to the report generation method. Override this method to put logic for
+   * getting the data
+   * 
+   * @param parameters
+   *          map with the parameters of the call that can be used to generate the report data
+   *
+   * @return
+   */
+  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
+   */
+  protected ConnectionProvider getReportConnectionProvider() {
+    return null;
+  }
+
   private static void doJRExport(String jrTemplatePath, ExportType expType,
-      Map<String, Object> parameters, String strFileName) {
+      Map<String, Object> parameters, String strFileName, ConnectionProvider connection,
+      JRDataSource data) {
     ReportSemaphoreHandling.getInstance().acquire();
+    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, parameters, strFileName, true, connection,
+          data, localExportParameters);
     } finally {
       ReportSemaphoreHandling.getInstance().release();
     }
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-pick-and-execute-grid.js.ftl	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-pick-and-execute-view-window.js.ftl	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl	Mon Oct 31 09:08:25 2016 +0100
@@ -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/OBViewGridComponent.java	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java	Mon Oct 31 09:08:25 2016 +0100
@@ -403,39 +403,53 @@
    * '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
+   */
+  public boolean getAllowSummaryFunctions() {
+    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
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ParameterWindowComponent.java	Mon Oct 31 09:08:25 2016 +0100
@@ -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):  ______________________________________.
  ************************************************************************
@@ -185,6 +185,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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/servlet/CalloutServletConfig.java	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js	Mon Oct 31 09:08:25 2016 +0100
@@ -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/ob-view-form.js	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js	Mon Oct 31 09:08:25 2016 +0100
@@ -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;
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js	Mon Oct 31 09:08:25 2016 +0100
@@ -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;
         }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Mon Oct 31 09:08:25 2016 +0100
@@ -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');
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-event-handler-registry.js	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-event-handler-registry.js	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Mon Oct 31 09:08:25 2016 +0100
@@ -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);
+    }
 
   },
 
@@ -2160,11 +2164,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 = {
@@ -2177,6 +2201,8 @@
         callback: callback
       };
       OB.EventHandlerRegistry.call(params);
+    } else if (executeCallback && isc.isA.Function(callback)) {
+      callback();
     }
   },
 
@@ -2337,8 +2363,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/personalization/ob-manage-views-toolbar.js	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-toolbar.js	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-base-parameter-window-view.js	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js	Mon Oct 31 09:08:25 2016 +0100
@@ -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-view.js	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-view.js	Mon Oct 31 09:08:25 2016 +0100
@@ -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
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-history-manager.js	Mon Oct 31 09:08:25 2016 +0100
@@ -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-utilities-action-def.js	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-action-def.js	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.30402]]></VERSION>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <DESCRIPTION><![CDATA[Provides the HTML Widget superclass that allows to create widget classes that embed the html code.]]></DESCRIPTION>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <HELP><![CDATA[With this module you can define your own widget classes just setting up your own html code or the html code provided by third parties.]]></HELP>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <URL><![CDATA[http://forge.openbravo.com/projects/htmlwidget]]></URL>
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.30402]]></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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.30402]]></VERSION>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <DESCRIPTION><![CDATA[Provides framework functionality for the Openbravo User Interface]]></DESCRIPTION>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <HELP><![CDATA[The user interface client kernel is a generation framework for generating client (browser) components used in Openbravo. Its components are mainly used by other modules to provide customizable and extendable user interfaces.]]></HELP>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravoclientkernel]]></URL>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.30402]]></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.30377]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.30402]]></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.30377]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.30402]]></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/RequestContext.java	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/RequestContext.java	Mon Oct 31 09:08:25 2016 +0100
@@ -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.myob/src-db/database/sourcedata/AD_MODULE.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.30402]]></VERSION>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <DESCRIPTION><![CDATA[Workspace & Widgets]]></DESCRIPTION>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <HELP><![CDATA[Provides the infrastructure of workspace tab (formerly My Openbravo)]]></HELP>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <URL><![CDATA[http://forge.openbravo.com/projects/myopenbravo]]></URL>
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.30402]]></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.30377]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.30402]]></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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js	Mon Oct 31 09:08:25 2016 +0100
@@ -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;
@@ -440,7 +450,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);
@@ -467,6 +477,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);
@@ -508,9 +525,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%',
@@ -552,7 +572,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);
@@ -570,6 +590,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];
@@ -586,7 +613,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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.myob/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.myob/ob-myopenbravo-styles.css	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.30402]]></VERSION>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <DESCRIPTION><![CDATA[Provides the Query/List superclass widget that allows to create widget classes that prints a grid of data based on a query.]]></DESCRIPTION>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <HELP><![CDATA[With this module you can define your own widget classes that just with simple Application Dictionary shows a grid of data based on a HQL Query.]]></HELP>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <URL><![CDATA[http://forge.openbravo.com/projects/querylistwidget]]></URL>
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.30402]]></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	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_ELEMENT.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.30402]]></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>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DBPREFIX.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.30402]]></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	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBCQL_QUERY_COLUMN.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBCQL_WIDGET_QUERY.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.30402]]></VERSION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <DESCRIPTION><![CDATA[Payment Report]]></DESCRIPTION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <URL><![CDATA[http://forge.openbravo.com/projects/paymentreport]]></URL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <TYPE><![CDATA[M]]></TYPE>
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.30402]]></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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.30402]]></VERSION>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <DESCRIPTION><![CDATA[Report displaying sales orders not shipped.]]></DESCRIPTION>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <URL><![CDATA[http://forge.openbravo.com/projects/ordersawaitingdlivery]]></URL>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <TYPE><![CDATA[M]]></TYPE>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.30402]]></STARTVERSION>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></VERSION>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.30402]]></VERSION>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <DESCRIPTION><![CDATA[Provides data source CRUD functionality using JSON as the data format]]></DESCRIPTION>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <HELP><![CDATA[This module implements the datasource concept. Datasources play a central role in Smartclient applications. The datasource module automatically creates a datasource for each Openbravo entity. In addition custom data source implementations can be defined.]]></HELP>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <URL><![CDATA[http://forge.openbravo.com/projects/datasourceservice]]></URL>
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></STARTVERSION>
+<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.30402]]></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.30377]]></STARTVERSION>
+<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.30402]]></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.30377]]></STARTVERSION>
+<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.30402]]></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.30377]]></STARTVERSION>
+<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.30402]]></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.30377]]></STARTVERSION>
+<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.30402]]></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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/BaseDataSourceService.java	Mon Oct 31 09:08:25 2016 +0100
@@ -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/DataSourceServlet.java	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java	Mon Oct 31 09:08:25 2016 +0100
@@ -539,7 +539,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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DefaultDataSourceService.java	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></VERSION>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.30402]]></VERSION>
 <!--FF8080813129ADA401312CA1222A0005-->  <DESCRIPTION><![CDATA[Integration with Google APIs]]></DESCRIPTION>
 <!--FF8080813129ADA401312CA1222A0005-->  <TYPE><![CDATA[M]]></TYPE>
 <!--FF8080813129ADA401312CA1222A0005-->  <LICENSE><![CDATA[Licensed under the Openbravo Public License Version 1.1.
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></STARTVERSION>
+<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.30402]]></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.30377]]></STARTVERSION>
+<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.30402]]></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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></VERSION>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.30402]]></VERSION>
 <!--FF8080813141B198013141B86DD70003-->  <DESCRIPTION><![CDATA[OpenID Service Integration]]></DESCRIPTION>
 <!--FF8080813141B198013141B86DD70003-->  <TYPE><![CDATA[M]]></TYPE>
 <!--FF8080813141B198013141B86DD70003-->  <LICENSE><![CDATA[Licensed under the Openbravo Public License Version 1.1.
--- a/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></STARTVERSION>
+<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.30402]]></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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></VERSION>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.30402]]></VERSION>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <DESCRIPTION><![CDATA[Provides a JSON REST webservice for CRUD service requests]]></DESCRIPTION>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <HELP><![CDATA[Provides a JSON REST webservice for CRUD service requests. Both the servlet implementation (receiving HTTP REST requests in JSON) as the backend processing are provided.]]></HELP>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravojsonrest]]></URL>
--- a/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></STARTVERSION>
+<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.30402]]></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/DefaultJsonDataService.java	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java	Mon Oct 31 09:08:25 2016 +0100
@@ -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.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></VERSION>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.30402]]></VERSION>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <DESCRIPTION><![CDATA[Provides a selector with a suggestion box and popup grid window]]></DESCRIPTION>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <HELP><![CDATA[The Openbravo selector provides new selector functionality which is used inside of existing Openbravo forms. The selector is mainly used for supporting foreign key references in the user interface. The selector combines both suggestion box behavior with a popup grid.]]></HELP>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <URL><![CDATA[http://forge.openbravo.com/projects/selector]]></URL>
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></STARTVERSION>
+<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.30402]]></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.30377]]></STARTVERSION>
+<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.30402]]></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.30377]]></STARTVERSION>
+<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.30402]]></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.30377]]></STARTVERSION>
+<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.30402]]></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.30377]]></STARTVERSION>
+<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.30402]]></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.30377]]></STARTVERSION>
+<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.30402]]></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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDataSourceFilter.java	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js	Mon Oct 31 09:08:25 2016 +0100
@@ -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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></VERSION>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.30402]]></VERSION>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <DESCRIPTION><![CDATA[Skin module to proper visualization of classic windows inside the MDI interface]]></DESCRIPTION>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <HELP><![CDATA[With this skin module the classic windows styles will display in a way more coherent with the new 3.00 styles]]></HELP>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <URL><![CDATA[www.openbravo.com]]></URL>
--- a/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></STARTVERSION>
+<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.30402]]></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	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></VERSION>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.30402]]></VERSION>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <DESCRIPTION><![CDATA[SmartClient libraries for use within Openbravo]]></DESCRIPTION>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <HELP><![CDATA[This module contains the SmartClient libraries for usage by other modules. It also contains some simple test pages to validate that SmartClient is working correctly. Also contains generic Openbravo SmartClient components]]></HELP>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <URL><![CDATA[http://forge.openbravo.com/projects/obsmartclient]]></URL>
--- a/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></STARTVERSION>
+<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.30402]]></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.30377]]></STARTVERSION>
+<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.30402]]></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.30377]]></STARTVERSION>
+<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.30402]]></STARTVERSION>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></VERSION>
+<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION><![CDATA[1.0.30402]]></VERSION>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <DESCRIPTION><![CDATA[Log Clean Up Utility]]></DESCRIPTION>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <HELP><![CDATA[Utility to periodically cleanup log tables]]></HELP>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <URL><![CDATA[http://centralrepository.openbravo.com/heartbeat-server/org.openbravo.forge.ui/ForgeProjectDetail?projectId=7DC25E3B7ADE426CAD71E7804B95C1BF]]></URL>
--- a/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></STARTVERSION>
+<!--86EBD30DEB8045508185B457896C9F6D-->  <STARTVERSION><![CDATA[2.1.30402]]></STARTVERSION>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></VERSION>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.30402]]></VERSION>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <DESCRIPTION><![CDATA[Pre-configured collection of standard ERP roles]]></DESCRIPTION>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <HELP><![CDATA[This dataset contains the following roles with their access to corresponding Openbravo entities - windows, reports, actions.
 * Employee - Any person of the enterprise
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -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.30377]]></STARTVERSION>
+<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.30402]]></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.30377]]></STARTVERSION>
+<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.30402]]></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.30377]]></STARTVERSION>
+<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.30402]]></STARTVERSION>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <DEPENDANT_MODULE_NAME><![CDATA[Orders Awaiting Delivery]]></DEPENDANT_MODULE_NAME>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -6,7 +6,7 @@
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <NAME><![CDATA[Openbravo 3.0 Framework]]></NAME>
-<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.30377]]></VERSION>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.30402]]></VERSION>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <DESCRIPTION><![CDATA[Openbravo 3.0 Framework]]></DESCRIPTION>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <HELP><![CDATA[Contains all the components required to run the Openbravo 3.0 framework]]></HELP>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravov30framework]]></URL>
--- a/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -7,7 +7,7 @@
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.30377]]></STARTVERSION>
+<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.30402]]></STARTVERSION>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--025B181F63CA47B48A920F6983242390-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--025B181F63CA47B48A920F6983242390-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--025B181F63CA47B48A920F6983242390-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.30377]]></STARTVERSION>
+<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.30402]]></STARTVERSION>
 <!--025B181F63CA47B48A920F6983242390-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--025B181F63CA47B48A920F6983242390-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--025B181F63CA47B48A920F6983242390-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.30377]]></STARTVERSION>
+<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.30402]]></STARTVERSION>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Application]]></DEPENDANT_MODULE_NAME>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_DEPENDENT_MODULE_ID>
-<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.30377]]></STARTVERSION>
+<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.30402]]></STARTVERSION>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <DEPENDANT_MODULE_NAME><![CDATA[Query/List Widget]]></DEPENDANT_MODULE_NAME>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--224754C3EF674C93B0D468F47BAAB824-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.30377]]></STARTVERSION>
+<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.30402]]></STARTVERSION>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -77,7 +77,7 @@
 <!--5B72D24032DD4879A950194139D961B6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--5B72D24032DD4879A950194139D961B6-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--5B72D24032DD4879A950194139D961B6-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.30377]]></STARTVERSION>
+<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.30402]]></STARTVERSION>
 <!--5B72D24032DD4879A950194139D961B6-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--5B72D24032DD4879A950194139D961B6-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--5B72D24032DD4879A950194139D961B6-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -91,7 +91,7 @@
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <AD_DEPENDENT_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_DEPENDENT_MODULE_ID>
-<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.30377]]></STARTVERSION>
+<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.30402]]></STARTVERSION>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <DEPENDANT_MODULE_NAME><![CDATA[HTML Widget]]></DEPENDANT_MODULE_NAME>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -105,7 +105,7 @@
 <!--98C47FF058F8413B8A2B26036061446E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--98C47FF058F8413B8A2B26036061446E-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--98C47FF058F8413B8A2B26036061446E-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.30377]]></STARTVERSION>
+<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.30402]]></STARTVERSION>
 <!--98C47FF058F8413B8A2B26036061446E-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--98C47FF058F8413B8A2B26036061446E-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--98C47FF058F8413B8A2B26036061446E-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -119,7 +119,7 @@
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <AD_DEPENDENT_MODULE_ID><![CDATA[96998CBC42744B3DBEE28AC8095C9335]]></AD_DEPENDENT_MODULE_ID>
-<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.30377]]></STARTVERSION>
+<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.30402]]></STARTVERSION>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <DEPENDANT_MODULE_NAME><![CDATA[2.50 to 3.00 Compatibility Skin]]></DEPENDANT_MODULE_NAME>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -133,7 +133,7 @@
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.30377]]></STARTVERSION>
+<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.30402]]></STARTVERSION>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -147,7 +147,7 @@
 <!--E72A053A403C4A98A189C105B850ADB0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.30377]]></STARTVERSION>
+<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.30402]]></STARTVERSION>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -161,7 +161,7 @@
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <AD_DEPENDENT_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_DEPENDENT_MODULE_ID>
-<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.30377]]></STARTVERSION>
+<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.30402]]></STARTVERSION>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -6,7 +6,7 @@
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <NAME><![CDATA[Openbravo 3.0]]></NAME>
-<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.30377]]></VERSION>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.30402]]></VERSION>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <DESCRIPTION><![CDATA[Openbravo 3.0 distribution template]]></DESCRIPTION>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HELP><![CDATA[Openbravo 3.0 is a collection (distribution) of modules. This template is a container of all the modules and configuration changes that compose Openbravo 3.0.]]></HELP>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <URL><![CDATA[http://forge.openbravo.com/projects/vthree]]></URL>
--- a/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -7,7 +7,7 @@
 <!--48D556894CE54CF998DC97882E904CBD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--48D556894CE54CF998DC97882E904CBD-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--48D556894CE54CF998DC97882E904CBD-->  <AD_DEPENDENT_MODULE_ID><![CDATA[8A098711BB324335A19833286BDB093D]]></AD_DEPENDENT_MODULE_ID>
-<!--48D556894CE54CF998DC97882E904CBD-->  <STARTVERSION><![CDATA[1.0.30377]]></STARTVERSION>
+<!--48D556894CE54CF998DC97882E904CBD-->  <STARTVERSION><![CDATA[1.0.30402]]></STARTVERSION>
 <!--48D556894CE54CF998DC97882E904CBD-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--48D556894CE54CF998DC97882E904CBD-->  <DEPENDANT_MODULE_NAME><![CDATA[Apache External Connection Pool]]></DEPENDANT_MODULE_NAME>
 <!--48D556894CE54CF998DC97882E904CBD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--4D11E3A70650475381139522373CD191-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4D11E3A70650475381139522373CD191-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--4D11E3A70650475381139522373CD191-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.30377]]></STARTVERSION>
+<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.30402]]></STARTVERSION>
 <!--4D11E3A70650475381139522373CD191-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--4D11E3A70650475381139522373CD191-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--4D11E3A70650475381139522373CD191-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_DEPENDENT_MODULE_ID>
-<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.30377]]></STARTVERSION>
+<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.30402]]></STARTVERSION>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <DEPENDANT_MODULE_NAME><![CDATA[Payment Report]]></DEPENDANT_MODULE_NAME>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--60834727BB114764ACEF019F40A34562-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--60834727BB114764ACEF019F40A34562-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--60834727BB114764ACEF019F40A34562-->  <AD_DEPENDENT_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_DEPENDENT_MODULE_ID>
-<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.30377]]></STARTVERSION>
+<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.30402]]></STARTVERSION>
 <!--60834727BB114764ACEF019F40A34562-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--60834727BB114764ACEF019F40A34562-->  <DEPENDANT_MODULE_NAME><![CDATA[Orders Awaiting Delivery]]></DEPENDANT_MODULE_NAME>
 <!--60834727BB114764ACEF019F40A34562-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--8418885E97D643138B6D907671351E3D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8418885E97D643138B6D907671351E3D-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--8418885E97D643138B6D907671351E3D-->  <AD_DEPENDENT_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_DEPENDENT_MODULE_ID>
-<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.30377]]></STARTVERSION>
+<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.30402]]></STARTVERSION>
 <!--8418885E97D643138B6D907671351E3D-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--8418885E97D643138B6D907671351E3D-->  <DEPENDANT_MODULE_NAME><![CDATA[Standard Roles]]></DEPENDANT_MODULE_NAME>
 <!--8418885E97D643138B6D907671351E3D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -77,7 +77,7 @@
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.30377]]></STARTVERSION>
+<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.30402]]></STARTVERSION>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MINOR]]></DEPENDENCY_ENFORCEMENT>
@@ -91,7 +91,7 @@
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.30377]]></STARTVERSION>
+<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.30402]]></STARTVERSION>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -105,7 +105,7 @@
 <!--FEF6E40F244A4061B7C62CB755663712-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <AD_DEPENDENT_MODULE_ID><![CDATA[8A34B301DC524EA3A07513DF9F42CC90]]></AD_DEPENDENT_MODULE_ID>
-<!--FEF6E40F244A4061B7C62CB755663712-->  <STARTVERSION><![CDATA[1.0.30377]]></STARTVERSION>
+<!--FEF6E40F244A4061B7C62CB755663712-->  <STARTVERSION><![CDATA[1.0.30402]]></STARTVERSION>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <DEPENDANT_MODULE_NAME><![CDATA[Log Clean Up Utility]]></DEPENDANT_MODULE_NAME>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -119,7 +119,7 @@
 <!--FF8080813189932B013189B45B59003A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813189932B013189B45B59003A-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FF8080813189932B013189B45B59003A-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.30377]]></STARTVERSION>
+<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.30402]]></STARTVERSION>
 <!--FF8080813189932B013189B45B59003A-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8080813189932B013189B45B59003A-->  <DEPENDANT_MODULE_NAME><![CDATA[OpenID Service Integration]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813189932B013189B45B59003A-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -133,7 +133,7 @@
 <!--FF8080813189932B013189B4C00F003D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813189932B013189B4C00F003D-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FF8080813189932B013189B4C00F003D-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.30377]]></STARTVERSION>
+<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.30402]]></STARTVERSION>
 <!--FF8080813189932B013189B4C00F003D-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8080813189932B013189B4C00F003D-->  <DEPENDANT_MODULE_NAME><![CDATA[Integration with Google APIs]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813189932B013189B4C00F003D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -147,7 +147,7 @@
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.30377]]></STARTVERSION>
+<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.30402]]></STARTVERSION>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDANT_MODULE_NAME><![CDATA[Widgets Collection]]></DEPENDANT_MODULE_NAME>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/src-core/.settings/org.eclipse.jdt.core.prefs	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-core/.settings/org.eclipse.jdt.core.prefs	Mon Oct 31 09:08:25 2016 +0100
@@ -1,13 +1,4 @@
-#Mon Feb 02 13:12:47 CET 2009
 eclipse.preferences.version=1
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
@@ -18,259 +9,3 @@
 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.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=100
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=8
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=100
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=2
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
--- a/src-core/.settings/org.eclipse.wst.common.component	Fri Oct 28 14:01:24 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-<wb-module deploy-name="OpenbravoCore">
-<wb-resource deploy-path="/" source-path="/src"/>
-</wb-module>
-</project-modules>
--- a/src-core/.settings/org.eclipse.wst.common.project.facet.core.xml	Fri Oct 28 14:01:24 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <fixed facet="jst.java"/>
-  <fixed facet="jst.utility"/>
-  <installed facet="jst.utility" version="1.0"/>
-  <installed facet="jst.java" version="5.0"/>
-</faceted-project>
--- a/src-core/build.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-core/build.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
 ************************************************************************************
-* Copyright (C) 2001-2014 Openbravo S.L.U.
+* Copyright (C) 2001-2016 Openbravo S.L.U.
 * Licensed under the Apache Software License version 2.0
 * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
 * Unless required by applicable law or agreed to  in writing,  software  distributed
@@ -44,7 +44,7 @@
   </target>
 
   <target name="compile" depends="init">
-    <javac srcdir="${build.core.src}" destdir="${build.core}" fork="true" deprecation="off" encoding="UTF-8" debug="true" debuglevel="lines,vars,source" includeantruntime="false">
+    <javac srcdir="${build.core.src}" destdir="${build.core}" fork="true" deprecation="off" encoding="UTF-8" debug="true" debuglevel="lines,vars,source" includeantruntime="false" source="1.6" target="1.6">
       <classpath refid="core.class.path"/>  
     </javac>
   </target>
--- a/src-core/src/org/openbravo/base/ConfigParameters.java	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-core/src/org/openbravo/base/ConfigParameters.java	Mon Oct 31 09:08:25 2016 +0100
@@ -44,7 +44,7 @@
   public final String strBBDD = null;
   public final String strVersion;
   public final String strParentVersion;
-  public final String prefix;
+  public String prefix;
   public final String strContext;
   private final String strFileFormat;
   public final String strSystemLanguage;
@@ -80,6 +80,9 @@
 
   public ConfigParameters(ServletContext context) {
     prefix = context.getRealPath("/");
+    if (!prefix.endsWith("/")) {
+      prefix += "/";
+    }
     strContext = extractContext(getActualPathContext());
 
     strBaseConfigPath = getResolvedParameter(context, "BaseConfigPath");
--- a/src-core/src/org/openbravo/base/VariablesBase.java	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-core/src/org/openbravo/base/VariablesBase.java	Mon Oct 31 09:08:25 2016 +0100
@@ -1164,7 +1164,6 @@
   /**
    * @return the parameter names of the request object
    */
-  @SuppressWarnings("unchecked")
   public Enumeration<String> getParameterNames() {
     return httpRequest.getParameterNames();
   }
--- a/src-core/src/org/openbravo/buildvalidation/BuildValidationHandler.java	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-core/src/org/openbravo/buildvalidation/BuildValidationHandler.java	Mon Oct 31 09:08:25 2016 +0100
@@ -1,6 +1,6 @@
 /*
  ************************************************************************************
- * Copyright (C) 2010-2015 Openbravo S.L.U.
+ * Copyright (C) 2010-2016 Openbravo S.L.U.
  * Licensed under the Apache Software License version 2.0
  * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to  in writing,  software  distributed
@@ -23,6 +23,16 @@
 public class BuildValidationHandler {
   private static final Logger log4j = Logger.getLogger(BuildValidationHandler.class);
 
+  /** Prerequisite validations are ensured to be executed before the rest of other ones */
+  @SuppressWarnings("serial")
+  private static final List<String> prerequisiteValidations = new ArrayList<String>() {
+    {
+      // guarantee current JVM version before executing other validations that can be compiled with
+      // a higher version
+      add("org.openbravo.buildvalidation.JdkVersionCheck");
+    }
+  };
+
   private static File basedir;
   private static String module;
 
@@ -48,6 +58,7 @@
       }
       Collections.sort(modFolders);
     }
+
     for (File modFolder : modFolders) {
       if (modFolder.isDirectory()) {
         File validationFolder = new File(modFolder, "build/classes");
@@ -56,6 +67,9 @@
         }
       }
     }
+
+    sortPrerequisites(classes);
+
     for (String s : classes) {
       ArrayList<String> errors = new ArrayList<String>();
       try {
@@ -79,6 +93,16 @@
     }
   }
 
+  /** Prerequisites are set at the beginning of the list */
+  private static void sortPrerequisites(List<String> classes) {
+    Collections.reverse(prerequisiteValidations);
+    for (String prerequisite : prerequisiteValidations) {
+      if (classes.remove(prerequisite)) {
+        classes.add(0, prerequisite);
+      }
+    }
+  }
+
   private static void printMessage(List<String> errors) {
     String errorMessage = "";
     for (String error : errors) {
Binary file src-db/database/lib/dbsourcemanager.jar has changed
--- a/src-db/database/model/functions/AD_LANGUAGE_CREATE.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-db/database/model/functions/AD_LANGUAGE_CREATE.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -590,6 +590,28 @@
     v_Created:=v_Created + v_rowcount;
     DBMS_OUTPUT.PUT_LINE('- AD_TextInterfaces ' || v_rowcount) ;
 
+    -- Offer_Type
+    INSERT
+    INTO M_Offer_Type_Trl
+      (
+        M_Offer_Type_Trl_ID, M_Offer_Type_ID, AD_Language, Name, Description, IsTranslated,
+        Createdby, UpdatedBy, Created, Updated,
+        AD_Client_ID, AD_Org_ID, IsActive
+      )
+    SELECT get_uuid(), M_Offer_Type_ID, AD_Language.AD_Language, M_Offer_Type.name, M_Offer_Type.description, 'N', '0', '0', now(), now(), M_Offer_Type.AD_Client_ID, M_Offer_Type.AD_Org_ID, 'Y'
+    FROM M_Offer_Type, AD_Language, AD_module m
+    WHERE AD_Language.IsActive='Y'  
+    AND AD_Language.IsSystemLanguage='Y'  
+    and m.ad_module_id = M_Offer_Type.AD_MODULE_ID
+    and m.ad_language != AD_Language.AD_Language
+    AND NOT EXISTS (SELECT 1 FROM M_Offer_Type_Trl
+                 WHERE M_Offer_Type_ID = M_Offer_Type.M_Offer_Type_ID
+                   AND AD_LANGUAGE = AD_Language.AD_Language); 
+
+    v_rowcount:=SQL%ROWCOUNT;
+    v_Created:=v_Created + v_rowcount;
+    DBMS_OUTPUT.PUT_LINE('- M_Offer_Type ' || v_rowcount) ;
+    
     -- Call extension points
     SELECT count(*) INTO v_count
     FROM DUAL
--- a/src-db/database/model/functions/M_INITIALIZE_STOCK_VALUATION.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-db/database/model/functions/M_INITIALIZE_STOCK_VALUATION.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -22,7 +22,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):  ______________________________________.
 ************************************************************************/
@@ -68,7 +68,7 @@
           SELECT SUM(a.qty) as stock, ROUND(SUM(sumcost), v_costprecission) as valuation, aux_warehouse_id as m_warehouse_id
           FROM (
             SELECT trx.m_product_id, w.m_warehouse_id AS aux_warehouse_id,
-                SUM(trx.movementqty) AS qty, c_currency_convert_precision(SUM (CASE WHEN trx.movementqty < 0 THEN -tc.cost ELSE tc.cost END), tc.c_currency_id, v_currency_id, tc.dateacct, NULL, p_client, Cur_legal_entities.ad_org_id, 'C') AS sumcost
+                trx.movementqty AS qty, c_currency_convert_precision(SUM (CASE WHEN trx.movementqty < 0 THEN -tc.cost ELSE tc.cost END), tc.c_currency_id, v_currency_id, tc.dateacct, NULL, p_client, Cur_legal_entities.ad_org_id, 'C') AS sumcost
             FROM m_transaction trx
               JOIN m_locator l ON (trx.m_locator_id=l.m_locator_id)
               LEFT JOIN m_warehouse w ON w.m_warehouse_id = CASE Cur_legal_entities.warehouse_dimension WHEN 'Y' THEN l.m_warehouse_id ELSE '-1' END
--- a/src-db/database/model/functions/M_REQUISITION_CREATEPO.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-db/database/model/functions/M_REQUISITION_CREATEPO.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -54,6 +54,7 @@
   v_stdPre NUMBER;
   v_priPre NUMBER;
   v_Gross NUMBER;
+  v_Description C_OrderLine.Description%TYPE;
 
   p_OrderDate DATE;
   p_Vendor_ID VARCHAR2(32);
@@ -128,7 +129,7 @@
            M_PRICELIST.ISTAXINCLUDED
        FROM (SELECT COALESCE(p_Vendor_ID, M_REQUISITIONLINE.C_BPARTNER_ID, M_REQUISITION.C_BPARTNER_ID, PRODUCT_PO.C_BPARTNER_ID) AS VENDOR_ID,
                  COALESCE(p_PriceList_ID, M_REQUISITIONLINE.M_PRICELIST_ID, M_REQUISITION.M_PRICELIST_ID) AS A_PRICELIST_ID,
-                 M_REQUISITIONLINE.*
+                 M_REQUISITIONLINE.*, M_REQUISITION.DESCRIPTION AS HEADERDESC
               FROM M_REQUISITION, M_REQUISITIONLINE LEFT JOIN (SELECT MAX(C_BPARTNER_ID) AS C_BPARTNER_ID, M_PRODUCT_ID
                                                                FROM M_PRODUCT_PO
                                                                WHERE ISCURRENTVENDOR = 'Y'
@@ -207,7 +208,8 @@
             DELIVERYRULE, FREIGHTCOSTRULE, DELIVERYVIARULE, PRIORITYRULE,
             TOTALLINES, GRANDTOTAL, M_WAREHOUSE_ID, M_PRICELIST_ID,
             ISTAXINCLUDED, POSTED, PROCESSING, BILLTO_ID,
-            AD_USER_ID, COPYFROM, DATEPROMISED
+            AD_USER_ID, COPYFROM, DATEPROMISED,
+            DESCRIPTION
         ) VALUES (
             v_C_Order_ID, v_CLIENT_ID, p_Org_ID, v_User_ID,now(),
             v_User_ID, now(), 'N', v_DocumentNo, 'DR',
@@ -217,7 +219,8 @@
             COALESCE(Cur_Lines.Deliveryrule, 'A'), 'I', 'D', '5',
             0, 0, p_WAREHOUSE_ID, Cur_Lines.PRICELIST_ID,
              'N', 'N', 'N', v_BillTo_ID,
-            v_sales_rep_ID, 'N', Cur_Lines.NEEDBYDATE
+            v_sales_rep_ID, 'N', Cur_Lines.NEEDBYDATE,
+            Cur_Lines.HEADERDESC
         );
       END IF;
 
@@ -273,6 +276,11 @@
           v_Discount :=ROUND((v_PriceList-v_PriceActual) / v_PriceList*100, v_stdPre); -- Calculate rounded discount
         END IF;
       END IF;
+
+      v_Description := COALESCE(Cur_Lines.DESCRIPTION, '');
+      IF (Cur_Lines.SUPPLIERNOTES IS NOT NULL) THEN
+        v_Description := v_Description || ' ' || Cur_Lines.SUPPLIERNOTES;
+      END IF;
       
       INSERT INTO C_OrderLine (
           C_ORDERLINE_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE,
@@ -288,7 +296,7 @@
           v_COrderLine_ID,v_Client_ID, p_Org_ID,'Y',
           now(), v_User_ID, now(), v_User_ID,
           v_C_Order_ID, v_Line, Cur_Lines.Vendor_ID, v_BPartner_Location_ID,
-          p_OrderDate, Cur_Lines.NEEDBYDATE, Cur_Lines.SUPPLIERNOTES, Cur_Lines.M_Product_ID,
+          p_OrderDate, Cur_Lines.NEEDBYDATE, v_Description, Cur_Lines.M_Product_ID,
           Cur_Lines.M_AttributeSetInstance_ID,
           p_Warehouse_ID, Cur_Lines.C_UOM_ID, Cur_Lines.QTY - Cur_Lines.ORDEREDQTY, v_Currency_ID,
           v_PriceList, v_PriceActual, v_PriceLimit,
--- a/src-db/database/model/functions/M_UPDATE_STOCK_VALUATION.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-db/database/model/functions/M_UPDATE_STOCK_VALUATION.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -71,7 +71,7 @@
     JOIN ad_client c ON o.ad_client_id = c.ad_client_id
   WHERE o.ad_org_id = p_org;
 
-  SELECT COUNT(*), COALESCE(SUM(stock), 0), COALESCE(SUM(stock_valuation),0)
+  SELECT COUNT(*), COALESCE(SUM(stock), 0), COALESCE(SUM(stock_valuation), 0)
     INTO v_count, v_stock, v_valuation
   FROM m_stock_valuation
   WHERE ad_client_id = p_client
@@ -84,10 +84,13 @@
 
   IF (v_stock = 0) THEN
     v_unit_price := 0;
-    v_valuation := 0;
+    IF (p_stock <> 0 OR v_count = 0) THEN
+      v_valuation := 0;
+    END IF;
   ELSE
     v_unit_price := ROUND(v_valuation/v_stock, v_costprecission);
   END IF;
+
   IF (v_count > 0) THEN
     UPDATE m_stock_valuation
     SET stock = v_stock,
--- a/src-db/database/model/tables/AD_ROLE.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-db/database/model/tables/AD_ROLE.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -45,14 +45,6 @@
         <default><![CDATA[  O]]></default>
         <onCreateDefault/>
       </column>
-      <column name="CLIENTLIST" primaryKey="false" required="true" type="NVARCHAR" size="2000" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
-      <column name="ORGLIST" primaryKey="false" required="true" type="NVARCHAR" size="2000" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
       <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
         <default/>
         <onCreateDefault/>
--- a/src-db/database/model/triggers/AD_ROLE_ORGACCESS_TRG.xml	Fri Oct 28 14:01:24 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-<?xml version="1.0"?>
-  <database name="TRIGGER AD_ROLE_ORGACCESS_TRG">
-    <trigger name="AD_ROLE_ORGACCESS_TRG" table="AD_ROLE_ORGACCESS" fires="after" insert="true" update="true" delete="true" foreach="statement">
-      <body><![CDATA[
-    /*************************************************************************
-    * The contents of this file are subject to the Compiere Public
-    * License 1.1 ("License"); You may not use this file except in
-    * compliance with the License. You may obtain a copy of the License in
-    * the legal folder of your Openbravo installation.
-    * 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  Compiere  ERP &  Business Solution
-    * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc.
-    * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
-    * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
-    * All Rights Reserved.
-    * Contributor(s): Openbravo SLU
-    * Contributions are Copyright (C) 2001-2008 Openbravo, S.L.U.
-    *
-    * Specifically, this derivative work is based upon the following Compiere
-    * file and version.
-    *************************************************************************
-    * $Id: AD_Role_OrgAccess_Trg.sql,v 1.3 2003/05/04 06:46:07 jjanke Exp $
-    ***
-    * Title: Update AD_Role.OrgList / ClientList
-    *  for all Roles as otherwise mutating trigger
-    * Description:
-    ************************************************************************/
-    TYPE RECORD IS REF CURSOR;
-  CUR_Role RECORD;
-  Cur_Org RECORD;
-  v_ClientList VARCHAR2(2000):='';
-  v_OrgList    VARCHAR2(2000):='';
-  v_Client_ID VARCHAR2(32):=-1;
-    
-BEGIN
-    
-    IF AD_isTriggerEnabled()='N' THEN RETURN;
-    END IF;
-
-
-  -- For each Role
-  FOR CUR_Role IN
-    (SELECT *  FROM AD_Role  FOR UPDATE)
-  LOOP
-    v_ClientList:='';
-    v_OrgList:='';
-    v_Client_ID:=-1;
-    -- Assemble Client/OrgList
-    FOR Cur_Org IN
-      (
-      SELECT AD_Client_ID,
-        AD_Org_ID
-      FROM AD_Role_OrgAccess
-      WHERE AD_Role_ID=CUR_Role.AD_Role_ID
-        AND IsActive='Y'
-      ORDER BY AD_Client_ID,
-        AD_Org_ID
-      )
-    LOOP
-      IF(v_Client_ID <> Cur_Org.AD_Client_ID) THEN
-        IF (v_ClientList IS NULL OR (LENGTH(v_ClientList) + LENGTH(Cur_Org.AD_Client_ID) + 1 < 2000)) THEN
-            v_Client_ID:=Cur_Org.AD_Client_ID;
-            IF(LENGTH(v_ClientList) <> 0) THEN
-              v_ClientList:=v_ClientList || ',';
-            END IF;
-            v_ClientList:=v_ClientList || Cur_Org.AD_Client_ID;
-        END IF;
-      END IF;
-      -- Org
-      IF (v_OrgList IS NULL OR (LENGTH(v_OrgList) + LENGTH(Cur_Org.AD_Org_ID) + 1 < 2000)) THEN
-          IF(LENGTH(v_OrgList) <> 0) THEN
-            v_OrgList:=v_OrgList || ',';
-          END IF;
-          v_OrgList:=v_OrgList || Cur_Org.AD_Org_ID;
-      END IF;
-    END LOOP;
-    -- Org
-    --
-    IF(v_ClientList IS NULL OR LENGTH(v_ClientList)=0) THEN
-      v_ClientList:=CUR_Role.AD_Client_ID;
-    END IF;
-    IF(v_OrgList IS NULL OR LENGTH(v_OrgList)=0) THEN
-      v_OrgList:=CUR_Role.AD_Org_ID;
-    END IF;
-    DBMS_OUTPUT.PUT_LINE(CUR_Role.Name || ': Client=' || CUR_Role.ClientList || '->' || v_ClientList || ' - Org= ' || CUR_Role.OrgList || '->' || v_OrgList) ;
-    -- Update Role
-    UPDATE AD_Role
-      SET ClientList=v_ClientList,
-      OrgList=v_OrgList
-    WHERE AD_ROLE.AD_ROLE_ID=CUR_Role.AD_ROLE_ID;
-  END LOOP;
-  -- Role
-END AD_ROLE_ORGACCESS_TRG
-]]></body>
-    </trigger>
-  </database>
--- a/src-db/database/model/views/C_INVOICE_CANDIDATE_V.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-db/database/model/views/C_INVOICE_CANDIDATE_V.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
   <database name="VIEW C_INVOICE_CANDIDATE_V">
-    <view name="C_INVOICE_CANDIDATE_V"><![CDATA[SELECT sq.ad_client_id, sq.ad_org_id, sq.c_bpartner_id, sq.c_order_id, sq.documentno, sq.dateordered, sq.c_doctype_id, sq.amountlines, sq.amountlinesgross, sq.notinvoicedlines, round(sq.notinvoicedlinesgross, c.stdprecision) AS notinvoicedlinesgross, sq.term, sq.pendinglines, round(sq.pendinglinesgross, c.stdprecision) AS pendinglinesgross, sq.qtyordered, sq.qtydelivered FROM (SELECT o.ad_client_id, o.ad_org_id, o.c_bpartner_id, o.c_order_id, o.documentno, o.dateordered, o.c_doctype_id, o.totallines AS amountlines, o.grandtotal AS amountlinesgross, sum(round((l.qtyordered - l.qtyinvoiced) * l.priceactual, c_1.stdprecision)) AS notinvoicedlines, sum(round((l.qtyordered - l.qtyinvoiced) * l.priceactual, c_1.stdprecision) * (1 + t.rate / 100)) AS notinvoicedlinesgross, o.invoicerule AS term, sum(round((l.qtydelivered - l.qtyinvoiced) * l.priceactual, c_1.stdprecision)) AS pendinglines, sum(round((l.qtydelivered - l.qtyinvoiced) * l.priceactual, c_1.stdprecision) * (1 + t.rate / 100)) AS pendinglinesgross, sum(abs(l.qtyordered)) AS qtyordered, sum(abs(l.qtydelivered)) AS qtydelivered, o.m_pricelist_id, c_1.c_currency_id FROM c_order o JOIN m_pricelist p_1 ON o.m_pricelist_id = p_1.m_pricelist_id JOIN c_currency c_1 ON p_1.c_currency_id = c_1.c_currency_id JOIN c_orderline l ON o.c_order_id = l.c_order_id JOIN c_bpartner bp ON o.c_bpartner_id = bp.c_bpartner_id JOIN c_tax t ON t.c_tax_id = l.c_tax_id LEFT JOIN c_invoiceschedule si ON bp.c_invoiceschedule_id = si.c_invoiceschedule_id WHERE (o.docstatus IN ('CO', 'CL', 'IP')) AND (o.c_doctype_id IN (SELECT c_doctype.c_doctype_id FROM c_doctype WHERE c_doctype.docbasetype = 'SOO' AND (c_doctype.docsubtypeso NOT IN ('ON', 'OB')))) AND (o.invoicerule = 'I' OR o.invoicerule = 'O' OR o.invoicerule = 'N' OR o.invoicerule = 'D' OR o.invoicerule = 'S' AND (si.invoicefrequency IS NULL OR si.invoicefrequency = 'D' OR si.invoicefrequency = 'W' OR si.invoicefrequency = 'T' AND trunc(o.dateordered) <= (TRUNC(now(), 'MM') + si.invoicedaycutoff - 1) AND trunc(now()) >= (TRUNC(o.dateordered, 'MM') + si.invoiceday - 1) OR trunc(o.dateordered) <= (TRUNC(now(), 'MM') + si.invoicedaycutoff + 14) AND trunc(now()) >= (TRUNC(o.dateordered, 'MM') + si.invoiceday + 14) OR si.invoicefrequency = 'M' AND trunc(o.dateordered) <= (TRUNC(now(), 'MM') + si.invoicedaycutoff - 1) AND trunc(now()) >= (TRUNC(o.dateordered, 'MM') + si.invoiceday - 1))) AND (abs(l.qtyordered - l.qtyinvoiced) <> 0 OR abs(l.qtydelivered - l.qtyinvoiced) <> 0) GROUP BY o.ad_client_id, o.ad_org_id, o.c_bpartner_id, o.c_order_id, o.documentno, o.dateordered, o.c_doctype_id, o.totallines, o.grandtotal, o.invoicerule, o.m_pricelist_id, c_1.c_currency_id) sq JOIN m_pricelist p ON sq.m_pricelist_id = p.m_pricelist_id JOIN c_currency c ON sq.c_currency_id = c.c_currency_id]]></view>
+    <view name="C_INVOICE_CANDIDATE_V"><![CDATA[SELECT o.ad_client_id, o.ad_org_id, o.c_bpartner_id, o.c_order_id, o.documentno, o.dateordered, o.c_doctype_id, o.totallines AS amountlines, o.grandtotal AS amountlinesgross, sum(round((l.qtyordered - l.qtyinvoiced) * l.priceactual, c.stdprecision)) AS notinvoicedlines, round(sum(round((l.qtyordered - l.qtyinvoiced) * l.priceactual, c.stdprecision) * (1 + t.rate / 100)), c.stdprecision) AS notinvoicedlinesgross, o.invoicerule AS term, sum(round((l.qtydelivered - l.qtyinvoiced) * l.priceactual, c.stdprecision)) AS pendinglines, round(sum(round((l.qtydelivered - l.qtyinvoiced) * l.priceactual, c.stdprecision) * (1 + t.rate / 100)), c.stdprecision) AS pendinglinesgross, sum(abs(l.qtyordered)) AS qtyordered, sum(abs(l.qtydelivered)) AS qtydelivered FROM c_order o JOIN c_doctype dt ON o.c_doctype_id = dt.c_doctype_id JOIN c_bpartner bp ON o.c_bpartner_id = bp.c_bpartner_id JOIN c_currency c ON o.c_currency_id = c.c_currency_id JOIN c_orderline l ON o.c_order_id = l.c_order_id JOIN c_tax t ON t.c_tax_id = l.c_tax_id LEFT JOIN c_invoiceschedule si ON bp.c_invoiceschedule_id = si.c_invoiceschedule_id WHERE (o.docstatus = 'CO' OR o.docstatus = 'CL' OR o.docstatus = 'IP') AND (o.invoicerule = 'I' OR o.invoicerule = 'O' OR o.invoicerule = 'N' OR o.invoicerule = 'D' OR o.invoicerule = 'S') AND dt.docbasetype = 'SOO' AND (dt.docsubtypeso <> 'ON' OR dt.docsubtypeso <> 'OB') AND (si.invoicefrequency IS NULL OR (si.invoicefrequency = 'D' OR si.invoicefrequency = 'W' OR si.invoicefrequency = 'T') AND trunc(o.dateordered) <= (trunc(now(), 'MM') + si.invoicedaycutoff - 1) AND trunc(now()) >= (trunc(o.dateordered, 'MM') + si.invoiceday - 1) OR trunc(o.dateordered) <= (trunc(now(), 'MM') + si.invoicedaycutoff + 14) AND trunc(now()) >= (trunc(o.dateordered, 'MM') + si.invoiceday + 14) OR si.invoicefrequency = 'M' AND trunc(o.dateordered) <= (trunc(now(), 'MM') + si.invoicedaycutoff - 1) AND trunc(now()) >= (trunc(o.dateordered, 'MM') + si.invoiceday - 1)) AND (abs(l.qtyordered - l.qtyinvoiced) <> 0 OR abs(l.qtydelivered - l.qtyinvoiced) <> 0) GROUP BY o.ad_client_id, o.ad_org_id, o.c_bpartner_id, o.c_order_id, o.documentno, o.dateordered, o.c_doctype_id, o.totallines, o.grandtotal, o.invoicerule, c.c_currency_id, c.stdprecision]]></view>
   </database>
--- a/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -28,7 +28,7 @@
 <!--12-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--12-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--12-->  <AD_TAB_ID><![CDATA[160]]></AD_TAB_ID>
-<!--12-->  <NAME><![CDATA[DESCRIPTION1]]></NAME>
+<!--12-->  <NAME><![CDATA[DESCRIPTION0]]></NAME>
 <!--12-->  <CODE><![CDATA[@SQL=SELECT DESCRIPTION FROM GL_JOURNALBATCH WHERE GL_JOURNALBATCH_ID=@GL_JOURNALBATCH_ID@]]></CODE>
 <!--12-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--12--></AD_AUXILIARINPUT>
@@ -1635,6 +1635,17 @@
 <!--39F11BEB43D7442F81AE2ECE5341550F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--39F11BEB43D7442F81AE2ECE5341550F--></AD_AUXILIARINPUT>
 
+<!--3A42CF95ECDB4A109D51D54874D67FDF--><AD_AUXILIARINPUT>
+<!--3A42CF95ECDB4A109D51D54874D67FDF-->  <AD_AUXILIARINPUT_ID><![CDATA[3A42CF95ECDB4A109D51D54874D67FDF]]></AD_AUXILIARINPUT_ID>
+<!--3A42CF95ECDB4A109D51D54874D67FDF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3A42CF95ECDB4A109D51D54874D67FDF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3A42CF95ECDB4A109D51D54874D67FDF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3A42CF95ECDB4A109D51D54874D67FDF-->  <AD_TAB_ID><![CDATA[800200]]></AD_TAB_ID>
+<!--3A42CF95ECDB4A109D51D54874D67FDF-->  <NAME><![CDATA[objectType]]></NAME>
+<!--3A42CF95ECDB4A109D51D54874D67FDF-->  <CODE><![CDATA[@SQL=select case when @UIPattern@='S' then 'P' else 'S' end from dual]]></CODE>
+<!--3A42CF95ECDB4A109D51D54874D67FDF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3A42CF95ECDB4A109D51D54874D67FDF--></AD_AUXILIARINPUT>
+
 <!--3ACE8CFB656847998D9236DAA1D66E49--><AD_AUXILIARINPUT>
 <!--3ACE8CFB656847998D9236DAA1D66E49-->  <AD_AUXILIARINPUT_ID><![CDATA[3ACE8CFB656847998D9236DAA1D66E49]]></AD_AUXILIARINPUT_ID>
 <!--3ACE8CFB656847998D9236DAA1D66E49-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -7502,82 +7502,6 @@
 <!--534-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--534--></AD_COLUMN>
 
-<!--535--><AD_COLUMN>
-<!--535-->  <AD_COLUMN_ID><![CDATA[535]]></AD_COLUMN_ID>
-<!--535-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--535-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--535-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--535-->  <NAME><![CDATA[Client List]]></NAME>
-<!--535-->  <DESCRIPTION><![CDATA[Clients this Role can access]]></DESCRIPTION>
-<!--535-->  <HELP><![CDATA[Indicates the Clients (by client id) that this Role can access.  Multiple Clients are delimited by a comma ','.]]></HELP>
-<!--535-->  <COLUMNNAME><![CDATA[ClientList]]></COLUMNNAME>
-<!--535-->  <AD_TABLE_ID><![CDATA[156]]></AD_TABLE_ID>
-<!--535-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
-<!--535-->  <FIELDLENGTH><![CDATA[2000]]></FIELDLENGTH>
-<!--535-->  <DEFAULTVALUE><![CDATA[@AD_Client_ID@]]></DEFAULTVALUE>
-<!--535-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--535-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--535-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--535-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
-<!--535-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--535-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--535-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--535-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--535-->  <AD_ELEMENT_ID><![CDATA[226]]></AD_ELEMENT_ID>
-<!--535-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--535-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--535-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--535-->  <DEVELOPMENTSTATUS><![CDATA[DP]]></DEVELOPMENTSTATUS>
-<!--535-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--535-->  <POSITION><![CDATA[12]]></POSITION>
-<!--535-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--535-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--535-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--535-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--535-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--535-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
-<!--535-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
-<!--535-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
-<!--535--></AD_COLUMN>
-
-<!--536--><AD_COLUMN>
-<!--536-->  <AD_COLUMN_ID><![CDATA[536]]></AD_COLUMN_ID>
-<!--536-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--536-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--536-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--536-->  <NAME><![CDATA[Organization List]]></NAME>
-<!--536-->  <DESCRIPTION><![CDATA[List of Organizations this Role can access]]></DESCRIPTION>
-<!--536-->  <HELP><![CDATA[The Organization List indicates the Organizations (by organization id) that this Role can access.  Multiple Organizations are delimited by a comma ','.]]></HELP>
-<!--536-->  <COLUMNNAME><![CDATA[OrgList]]></COLUMNNAME>
-<!--536-->  <AD_TABLE_ID><![CDATA[156]]></AD_TABLE_ID>
-<!--536-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
-<!--536-->  <FIELDLENGTH><![CDATA[2000]]></FIELDLENGTH>
-<!--536-->  <DEFAULTVALUE><![CDATA[@AD_Org_ID@]]></DEFAULTVALUE>
-<!--536-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--536-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--536-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--536-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
-<!--536-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--536-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--536-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--536-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--536-->  <AD_ELEMENT_ID><![CDATA[478]]></AD_ELEMENT_ID>
-<!--536-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--536-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--536-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--536-->  <DEVELOPMENTSTATUS><![CDATA[DP]]></DEVELOPMENTSTATUS>
-<!--536-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--536-->  <POSITION><![CDATA[13]]></POSITION>
-<!--536-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--536-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--536-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--536-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--536-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--536-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
-<!--536-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
-<!--536-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
-<!--536--></AD_COLUMN>
-
 <!--537--><AD_COLUMN>
 <!--537-->  <AD_COLUMN_ID><![CDATA[537]]></AD_COLUMN_ID>
 <!--537-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -24549,7 +24473,7 @@
 <!--1630-->  <AD_TABLE_ID><![CDATA[224]]></AD_TABLE_ID>
 <!--1630-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
 <!--1630-->  <FIELDLENGTH><![CDATA[255]]></FIELDLENGTH>
-<!--1630-->  <DEFAULTVALUE><![CDATA[@DESCRIPTION1@]]></DEFAULTVALUE>
+<!--1630-->  <DEFAULTVALUE><![CDATA[@DESCRIPTION0@]]></DEFAULTVALUE>
 <!--1630-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--1630-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--1630-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
@@ -206382,7 +206306,6 @@
 <!--803278-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--803278-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--803278-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--803278-->  <READONLYLOGIC><![CDATA[@Processed@='Y' | @Posted@='Y']]></READONLYLOGIC>
 <!--803278-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
 <!--803278-->  <SEQNO><![CDATA[100]]></SEQNO>
 <!--803278-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -371097,7 +371020,7 @@
 <!--E98BE9B0C06911DD88FA001B388C61A4-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--E98BE9B0C06911DD88FA001B388C61A4-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
 <!--E98BE9B0C06911DD88FA001B388C61A4-->  <AD_ELEMENT_ID><![CDATA[AC84AE28C06C11DD80E0001B388C61A4]]></AD_ELEMENT_ID>
-<!--E98BE9B0C06911DD88FA001B388C61A4-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--E98BE9B0C06911DD88FA001B388C61A4-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
 <!--E98BE9B0C06911DD88FA001B388C61A4-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--E98BE9B0C06911DD88FA001B388C61A4-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--E98BE9B0C06911DD88FA001B388C61A4-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
--- a/src-db/database/sourcedata/AD_ELEMENT.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -1328,20 +1328,6 @@
 <!--225-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--225--></AD_ELEMENT>
 
-<!--226--><AD_ELEMENT>
-<!--226-->  <AD_ELEMENT_ID><![CDATA[226]]></AD_ELEMENT_ID>
-<!--226-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--226-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--226-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--226-->  <COLUMNNAME><![CDATA[ClientList]]></COLUMNNAME>
-<!--226-->  <NAME><![CDATA[Client List]]></NAME>
-<!--226-->  <PRINTNAME><![CDATA[Client List]]></PRINTNAME>
-<!--226-->  <DESCRIPTION><![CDATA[Clients this Role can access]]></DESCRIPTION>
-<!--226-->  <HELP><![CDATA[Indicates the Clients (by client id) that this Role can access.  Multiple Clients are delimited by a comma ','.]]></HELP>
-<!--226-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--226-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
-<!--226--></AD_ELEMENT>
-
 <!--227--><AD_ELEMENT>
 <!--227-->  <AD_ELEMENT_ID><![CDATA[227]]></AD_ELEMENT_ID>
 <!--227-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -5702,60 +5702,6 @@
 <!--364-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--364--></AD_FIELD>
 
-<!--365--><AD_FIELD>
-<!--365-->  <AD_FIELD_ID><![CDATA[365]]></AD_FIELD_ID>
-<!--365-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--365-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--365-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--365-->  <NAME><![CDATA[Client List]]></NAME>
-<!--365-->  <DESCRIPTION><![CDATA[Clients this Role can access]]></DESCRIPTION>
-<!--365-->  <HELP><![CDATA[Indicates the Clients (by client id) that this Role can access.  Multiple Clients are delimited by a comma ','.]]></HELP>
-<!--365-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--365-->  <AD_TAB_ID><![CDATA[119]]></AD_TAB_ID>
-<!--365-->  <AD_COLUMN_ID><![CDATA[535]]></AD_COLUMN_ID>
-<!--365-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--365-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
-<!--365-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
-<!--365-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--365-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--365-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--365-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--365-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
-<!--365-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--365-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--365-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--365-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--365-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--365-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--365--></AD_FIELD>
-
-<!--366--><AD_FIELD>
-<!--366-->  <AD_FIELD_ID><![CDATA[366]]></AD_FIELD_ID>
-<!--366-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--366-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--366-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--366-->  <NAME><![CDATA[Organization List]]></NAME>
-<!--366-->  <DESCRIPTION><![CDATA[List of Organizations this Role can access]]></DESCRIPTION>
-<!--366-->  <HELP><![CDATA[The Organization List indicates the Organizations (by organization id) that this Role can access.  Multiple Organizations are delimited by a comma ','.]]></HELP>
-<!--366-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--366-->  <AD_TAB_ID><![CDATA[119]]></AD_TAB_ID>
-<!--366-->  <AD_COLUMN_ID><![CDATA[536]]></AD_COLUMN_ID>
-<!--366-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--366-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
-<!--366-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
-<!--366-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--366-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--366-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--366-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--366-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
-<!--366-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--366-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--366-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--366-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--366-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--366-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--366--></AD_FIELD>
-
 <!--367--><AD_FIELD>
 <!--367-->  <AD_FIELD_ID><![CDATA[367]]></AD_FIELD_ID>
 <!--367-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -80895,34 +80841,6 @@
 <!--6734-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--6734--></AD_FIELD>
 
-<!--6735--><AD_FIELD>
-<!--6735-->  <AD_FIELD_ID><![CDATA[6735]]></AD_FIELD_ID>
-<!--6735-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--6735-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--6735-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--6735-->  <NAME><![CDATA[Client List]]></NAME>
-<!--6735-->  <DESCRIPTION><![CDATA[Clients this Role can access]]></DESCRIPTION>
-<!--6735-->  <HELP><![CDATA[Indicates the Clients (by client id) that this Role can access.  Multiple Clients are delimited by a comma ','.]]></HELP>
-<!--6735-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--6735-->  <AD_TAB_ID><![CDATA[485]]></AD_TAB_ID>
-<!--6735-->  <AD_COLUMN_ID><![CDATA[535]]></AD_COLUMN_ID>
-<!--6735-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--6735-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
-<!--6735-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
-<!--6735-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--6735-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--6735-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--6735-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6735-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
-<!--6735-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--6735-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--6735-->  <GRID_SEQNO><![CDATA[30]]></GRID_SEQNO>
-<!--6735-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--6735-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--6735-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--6735-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--6735--></AD_FIELD>
-
 <!--6736--><AD_FIELD>
 <!--6736-->  <AD_FIELD_ID><![CDATA[6736]]></AD_FIELD_ID>
 <!--6736-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -81009,34 +80927,6 @@
 <!--6738-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--6738--></AD_FIELD>
 
-<!--6739--><AD_FIELD>
-<!--6739-->  <AD_FIELD_ID><![CDATA[6739]]></AD_FIELD_ID>
-<!--6739-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--6739-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--6739-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--6739-->  <NAME><![CDATA[Organization List]]></NAME>
-<!--6739-->  <DESCRIPTION><![CDATA[List of Organizations this Role can access]]></DESCRIPTION>
-<!--6739-->  <HELP><![CDATA[The Organization List indicates the Organizations (by organization id) that this Role can access.  Multiple Organizations are delimited by a comma ','.]]></HELP>
-<!--6739-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--6739-->  <AD_TAB_ID><![CDATA[485]]></AD_TAB_ID>
-<!--6739-->  <AD_COLUMN_ID><![CDATA[536]]></AD_COLUMN_ID>
-<!--6739-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--6739-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
-<!--6739-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
-<!--6739-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--6739-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--6739-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--6739-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6739-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
-<!--6739-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--6739-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--6739-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
-<!--6739-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--6739-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--6739-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--6739-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--6739--></AD_FIELD>
-
 <!--6740--><AD_FIELD>
 <!--6740-->  <AD_FIELD_ID><![CDATA[6740]]></AD_FIELD_ID>
 <!--6740-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -117749,14 +117639,14 @@
 <!--801312-->  <AD_TAB_ID><![CDATA[800074]]></AD_TAB_ID>
 <!--801312-->  <AD_COLUMN_ID><![CDATA[801035]]></AD_COLUMN_ID>
 <!--801312-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--801312-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--801312-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
 <!--801312-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--801312-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--801312-->  <SEQNO><![CDATA[120]]></SEQNO>
 <!--801312-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--801312-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--801312-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--801312-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--801312-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--801312-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--801312-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--801312-->  <GRID_SEQNO><![CDATA[120]]></GRID_SEQNO>
--- a/src-db/database/sourcedata/AD_MESSAGE.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -25623,6 +25623,18 @@
 <!--CE436C734491444CAAF5FFEE073AE2E1-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--CE436C734491444CAAF5FFEE073AE2E1--></AD_MESSAGE>
 
+<!--CE6DD7C2090C4CD1AD17BA1597918C31--><AD_MESSAGE>
+<!--CE6DD7C2090C4CD1AD17BA1597918C31-->  <AD_MESSAGE_ID><![CDATA[CE6DD7C2090C4CD1AD17BA1597918C31]]></AD_MESSAGE_ID>
+<!--CE6DD7C2090C4CD1AD17BA1597918C31-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CE6DD7C2090C4CD1AD17BA1597918C31-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CE6DD7C2090C4CD1AD17BA1597918C31-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CE6DD7C2090C4CD1AD17BA1597918C31-->  <VALUE><![CDATA[CannotDeleteLineWithDeliveredQtyInReplacementLine]]></VALUE>
+<!--CE6DD7C2090C4CD1AD17BA1597918C31-->  <MSGTEXT><![CDATA[The line cannot be deleted because it is replacing a line that is delivered. Line no: %0, Product: %1]]></MSGTEXT>
+<!--CE6DD7C2090C4CD1AD17BA1597918C31-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--CE6DD7C2090C4CD1AD17BA1597918C31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--CE6DD7C2090C4CD1AD17BA1597918C31-->  <ISINCLUDEINI18N><![CDATA[Y]]></ISINCLUDEINI18N>
+<!--CE6DD7C2090C4CD1AD17BA1597918C31--></AD_MESSAGE>
+
 <!--CEF696AFAED34A0A916D825BEA97C2B5--><AD_MESSAGE>
 <!--CEF696AFAED34A0A916D825BEA97C2B5-->  <AD_MESSAGE_ID><![CDATA[CEF696AFAED34A0A916D825BEA97C2B5]]></AD_MESSAGE_ID>
 <!--CEF696AFAED34A0A916D825BEA97C2B5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -26431,6 +26443,18 @@
 <!--DDDAF4ED07534617A5A00DB7900EF74C-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--DDDAF4ED07534617A5A00DB7900EF74C--></AD_MESSAGE>
 
+<!--DE8EC6E0C32C4389B8466BC50680BF23--><AD_MESSAGE>
+<!--DE8EC6E0C32C4389B8466BC50680BF23-->  <AD_MESSAGE_ID><![CDATA[DE8EC6E0C32C4389B8466BC50680BF23]]></AD_MESSAGE_ID>
+<!--DE8EC6E0C32C4389B8466BC50680BF23-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DE8EC6E0C32C4389B8466BC50680BF23-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DE8EC6E0C32C4389B8466BC50680BF23-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DE8EC6E0C32C4389B8466BC50680BF23-->  <VALUE><![CDATA[LinkedItemsSectionIsDisabled]]></VALUE>
+<!--DE8EC6E0C32C4389B8466BC50680BF23-->  <MSGTEXT><![CDATA[No items are shown because Linked Items section is disabled for this window.]]></MSGTEXT>
+<!--DE8EC6E0C32C4389B8466BC50680BF23-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--DE8EC6E0C32C4389B8466BC50680BF23-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--DE8EC6E0C32C4389B8466BC50680BF23-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--DE8EC6E0C32C4389B8466BC50680BF23--></AD_MESSAGE>
+
 <!--DEE5CB570CE747B58B5E716F192CFC0A--><AD_MESSAGE>
 <!--DEE5CB570CE747B58B5E716F192CFC0A-->  <AD_MESSAGE_ID><![CDATA[DEE5CB570CE747B58B5E716F192CFC0A]]></AD_MESSAGE_ID>
 <!--DEE5CB570CE747B58B5E716F192CFC0A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_MODEL_OBJECT.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-db/database/sourcedata/AD_MODEL_OBJECT.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -2986,7 +2986,7 @@
 <!--037C0E9B93984960BABB84F35C38975E-->  <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_process.KillSession]]></CLASSNAME>
 <!--037C0E9B93984960BABB84F35C38975E-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--037C0E9B93984960BABB84F35C38975E-->  <AD_PROCESS_ID><![CDATA[9DB4D30BFC5144B9B431CB49DDE9270D]]></AD_PROCESS_ID>
-<!--037C0E9B93984960BABB84F35C38975E-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--037C0E9B93984960BABB84F35C38975E-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--037C0E9B93984960BABB84F35C38975E--></AD_MODEL_OBJECT>
 
 <!--046B5835076D48EFA73A1E0FF4721C7F--><AD_MODEL_OBJECT>
@@ -3230,7 +3230,7 @@
 <!--1E2308B9F7794479A58F6F20A3522067-->  <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_process.MRPPurchaseCreateReservations]]></CLASSNAME>
 <!--1E2308B9F7794479A58F6F20A3522067-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--1E2308B9F7794479A58F6F20A3522067-->  <AD_PROCESS_ID><![CDATA[7CB6B4D1ECCF4036B3F111D2CF11AADE]]></AD_PROCESS_ID>
-<!--1E2308B9F7794479A58F6F20A3522067-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--1E2308B9F7794479A58F6F20A3522067-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--1E2308B9F7794479A58F6F20A3522067--></AD_MODEL_OBJECT>
 
 <!--1EC03C207CB741AE8C94DBF0340E2429--><AD_MODEL_OBJECT>
@@ -3291,7 +3291,7 @@
 <!--2B209CEDF6564F9DBE160FC5D6AD5CF5-->  <CLASSNAME><![CDATA[org.openbravo.service.db.ImportClientProcess]]></CLASSNAME>
 <!--2B209CEDF6564F9DBE160FC5D6AD5CF5-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--2B209CEDF6564F9DBE160FC5D6AD5CF5-->  <AD_PROCESS_ID><![CDATA[970EAD9B846648A7AB1F0CCA5058356C]]></AD_PROCESS_ID>
-<!--2B209CEDF6564F9DBE160FC5D6AD5CF5-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--2B209CEDF6564F9DBE160FC5D6AD5CF5-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--2B209CEDF6564F9DBE160FC5D6AD5CF5--></AD_MODEL_OBJECT>
 
 <!--2D675A25948F4CCCA8C3C7B1906DD131--><AD_MODEL_OBJECT>
@@ -3404,6 +3404,20 @@
 <!--36A67D2D76A5488491850AF14F83A6FF-->  <SEQNO><![CDATA[10]]></SEQNO>
 <!--36A67D2D76A5488491850AF14F83A6FF--></AD_MODEL_OBJECT>
 
+<!--3AE4CBBFC86345AB8A21A0192F089559--><AD_MODEL_OBJECT>
+<!--3AE4CBBFC86345AB8A21A0192F089559-->  <AD_MODEL_OBJECT_ID><![CDATA[3AE4CBBFC86345AB8A21A0192F089559]]></AD_MODEL_OBJECT_ID>
+<!--3AE4CBBFC86345AB8A21A0192F089559-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3AE4CBBFC86345AB8A21A0192F089559-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3AE4CBBFC86345AB8A21A0192F089559-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3AE4CBBFC86345AB8A21A0192F089559-->  <ACTION><![CDATA[P]]></ACTION>
+<!--3AE4CBBFC86345AB8A21A0192F089559-->  <CLASSNAME><![CDATA[org.openbravo.base.ServerVersionChecker]]></CLASSNAME>
+<!--3AE4CBBFC86345AB8A21A0192F089559-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
+<!--3AE4CBBFC86345AB8A21A0192F089559-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3AE4CBBFC86345AB8A21A0192F089559-->  <OBJECT_TYPE><![CDATA[L]]></OBJECT_TYPE>
+<!--3AE4CBBFC86345AB8A21A0192F089559-->  <SEQNO><![CDATA[15]]></SEQNO>
+<!--3AE4CBBFC86345AB8A21A0192F089559-->  <NAME><![CDATA[Server Version Checker]]></NAME>
+<!--3AE4CBBFC86345AB8A21A0192F089559--></AD_MODEL_OBJECT>
+
 <!--3C1D6B96736B4E2D9FF327EF4EB38DF6--><AD_MODEL_OBJECT>
 <!--3C1D6B96736B4E2D9FF327EF4EB38DF6-->  <AD_MODEL_OBJECT_ID><![CDATA[3C1D6B96736B4E2D9FF327EF4EB38DF6]]></AD_MODEL_OBJECT_ID>
 <!--3C1D6B96736B4E2D9FF327EF4EB38DF6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3450,7 +3464,7 @@
 <!--40C9C50E51CF446C83AF1F4562D93FD3-->  <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_process.UpdateAuditTrail]]></CLASSNAME>
 <!--40C9C50E51CF446C83AF1F4562D93FD3-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--40C9C50E51CF446C83AF1F4562D93FD3-->  <AD_PROCESS_ID><![CDATA[58763832F5F3485CAD33B8B9FCD6C640]]></AD_PROCESS_ID>
-<!--40C9C50E51CF446C83AF1F4562D93FD3-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--40C9C50E51CF446C83AF1F4562D93FD3-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--40C9C50E51CF446C83AF1F4562D93FD3--></AD_MODEL_OBJECT>
 
 <!--411E148DD9524C6784F353977B2FC6E4--><AD_MODEL_OBJECT>
@@ -3499,7 +3513,7 @@
 <!--4446402A5950431C9F7FCB5F2080752B-->  <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_process.CreateCustomModule]]></CLASSNAME>
 <!--4446402A5950431C9F7FCB5F2080752B-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--4446402A5950431C9F7FCB5F2080752B-->  <AD_PROCESS_ID><![CDATA[7EDBFEC35BDA4FF4AF05ED516CDAFB90]]></AD_PROCESS_ID>
-<!--4446402A5950431C9F7FCB5F2080752B-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--4446402A5950431C9F7FCB5F2080752B-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--4446402A5950431C9F7FCB5F2080752B--></AD_MODEL_OBJECT>
 
 <!--4551EE483B954B58ADEDB59353920B0B--><AD_MODEL_OBJECT>
@@ -3511,7 +3525,7 @@
 <!--4551EE483B954B58ADEDB59353920B0B-->  <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_process.UpdateActuals]]></CLASSNAME>
 <!--4551EE483B954B58ADEDB59353920B0B-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--4551EE483B954B58ADEDB59353920B0B-->  <AD_PROCESS_ID><![CDATA[ABDFC8131D964936AD2EF7E0CED97FD9]]></AD_PROCESS_ID>
-<!--4551EE483B954B58ADEDB59353920B0B-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--4551EE483B954B58ADEDB59353920B0B-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--4551EE483B954B58ADEDB59353920B0B--></AD_MODEL_OBJECT>
 
 <!--48521690843F4EEC86CBF20A6B014394--><AD_MODEL_OBJECT>
@@ -3523,7 +3537,7 @@
 <!--48521690843F4EEC86CBF20A6B014394-->  <CLASSNAME><![CDATA[org.openbravo.materialmgmt.VariantAutomaticGenerationProcess]]></CLASSNAME>
 <!--48521690843F4EEC86CBF20A6B014394-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--48521690843F4EEC86CBF20A6B014394-->  <AD_PROCESS_ID><![CDATA[3C386BC12832466790E50F2F8C5EBD85]]></AD_PROCESS_ID>
-<!--48521690843F4EEC86CBF20A6B014394-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--48521690843F4EEC86CBF20A6B014394-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--48521690843F4EEC86CBF20A6B014394--></AD_MODEL_OBJECT>
 
 <!--488B251D70EA4B8784E748836042CD66--><AD_MODEL_OBJECT>
@@ -3552,18 +3566,6 @@
 <!--4DA7FE3E877447F0AD9342E627ADB8D5-->  <SEQNO><![CDATA[10]]></SEQNO>
 <!--4DA7FE3E877447F0AD9342E627ADB8D5--></AD_MODEL_OBJECT>
 
-<!--5022C4DEE7714F658D9A26BC719D6A21--><AD_MODEL_OBJECT>
-<!--5022C4DEE7714F658D9A26BC719D6A21-->  <AD_MODEL_OBJECT_ID><![CDATA[5022C4DEE7714F658D9A26BC719D6A21]]></AD_MODEL_OBJECT_ID>
-<!--5022C4DEE7714F658D9A26BC719D6A21-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--5022C4DEE7714F658D9A26BC719D6A21-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--5022C4DEE7714F658D9A26BC719D6A21-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--5022C4DEE7714F658D9A26BC719D6A21-->  <ACTION><![CDATA[P]]></ACTION>
-<!--5022C4DEE7714F658D9A26BC719D6A21-->  <CLASSNAME><![CDATA[org.openbravo.model.materialmgmt.cost.CostAdjustment]]></CLASSNAME>
-<!--5022C4DEE7714F658D9A26BC719D6A21-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
-<!--5022C4DEE7714F658D9A26BC719D6A21-->  <AD_REFERENCE_ID><![CDATA[DA2E8CEC6A584B7A8052AE1F19551138]]></AD_REFERENCE_ID>
-<!--5022C4DEE7714F658D9A26BC719D6A21-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
-<!--5022C4DEE7714F658D9A26BC719D6A21--></AD_MODEL_OBJECT>
-
 <!--54CE0E8B21C145A1A11B97D0420996F3--><AD_MODEL_OBJECT>
 <!--54CE0E8B21C145A1A11B97D0420996F3-->  <AD_MODEL_OBJECT_ID><![CDATA[54CE0E8B21C145A1A11B97D0420996F3]]></AD_MODEL_OBJECT_ID>
 <!--54CE0E8B21C145A1A11B97D0420996F3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3622,7 +3624,7 @@
 <!--568B1521D6EE4FBCB6D591594EC0A7B8-->  <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_process.EndYearClose]]></CLASSNAME>
 <!--568B1521D6EE4FBCB6D591594EC0A7B8-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--568B1521D6EE4FBCB6D591594EC0A7B8-->  <AD_PROCESS_ID><![CDATA[EFDBF909811544DAAE4E876AA781E5DC]]></AD_PROCESS_ID>
-<!--568B1521D6EE4FBCB6D591594EC0A7B8-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--568B1521D6EE4FBCB6D591594EC0A7B8-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--568B1521D6EE4FBCB6D591594EC0A7B8--></AD_MODEL_OBJECT>
 
 <!--56E9E18D3BAE6828E040007F01001BAD--><AD_MODEL_OBJECT>
@@ -3940,7 +3942,7 @@
 <!--76EA6723BB5544D585D9BDC128968F58-->  <CLASSNAME><![CDATA[org.openbravo.materialmgmt.InventoryCountProcess]]></CLASSNAME>
 <!--76EA6723BB5544D585D9BDC128968F58-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--76EA6723BB5544D585D9BDC128968F58-->  <AD_PROCESS_ID><![CDATA[107]]></AD_PROCESS_ID>
-<!--76EA6723BB5544D585D9BDC128968F58-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--76EA6723BB5544D585D9BDC128968F58-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--76EA6723BB5544D585D9BDC128968F58--></AD_MODEL_OBJECT>
 
 <!--7AEA3C790893370FE040007F01013A5F--><AD_MODEL_OBJECT>
@@ -3976,7 +3978,7 @@
 <!--7D1FF73577D848F3A86900D16B87F0F8-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.ProcessBatch]]></CLASSNAME>
 <!--7D1FF73577D848F3A86900D16B87F0F8-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--7D1FF73577D848F3A86900D16B87F0F8-->  <AD_PROCESS_ID><![CDATA[CD7283DF804B449C97DA09446669EEEF]]></AD_PROCESS_ID>
-<!--7D1FF73577D848F3A86900D16B87F0F8-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--7D1FF73577D848F3A86900D16B87F0F8-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--7D1FF73577D848F3A86900D16B87F0F8--></AD_MODEL_OBJECT>
 
 <!--7D2E835F4F223D7DE040007F01012B06--><AD_MODEL_OBJECT>
@@ -4060,7 +4062,7 @@
 <!--893D5EA2377748B69FE201A7E50B692C-->  <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_process.assets.AssetLinearDepreciationMethodProcess]]></CLASSNAME>
 <!--893D5EA2377748B69FE201A7E50B692C-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--893D5EA2377748B69FE201A7E50B692C-->  <AD_PROCESS_ID><![CDATA[85601427EAEE401FA0250FF0A6DD62EF]]></AD_PROCESS_ID>
-<!--893D5EA2377748B69FE201A7E50B692C-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--893D5EA2377748B69FE201A7E50B692C-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--893D5EA2377748B69FE201A7E50B692C--></AD_MODEL_OBJECT>
 
 <!--8993A79B45F8457CB56FC27F084FF5C6--><AD_MODEL_OBJECT>
@@ -4182,7 +4184,7 @@
 <!--92986F0AC342410BA41478A94B236723-->  <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_process.ConvertQuotationIntoOrder]]></CLASSNAME>
 <!--92986F0AC342410BA41478A94B236723-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--92986F0AC342410BA41478A94B236723-->  <AD_PROCESS_ID><![CDATA[A3FE1F9892394386A49FB707AA50A0FA]]></AD_PROCESS_ID>
-<!--92986F0AC342410BA41478A94B236723-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--92986F0AC342410BA41478A94B236723-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--92986F0AC342410BA41478A94B236723--></AD_MODEL_OBJECT>
 
 <!--9453509D1DAA4A5990FA2DB6F9C709FC--><AD_MODEL_OBJECT>
@@ -4292,7 +4294,7 @@
 <!--A0DC35D75E03464E98927A7AFA384705-->  <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_process.VerifyBOM]]></CLASSNAME>
 <!--A0DC35D75E03464E98927A7AFA384705-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--A0DC35D75E03464E98927A7AFA384705-->  <AD_PROCESS_ID><![CDATA[136]]></AD_PROCESS_ID>
-<!--A0DC35D75E03464E98927A7AFA384705-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--A0DC35D75E03464E98927A7AFA384705-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--A0DC35D75E03464E98927A7AFA384705--></AD_MODEL_OBJECT>
 
 <!--A5F45F6DE7234EB1B64791BDD2923B7B--><AD_MODEL_OBJECT>
@@ -4328,7 +4330,7 @@
 <!--A843E8A63F05427B8A204810E7E7511B-->  <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_process.UpdatePaymentPlan]]></CLASSNAME>
 <!--A843E8A63F05427B8A204810E7E7511B-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--A843E8A63F05427B8A204810E7E7511B-->  <AD_PROCESS_ID><![CDATA[FB740AB61B0E42B198D2C88D3A0D0CE6]]></AD_PROCESS_ID>
-<!--A843E8A63F05427B8A204810E7E7511B-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--A843E8A63F05427B8A204810E7E7511B-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--A843E8A63F05427B8A204810E7E7511B--></AD_MODEL_OBJECT>
 
 <!--AA14992C2E4F11DEABB39BCF3C415EF2--><AD_MODEL_OBJECT>
@@ -4352,7 +4354,7 @@
 <!--AB146DAE0AE54D8AA3EE4C73BE3F4EF1-->  <CLASSNAME><![CDATA[org.openbravo.materialmgmt.VariantChDescUpdateProcess]]></CLASSNAME>
 <!--AB146DAE0AE54D8AA3EE4C73BE3F4EF1-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--AB146DAE0AE54D8AA3EE4C73BE3F4EF1-->  <AD_PROCESS_ID><![CDATA[58591E3E0F7648E4A09058E037CE49FC]]></AD_PROCESS_ID>
-<!--AB146DAE0AE54D8AA3EE4C73BE3F4EF1-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--AB146DAE0AE54D8AA3EE4C73BE3F4EF1-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--AB146DAE0AE54D8AA3EE4C73BE3F4EF1--></AD_MODEL_OBJECT>
 
 <!--AB97702AEB8911DD8E643B98325DE5FD--><AD_MODEL_OBJECT>
@@ -4413,7 +4415,7 @@
 <!--B294822111A3421281D1407D1A4672CF-->  <CLASSNAME><![CDATA[org.openbravo.costing.CostingMigrationProcess]]></CLASSNAME>
 <!--B294822111A3421281D1407D1A4672CF-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--B294822111A3421281D1407D1A4672CF-->  <AD_PROCESS_ID><![CDATA[64B3FF29AC174F4B94538BD0A3CE1CD3]]></AD_PROCESS_ID>
-<!--B294822111A3421281D1407D1A4672CF-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--B294822111A3421281D1407D1A4672CF-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--B294822111A3421281D1407D1A4672CF--></AD_MODEL_OBJECT>
 
 <!--B5FE07148F9C4A818027E2C8D628516B--><AD_MODEL_OBJECT>
@@ -4461,7 +4463,7 @@
 <!--BB0F6F0167694601A4D521F13B5D4F1E-->  <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_process.ResetAccountingProcess]]></CLASSNAME>
 <!--BB0F6F0167694601A4D521F13B5D4F1E-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--BB0F6F0167694601A4D521F13B5D4F1E-->  <AD_PROCESS_ID><![CDATA[E264309FF8244A94936502BF51829109]]></AD_PROCESS_ID>
-<!--BB0F6F0167694601A4D521F13B5D4F1E-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--BB0F6F0167694601A4D521F13B5D4F1E-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--BB0F6F0167694601A4D521F13B5D4F1E--></AD_MODEL_OBJECT>
 
 <!--BB540F2CEA514936B5E60216ACE844B3--><AD_MODEL_OBJECT>
@@ -4642,7 +4644,7 @@
 <!--CCF91F382C84410688888FF601920FC8-->  <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_actionButton.RMInsertOrphanLine]]></CLASSNAME>
 <!--CCF91F382C84410688888FF601920FC8-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--CCF91F382C84410688888FF601920FC8-->  <AD_PROCESS_ID><![CDATA[23D1B163EC0B41F790CE39BF01DA320E]]></AD_PROCESS_ID>
-<!--CCF91F382C84410688888FF601920FC8-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--CCF91F382C84410688888FF601920FC8-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--CCF91F382C84410688888FF601920FC8--></AD_MODEL_OBJECT>
 
 <!--CD9445A64E6B435AA70BFF526289C69B--><AD_MODEL_OBJECT>
@@ -4704,7 +4706,7 @@
 <!--D2FB8FAD01AD4C6989CB3A932A50CE83-->  <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_actionButton.MRPManufacturingPlanProcess]]></CLASSNAME>
 <!--D2FB8FAD01AD4C6989CB3A932A50CE83-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--D2FB8FAD01AD4C6989CB3A932A50CE83-->  <AD_PROCESS_ID><![CDATA[6FBD65B0FDB74D1AB07F0EADF18D48AE]]></AD_PROCESS_ID>
-<!--D2FB8FAD01AD4C6989CB3A932A50CE83-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--D2FB8FAD01AD4C6989CB3A932A50CE83-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--D2FB8FAD01AD4C6989CB3A932A50CE83--></AD_MODEL_OBJECT>
 
 <!--D4A42B34EBF64FCDAA3CF37A0E3CC887--><AD_MODEL_OBJECT>
@@ -4716,7 +4718,7 @@
 <!--D4A42B34EBF64FCDAA3CF37A0E3CC887-->  <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_process.CalculatePromotions]]></CLASSNAME>
 <!--D4A42B34EBF64FCDAA3CF37A0E3CC887-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--D4A42B34EBF64FCDAA3CF37A0E3CC887-->  <AD_PROCESS_ID><![CDATA[9EB2228A60684C0DBEC12D5CD8D85218]]></AD_PROCESS_ID>
-<!--D4A42B34EBF64FCDAA3CF37A0E3CC887-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--D4A42B34EBF64FCDAA3CF37A0E3CC887-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--D4A42B34EBF64FCDAA3CF37A0E3CC887--></AD_MODEL_OBJECT>
 
 <!--D8CFF08E85FF4B39A9E841EC2FA20017--><AD_MODEL_OBJECT>
@@ -4839,7 +4841,7 @@
 <!--E656BA54FAED4AC2885DDC63F9748C5D-->  <CLASSNAME><![CDATA[org.openbravo.service.db.ExportClientProcess]]></CLASSNAME>
 <!--E656BA54FAED4AC2885DDC63F9748C5D-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--E656BA54FAED4AC2885DDC63F9748C5D-->  <AD_PROCESS_ID><![CDATA[D85D5B5E368A49B1A6293BA4AE15F0F9]]></AD_PROCESS_ID>
-<!--E656BA54FAED4AC2885DDC63F9748C5D-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--E656BA54FAED4AC2885DDC63F9748C5D-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--E656BA54FAED4AC2885DDC63F9748C5D--></AD_MODEL_OBJECT>
 
 <!--E9352B3E424544B285B83E9950931164--><AD_MODEL_OBJECT>
@@ -4925,7 +4927,7 @@
 <!--FF80808133362F6A013336789DC6006A-->  <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_actionButton.RMCreateInvoice]]></CLASSNAME>
 <!--FF80808133362F6A013336789DC6006A-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--FF80808133362F6A013336789DC6006A-->  <AD_PROCESS_ID><![CDATA[FF80808133362F6A013336781FCE0066]]></AD_PROCESS_ID>
-<!--FF80808133362F6A013336789DC6006A-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--FF80808133362F6A013336789DC6006A-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--FF80808133362F6A013336789DC6006A--></AD_MODEL_OBJECT>
 
 <!--FF808181316BE3F001316C15D3D1000D--><AD_MODEL_OBJECT>
@@ -4949,7 +4951,7 @@
 <!--FF8081813219E68E013219EEC29C000D-->  <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_actionButton.SequenceProductCreate]]></CLASSNAME>
 <!--FF8081813219E68E013219EEC29C000D-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--FF8081813219E68E013219EEC29C000D-->  <AD_PROCESS_ID><![CDATA[FF8081813219E68E013219ECFE930004]]></AD_PROCESS_ID>
-<!--FF8081813219E68E013219EEC29C000D-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--FF8081813219E68E013219EEC29C000D-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--FF8081813219E68E013219EEC29C000D--></AD_MODEL_OBJECT>
 
 <!--FF808181324D007801324D2BDC8E006A--><AD_MODEL_OBJECT>
@@ -4961,7 +4963,7 @@
 <!--FF808181324D007801324D2BDC8E006A-->  <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_actionButton.CreateWorkEffort]]></CLASSNAME>
 <!--FF808181324D007801324D2BDC8E006A-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--FF808181324D007801324D2BDC8E006A-->  <AD_PROCESS_ID><![CDATA[FF808181324D007801324D2AE1130066]]></AD_PROCESS_ID>
-<!--FF808181324D007801324D2BDC8E006A-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--FF808181324D007801324D2BDC8E006A-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--FF808181324D007801324D2BDC8E006A--></AD_MODEL_OBJECT>
 
 <!--FF808181326CD80501326CEA3BA8004A--><AD_MODEL_OBJECT>
@@ -4973,7 +4975,7 @@
 <!--FF808181326CD80501326CEA3BA8004A-->  <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_actionButton.ValidateWorkEffort_ProductionRun]]></CLASSNAME>
 <!--FF808181326CD80501326CEA3BA8004A-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--FF808181326CD80501326CEA3BA8004A-->  <AD_PROCESS_ID><![CDATA[FF808181326CD80501326CE906D70042]]></AD_PROCESS_ID>
-<!--FF808181326CD80501326CEA3BA8004A-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--FF808181326CD80501326CEA3BA8004A-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--FF808181326CD80501326CEA3BA8004A--></AD_MODEL_OBJECT>
 
 <!--FF80818132A4F6AD0132A579EE93003F--><AD_MODEL_OBJECT>
@@ -4985,7 +4987,7 @@
 <!--FF80818132A4F6AD0132A579EE93003F-->  <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_actionButton.CreateStandards]]></CLASSNAME>
 <!--FF80818132A4F6AD0132A579EE93003F-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--FF80818132A4F6AD0132A579EE93003F-->  <AD_PROCESS_ID><![CDATA[FF80818132A4F6AD0132A573DD7A0021]]></AD_PROCESS_ID>
-<!--FF80818132A4F6AD0132A579EE93003F-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--FF80818132A4F6AD0132A579EE93003F-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--FF80818132A4F6AD0132A579EE93003F--></AD_MODEL_OBJECT>
 
 </data>
--- a/src-db/database/sourcedata/AD_MODULE.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-db/database/sourcedata/AD_MODULE.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -6,7 +6,7 @@
 <!--0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0-->  <NAME><![CDATA[Core]]></NAME>
-<!--0-->  <VERSION><![CDATA[3.0.30377]]></VERSION>
+<!--0-->  <VERSION><![CDATA[3.0.30402]]></VERSION>
 <!--0-->  <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
 <!--0-->  <HELP><![CDATA[Core module is the base one, all developments in core are included as part of the standard Openbravo ERP.]]></HELP>
 <!--0-->  <URL><![CDATA[www.openbravo.com]]></URL>
--- a/src-db/database/sourcedata/AD_REF_LIST.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-db/database/sourcedata/AD_REF_LIST.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -9604,6 +9604,18 @@
 <!--56FF6427878B4B529F85815729457ACE-->  <SEQNO><![CDATA[10]]></SEQNO>
 <!--56FF6427878B4B529F85815729457ACE--></AD_REF_LIST>
 
+<!--57669EE4DD234E738ECBFA9B261D76E7--><AD_REF_LIST>
+<!--57669EE4DD234E738ECBFA9B261D76E7-->  <AD_REF_LIST_ID><![CDATA[57669EE4DD234E738ECBFA9B261D76E7]]></AD_REF_LIST_ID>
+<!--57669EE4DD234E738ECBFA9B261D76E7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--57669EE4DD234E738ECBFA9B261D76E7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--57669EE4DD234E738ECBFA9B261D76E7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--57669EE4DD234E738ECBFA9B261D76E7-->  <VALUE><![CDATA[EnableScreenReader]]></VALUE>
+<!--57669EE4DD234E738ECBFA9B261D76E7-->  <NAME><![CDATA[Enable Screen Reader]]></NAME>
+<!--57669EE4DD234E738ECBFA9B261D76E7-->  <DESCRIPTION><![CDATA[This preference improves the accessibility for visual impaired people enabling the screen reader.]]></DESCRIPTION>
+<!--57669EE4DD234E738ECBFA9B261D76E7-->  <AD_REFERENCE_ID><![CDATA[A26BA480E2014707B47257024C3CBFF7]]></AD_REFERENCE_ID>
+<!--57669EE4DD234E738ECBFA9B261D76E7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--57669EE4DD234E738ECBFA9B261D76E7--></AD_REF_LIST>
+
 <!--5795507EA4AB4B8FB01439F0E541BFC5--><AD_REF_LIST>
 <!--5795507EA4AB4B8FB01439F0E541BFC5-->  <AD_REF_LIST_ID><![CDATA[5795507EA4AB4B8FB01439F0E541BFC5]]></AD_REF_LIST_ID>
 <!--5795507EA4AB4B8FB01439F0E541BFC5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -9661,6 +9673,17 @@
 <!--58C82EFABC4743808AD3F7AAD6CCE6A2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--58C82EFABC4743808AD3F7AAD6CCE6A2--></AD_REF_LIST>
 
+<!--59BA0FE702194DC5AAFD2FFB9A2B9C45--><AD_REF_LIST>
+<!--59BA0FE702194DC5AAFD2FFB9A2B9C45-->  <AD_REF_LIST_ID><![CDATA[59BA0FE702194DC5AAFD2FFB9A2B9C45]]></AD_REF_LIST_ID>
+<!--59BA0FE702194DC5AAFD2FFB9A2B9C45-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--59BA0FE702194DC5AAFD2FFB9A2B9C45-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--59BA0FE702194DC5AAFD2FFB9A2B9C45-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--59BA0FE702194DC5AAFD2FFB9A2B9C45-->  <VALUE><![CDATA[P]]></VALUE>
+<!--59BA0FE702194DC5AAFD2FFB9A2B9C45-->  <NAME><![CDATA[Process]]></NAME>
+<!--59BA0FE702194DC5AAFD2FFB9A2B9C45-->  <AD_REFERENCE_ID><![CDATA[DF7938526F074F33A9C8A7ED74EA315A]]></AD_REFERENCE_ID>
+<!--59BA0FE702194DC5AAFD2FFB9A2B9C45-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--59BA0FE702194DC5AAFD2FFB9A2B9C45--></AD_REF_LIST>
+
 <!--5AB94A06CE0B44E786ECBC5969AA83BB--><AD_REF_LIST>
 <!--5AB94A06CE0B44E786ECBC5969AA83BB-->  <AD_REF_LIST_ID><![CDATA[5AB94A06CE0B44E786ECBC5969AA83BB]]></AD_REF_LIST_ID>
 <!--5AB94A06CE0B44E786ECBC5969AA83BB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-test/.classpath.template	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-test/.classpath.template	Mon Oct 31 09:08:25 2016 +0100
@@ -10,7 +10,7 @@
 	<classpathentry kind="lib" path="/openbravo/lib/test/hamcrest-all-1.3.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container/openbravo"/>
-	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0"/>
+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/OpenbravoWAD"/>
 	<classpathentry kind="lib" path="test-lib/arquillian-container-impl-base-1.1.8.Final.jar"/>
 	<classpathentry kind="lib" path="test-lib/arquillian-container-spi-1.1.8.Final.jar"/>
--- a/src-test/src/org/openbravo/test/costing/TestCosting.java	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-test/src/org/openbravo/test/costing/TestCosting.java	Mon Oct 31 09:08:25 2016 +0100
@@ -12727,18 +12727,11 @@
             productCostingAssert.getOriginalCost() == null ? null : productCostingAssert
                 .getOriginalCost().setScale(4, BigDecimal.ROUND_HALF_UP));
 
-        assertEquals(productCosting.getTotalMovementQuantity(), productCostingAssert.getQuantity());
-
         if (productCostingAssert.getQuantity() == null) {
           assertEquals(productCosting.getQuantity(), null);
-          assertEquals(productCosting.getTotalStockValuation(), null);
         } else {
           assertEquals(productCosting.getQuantity(), productCostingAssert.getTransaction()
               .getMovementQuantity());
-          assertEquals(productCosting.getTotalStockValuation()
-              .setScale(1, BigDecimal.ROUND_HALF_UP),
-              productCostingAssert.getFinalCost().multiply(productCostingAssert.getQuantity())
-                  .setScale(1, BigDecimal.ROUND_HALF_UP));
         }
 
         assertEquals(productCosting.isManual(), productCostingAssert.isManual());
--- a/src-test/src/org/openbravo/test/dal/IssuesTest.java	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-test/src/org/openbravo/test/dal/IssuesTest.java	Mon Oct 31 09:08:25 2016 +0100
@@ -229,8 +229,6 @@
       r.setClient(c);
       r.setName("System Administrator"); // Fails unique name constraint
       r.setUserLevel("S");
-      r.setClientList("0");
-      r.setOrganizationList("0");
       OBDal.getInstance().save(r);
       OBDal.getInstance().commitAndClose();
     } catch (Exception e) {
--- a/src-test/src/org/openbravo/test/datasource/DataSourceSecurity.java	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-test/src/org/openbravo/test/datasource/DataSourceSecurity.java	Mon Oct 31 09:08:25 2016 +0100
@@ -408,8 +408,6 @@
     noAccessRole.setName("Test No Access");
     noAccessRole.setManual(true);
     noAccessRole.setUserLevel(" CO");
-    noAccessRole.setClientList(OBContext.getOBContext().getCurrentClient().getId());
-    noAccessRole.setOrganizationList(ASTERISK_ORG_ID);
     OBDal.getInstance().save(noAccessRole);
 
     RoleOrganization noAcessRoleOrg = OBProvider.getInstance().get(RoleOrganization.class);
--- a/src-test/src/org/openbravo/test/datasource/TestAllowUnpagedDatasourcePreference.java	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-test/src/org/openbravo/test/datasource/TestAllowUnpagedDatasourcePreference.java	Mon Oct 31 09:08:25 2016 +0100
@@ -45,6 +45,7 @@
 import org.openbravo.base.exception.OBException;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
+import org.openbravo.erpCommon.businessUtility.Preferences;
 import org.openbravo.erpCommon.utility.OBMessageUtils;
 import org.openbravo.model.ad.access.Role;
 import org.openbravo.model.ad.access.User;
@@ -122,7 +123,7 @@
       }
       // Compare the error message in response, if any
       String errorMsg = "";
-      if ("N".equals(preferenceValue)) {
+      if (Preferences.NO.equals(preferenceValue)) {
         errorMsg = OBMessageUtils.messageBD("OBJSON_NoPagedFetchManual");
       }
       assertThat("Datasource returned error message", getResponseErrorMessage(response),
--- a/src-test/src/org/openbravo/test/model/ClassLoaderTest.java	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-test/src/org/openbravo/test/model/ClassLoaderTest.java	Mon Oct 31 09:08:25 2016 +0100
@@ -11,18 +11,22 @@
  * 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):  ______________________________________.
  ************************************************************************
  */
 package org.openbravo.test.model;
 
-import static org.junit.Assert.assertEquals;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.Matchers.empty;
+import static org.junit.Assert.assertThat;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.servlet.Servlet;
+
 import org.apache.log4j.Logger;
 import org.hibernate.criterion.Restrictions;
 import org.junit.Test;
@@ -40,15 +44,43 @@
 public class ClassLoaderTest extends OBBaseTest {
 
   private static final Logger log = Logger.getLogger(ClassLoaderTest.class);
+  private static List<String> notFoundClasses = new ArrayList<String>();
+  private static List<String> notServletClasses = new ArrayList<String>();
+  private static boolean initialized = false;
 
   /**
    * Test if all registered classes in Application Dictionary can be loaded. Consistency test to
    * have a clean web.xml
    */
   @Test
-  public void testModelObject() {
+  public void modelClassesShouldBeImplemented() {
+    loadModel();
 
-    final List<String> notFoundClasses = new ArrayList<String>();
+    logErrors(notFoundClasses, "Missing classes");
+    assertThat("Missing classes defined in AD_Model_Object", notFoundClasses, is(empty()));
+  }
+
+  /**
+   * Test if all registered classes in Application Dictionary implement Servlet when needed.
+   * Consistency test to have a clean web.xml
+   */
+  @Test
+  public void modelClassesShouldImplementServlet() {
+    loadModel();
+
+    logErrors(notServletClasses, "Classes not implementing Servlet");
+    assertThat("Classes not implement Servlet defined in AD_Model_Object", notServletClasses,
+        is(empty()));
+  }
+
+  private void loadModel() {
+    if (initialized) {
+      return;
+    }
+
+    initialized = true;
+    notFoundClasses = new ArrayList<String>();
+    notServletClasses = new ArrayList<String>();
 
     setSystemAdministratorContext();
 
@@ -66,13 +98,8 @@
         ModelImplementation.class);
     obc.add(Restrictions.in(ModelImplementation.PROPERTY_OBJECTTYPE, in));
 
-    for (ModelImplementation mi : obc.list()) {
-      try {
-        Class.forName(mi.getJavaClassName());
-      } catch (ClassNotFoundException e) {
-        notFoundClasses.add(mi.getId() + " : " + mi.getJavaClassName());
-      }
-    }
+    // these don't need to implement Servlet
+    checkClasses("Listener/Filter", obc.list(), notFoundClasses, new ArrayList<String>());
 
     // Checking manual servlets
     obc = OBDal.getInstance().createCriteria(ModelImplementation.class);
@@ -80,60 +107,55 @@
     obc.add(Restrictions.isNull(ModelImplementation.PROPERTY_TAB));
     obc.add(Restrictions.isNull(ModelImplementation.PROPERTY_SPECIALFORM));
     obc.add(Restrictions.isNull(ModelImplementation.PROPERTY_PROCESS));
+    obc.add(Restrictions.isNull(ModelImplementation.PROPERTY_CALLOUT));
 
-    for (ModelImplementation mi : obc.list()) {
-      try {
-        if (mi.getId().equals("801180")) {
-          // Ugly hack! check issue https://issues.openbravo.com/view.php?id=12429
-          continue;
-        }
-        Class.forName(mi.getJavaClassName());
-      } catch (ClassNotFoundException e) {
-        notFoundClasses.add(mi.getId() + " : " + mi.getJavaClassName());
-      }
-    }
+    checkClasses("Manual Servlet", obc.list(), notFoundClasses, notServletClasses);
 
     // Checking servlets associated to forms
     OBQuery<ModelImplementation> obq = OBDal.getInstance().createQuery(ModelImplementation.class,
         "objectType = 'S' and specialForm is not null and specialForm.active = true");
 
-    for (ModelImplementation mi : obq.list()) {
-      try {
-        Class.forName(mi.getJavaClassName());
-      } catch (ClassNotFoundException e) {
-        notFoundClasses.add(mi.getId() + " : " + mi.getJavaClassName());
-      }
-    }
+    checkClasses("Form", obq.list(), notFoundClasses, notServletClasses);
 
     // Check servlets associated to processes/reports
-    obq = OBDal.getInstance().createQuery(ModelImplementation.class,
-        "objectType = 'S' and process is not null and process.active = true");
+    obq = OBDal
+        .getInstance()
+        .createQuery(
+            ModelImplementation.class,
+            "objectType = 'S' and process is not null and process.active = true and process.uIPattern = 'M' and process.report = false");
 
-    for (ModelImplementation mi : obq.list()) {
-      try {
-        Class.forName(mi.getJavaClassName());
-      } catch (ClassNotFoundException e) {
-        notFoundClasses.add(mi.getId() + " : " + mi.getJavaClassName());
-      }
-    }
+    checkClasses("Process", obq.list(), notFoundClasses, notServletClasses);
 
     // Checking servlets associated to tabs
     obq = OBDal.getInstance().createQuery(ModelImplementation.class,
         "objectType = 'S' and tab is not null and tab.active = true and tab.window.active = true");
 
-    for (ModelImplementation mi : obq.list()) {
+    checkClasses("Tab", obq.list(), notFoundClasses, notServletClasses);
+  }
+
+  private void checkClasses(String type, List<ModelImplementation> models, List<String> notFound,
+      List<String> notServlet) {
+    for (ModelImplementation mi : models) {
       try {
-        Class.forName(mi.getJavaClassName());
+        Class<?> clz = Class.forName(mi.getJavaClassName());
+        if (!Servlet.class.isAssignableFrom(clz)) {
+          notServlet.add(type + " - " + mi.getId() + ": " + mi.getJavaClassName());
+        }
+
       } catch (ClassNotFoundException e) {
-        notFoundClasses.add(mi.getId() + " : " + mi.getJavaClassName());
+        notFound.add(type + " - " + mi.getId() + " : " + mi.getJavaClassName());
       }
     }
+  }
 
-    if (notFoundClasses.size() > 0) {
-      for (String nf : notFoundClasses) {
-        log.error(nf);
-      }
+  private void logErrors(final List<String> classes, String msg) {
+    if (classes.isEmpty()) {
+      return;
     }
-    assertEquals(0, notFoundClasses.size());
+    log.error("== " + msg + " ==");
+    for (String nf : classes) {
+      log.error("  " + nf);
+    }
+    log.error("Total: " + classes.size());
   }
 }
--- a/src-test/src/org/openbravo/test/role/inheritance/RoleInheritanceTestUtils.java	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-test/src/org/openbravo/test/role/inheritance/RoleInheritanceTestUtils.java	Mon Oct 31 09:08:25 2016 +0100
@@ -93,9 +93,7 @@
     Client client = OBDal.getInstance().get(Client.class, clientId);
     Organization org = OBDal.getInstance().get(Organization.class, organizationId);
     role.setClient(client);
-    role.setClientList(clientId);
     role.setOrganization(org);
-    role.setOrganizationList(organizationId);
     role.setTemplate(isTemplate);
     role.setManual(isManual);
     role.setName(name);
--- a/src-test/src/org/openbravo/test/security/ExplicitCrossOrganizationReference.java	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-test/src/org/openbravo/test/security/ExplicitCrossOrganizationReference.java	Mon Oct 31 09:08:25 2016 +0100
@@ -504,8 +504,6 @@
     spainRole.setName("QA Only Spain - " + System.currentTimeMillis()); // some randomness
     spainRole.setOrganization(OBDal.getInstance().getProxy(Organization.class, "0"));
     spainRole.setManual(true);
-    spainRole.setClientList("-");
-    spainRole.setOrganizationList("-");
     spainRole.setUserLevel("  O");
     OBDal.getInstance().save(spainRole);
     createdObjects.add(spainRole);
--- a/src-trl/.settings/org.eclipse.jdt.core.prefs	Fri Oct 28 14:01:24 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-#Tue Jan 19 16:46:58 CET 2010
-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.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-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
--- a/src-trl/.settings/org.eclipse.jdt.ui.prefs	Fri Oct 28 14:01:24 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-#Tue Jan 19 16:46:58 CET 2010
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_settings_version=11
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=true
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=false
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
--- a/src-util/buildvalidation/build.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-util/buildvalidation/build.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -12,7 +12,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2010-2014 Openbravo SLU
+* All portions are Copyright (C) 2010-2016 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************
@@ -85,7 +85,14 @@
   </target>
 
   <target name="javacCore" if="checkCore">
-    <javac srcdir="${main.dir}" includes="src-util/buildvalidation/src/**/*.java" destdir="${build.validation}" fork="true" deprecation="on" encoding="UTF-8" debug="true" debuglevel="lines,vars,source" includeantruntime="false">
+    <javac srcdir="${main.dir}" 
+           includes="src-util/buildvalidation/src/**/JdkVersionCheck.java" destdir="${build.validation}" fork="true" deprecation="on" encoding="UTF-8" debug="true" debuglevel="lines,vars,source" includeantruntime="false" source="1.6" target="1.6">
+      <classpath refid="buildvalidation.class.path" />
+    </javac>
+    <javac srcdir="${main.dir}" 
+           includes="src-util/buildvalidation/src/**/*.java"
+           excludes="src-util/buildvalidation/src/**/JdkVersionCheck.java"
+           destdir="${build.validation}" fork="true" deprecation="on" encoding="UTF-8" debug="true" debuglevel="lines,vars,source" includeantruntime="false">
       <classpath refid="buildvalidation.class.path" />
     </javac>
   </target>
Binary file src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DatabaseVersionCheck.class has changed
Binary file src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DatabaseVersionCheckData.class has changed
Binary file src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/JdkVersionCheck.class has changed
--- a/src-util/buildvalidation/src/org/openbravo/buildvalidation/DatabaseVersionCheck.java	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-util/buildvalidation/src/org/openbravo/buildvalidation/DatabaseVersionCheck.java	Mon Oct 31 09:08:25 2016 +0100
@@ -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):  
  *************************************************************************
@@ -35,7 +35,7 @@
   private static Logger log4j = Logger.getLogger(DatabaseVersionCheck.class);
   private final static String POSTGRES = "PostgreSQL";
   private final static String ORACLE = "Oracle";
-  private final static String MIN_PG_VERSION = "9.1";
+  private final static String MIN_PG_VERSION = "9.3";
   private final static String MIN_ORA_VERSION = "11";
   private final static String[] WARNING_PG_VERSIONS = {};
   private final static String[] WARNING_ORA_VERSIONS = {};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-util/buildvalidation/src/org/openbravo/buildvalidation/JdkVersionCheck.java	Mon Oct 31 09:08:25 2016 +0100
@@ -0,0 +1,61 @@
+/*
+ *************************************************************************
+ * 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.buildvalidation;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.servlet.ServletException;
+
+import org.apache.commons.lang.StringUtils;
+import org.openbravo.buildvalidation.BuildValidation;
+import org.openbravo.database.ConnectionProvider;
+
+public class JdkVersionCheck extends BuildValidation {
+  private static final int JAVA7_MAJOR_VERSION = 51;
+
+  public List<String> execute() {
+    ArrayList<String> errors = new ArrayList<String>();
+    try {
+      checkJdkVersion(errors);
+      return errors;
+    } catch (Exception e) {
+      return handleError(e);
+    }
+  }
+
+  private void checkJdkVersion(ArrayList<String> errors) {
+    int majorJavaVersion = new Double(getJavaMajorVersion()).intValue();
+    if (majorJavaVersion < JAVA7_MAJOR_VERSION) {
+      errors.add("Openbravo requires Java 7 (1.7) or higher to work.");
+      errors.add("Current Java version (" + getJavaSpecificationVersion() + ") is not supported.");
+    }
+  }
+
+  private String getJavaMajorVersion() {
+    return System.getProperty("java.class.version"); // Java class format version number
+  }
+
+  private String getJavaSpecificationVersion() {
+    return System.getProperty("java.specification.version"); // Java Runtime Environment
+                                                             // specification version
+  }
+}
\ No newline at end of file
--- a/src-util/diagnostic/config/diagnostics.properties	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-util/diagnostic/config/diagnostics.properties	Mon Oct 31 09:08:25 2016 +0100
@@ -11,20 +11,20 @@
 # * under the License. 
 # * The Original Code is Openbravo ERP. 
 # * The Initial Developer of the Original Code is Openbravo SLU 
-# * All portions are Copyright (C) 2008-2014 Openbravo SLU 
+# * All portions are Copyright (C) 2008-2016 Openbravo SLU 
 # * All Rights Reserved. 
 # * Contributor(s):  ______________________________________.
 # ************************************************************************
 
 ant.min.version=1.7.0
 max.memory=512
-jvm-version=1.6
+jvm-version=1.7
 
 db.ora.version=11.1
 db.ora.opencursors=3000
 db.ora.processes=150
 
-db.pg.version=8.4
-db.pg.windows.version=8.4
+db.pg.version=9.3
+db.pg.windows.version=9.3
 
-tomcat.version=6
+tomcat.version=7
--- a/src-wad/src/org/openbravo/wad/Wad.java	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-wad/src/org/openbravo/wad/Wad.java	Mon Oct 31 09:08:25 2016 +0100
@@ -11,7 +11,7 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2001-2014 Openbravo SLU 
+ * All portions are Copyright (C) 2001-2016 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -65,12 +65,15 @@
   private static final int MAX_SIZE_EDITION_2_COLUMNS = 45;
   private static final int MAX_TEXTBOX_LENGTH = 110;
   private static final double PIXEL_TO_LENGTH = 5.6;
+  private static final String WELD_LISTENER_ID = "3F88D97C7E9E4DD9847A5488771F4AB3";
+  private static final String NONE = "none";
   private XmlEngine xmlEngine;
   private WadConnection pool;
   private String strSystemSeparator;
   private static String jsDateFormat;
   private static String sqlDateFormat;
   private static boolean generateAllClassic250Windows;
+  private static boolean excludeCDI;
 
   private static final Logger log4j = Logger.getLogger(Wad.class);
 
@@ -233,6 +236,12 @@
         generateAllClassic250Windows = argv[17].equals("true");
       }
 
+      if (argv.length <= 18) {
+        excludeCDI = false;
+      } else {
+        excludeCDI = argv[18].equals("true");
+      }
+
       log4j.info("File connection: " + strFileConnection);
       log4j.info("window: " + strWindowName);
       log4j.info("module: " + module);
@@ -247,6 +256,7 @@
       log4j.info("Web path: " + webPath);
       log4j.info("Quick mode: " + quick);
       log4j.info("Generate all 2.50 windows: " + generateAllClassic250Windows);
+      log4j.info("Exclude CDI: " + excludeCDI);
 
       final File fileFin = new File(dirFin);
       if (!fileFin.exists()) {
@@ -789,7 +799,10 @@
 
       xmlDocument.setParameter("webPath", webPath);
       xmlDocument.setParameter("attachPath", attachPath);
-      xmlDocument.setData("structureListener", WadData.selectListener(pool));
+
+      String excludeWeldListener = excludeCDI ? WELD_LISTENER_ID : NONE;
+      xmlDocument.setData("structureListener", WadData.selectListener(pool, excludeWeldListener));
+
       xmlDocument.setData("structureResource", WadData.selectResource(pool));
       final WadData[] filters = WadData.selectFilter(pool);
       WadData[][] filterParams = null;
--- a/src-wad/src/org/openbravo/wad/Wad_data.xsql	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-wad/src/org/openbravo/wad/Wad_data.xsql	Mon Oct 31 09:08:25 2016 +0100
@@ -12,7 +12,7 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2001-2012 Openbravo SLU 
+ * All portions are Copyright (C) 2001-2016 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -25,14 +25,16 @@
     <SqlMethodComment>Names of the columns of the fields of a tab</SqlMethodComment>
     <Sql>
       <![CDATA[
-      SELECT AD_MODEL_OBJECT_ID as ID, (COALESCE(ACTION, '') || AD_MODEL_OBJECT_ID) AS NAME, CLASSNAME, CLASSNAME AS DISPLAYNAME, 
+      SELECT AD_MODEL_OBJECT_ID as ID, (COALESCE(ACTION, '') || AD_MODEL_OBJECT_ID) AS NAME, o.CLASSNAME, o.CLASSNAME AS DISPLAYNAME, 
       LOADONSTARTUP, '' AS VALUE, '' AS LINE, '' AS AUTH, '' as buildxml, 
-	  '' as tabId, '' as windowName, '' as tabName, '' as windowPackage, '' as windowmodule, '' as tabPackage, '' as tabmodule,
-	  '' as key, '' as tablevel
-      FROM AD_MODEL_OBJECT o
-      WHERE ISACTIVE = 'Y'
+         '' as tabId, '' as windowName, '' as tabName, '' as windowPackage, '' as windowmodule, '' as tabPackage, '' as tabmodule,
+         '' as key, '' as tablevel
+      FROM AD_MODEL_OBJECT o LEFT JOIN ad_process p ON o.ad_process_id = p.ad_process_id AND p.isReport='N'
+      WHERE o.ISACTIVE = 'Y'
       AND OBJECT_TYPE = 'S'
       AND ACTION != 'W'
+      AND COALESCE(p.uiPattern,'M') = 'M'
+      AND AD_CALLOUT_ID IS NULL
       ORDER BY NAME
       ]]>
     </Sql>
@@ -67,6 +69,7 @@
       AND MO.OBJECT_TYPE = 'S' 
       AND MO.ACTION != 'W'
       AND MO.AD_MODEL_OBJECT_ID = MOM.AD_MODEL_OBJECT_ID 
+      AND AD_CALLOUT_ID IS NULL
       GROUP BY MO.CLASSNAME, MOM.MAPPINGNAME
       ORDER BY NAME
       ]]>
@@ -176,9 +179,11 @@
       FROM AD_MODEL_OBJECT 
       WHERE ISACTIVE = 'Y' 
       AND OBJECT_TYPE = 'L'
+      AND AD_MODEL_OBJECT_ID != ?
       ORDER BY SEQNO, NAME
       ]]>
     </Sql>
+    <Parameter name="excludeObject"/>
   </SqlMethod>
   
   <SqlMethod name="genereteWebXml" type="preparedStatement" return="boolean" default="true">
--- a/src-wad/src/org/openbravo/wad/webConf.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/src-wad/src/org/openbravo/wad/webConf.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -12,7 +12,7 @@
     * under the License. 
     * The Original Code is Openbravo ERP. 
     * The Initial Developer of the Original Code is Openbravo SLU
-    * All portions are Copyright (C) 2001-2011 Openbravo SLU 
+    * All portions are Copyright (C) 2001-2016 Openbravo SLU 
     * All Rights Reserved. 
     * Contributor(s):    ______________________________________.
     ************************************************************************
@@ -29,8 +29,8 @@
   <PARAMETER id="webapp" name="webapp" default="Y" withId="webapp1"
     boolean='xmlns="http://java.sun.com/xml/ns/j2ee" 
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-  version="2.4"' />
+  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+  version="3.0"' />
   
   <PARAMETER id="fieldSessionTimeOut" name="fieldSessionTimeOut" default="60"/>
 
--- a/src/build.xml	Fri Oct 28 14:01:24 2016 +0200
+++ b/src/build.xml	Mon Oct 31 09:08:25 2016 +0100
@@ -13,7 +13,7 @@
  * 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) 2005-2014 Openbravo SLU 
+ * All portions are Copyright (C) 2005-2016 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s): Openbravo S.L.U.
  ************************************************************************
@@ -73,6 +73,11 @@
   <property name="extension" value="html" />
   <property name="src" value="." />
   <property name="tr" value="yes" />
+
+  <condition property="exclude.cdi">
+    <equals arg1="wildfly" arg2="${application.server}" />
+  </condition>
+
   <condition property="translation">
     <not>
       <equals arg1="no" arg2="${tr}" />
@@ -369,7 +374,7 @@
   
   <target name="wad" depends="init, wadvalidation">
     <java classname="org.openbravo.wad.Wad" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}" failonerror="true">
-      <arg line="'${base.config}' '${tab}' '${build.AD}/org/openbravo/erpWindows' '${build.AD}/org/openbravo/erpCommon' '${build.sqlc}/src' '${webTab}' '${build.AD}/org/openbravo/erpCommon/ad_actionButton' '${base.design}' '${base.translate.structure}' 'dummyValueUnused' '..' '${attach.path}' '${web.url}' '${base.src}' '${complete}' '${module}' 'noquick' '${wad.generateAllClassic250Windows}'" />
+      <arg line="'${base.config}' '${tab}' '${build.AD}/org/openbravo/erpWindows' '${build.AD}/org/openbravo/erpCommon' '${build.sqlc}/src' '${webTab}' '${build.AD}/org/openbravo/erpCommon/ad_actionButton' '${base.design}' '${base.translate.structure}' 'dummyValueUnused' '..' '${attach.path}' '${web.url}' '${base.src}' '${complete}' '${module}' 'noquick' '${wad.generateAllClassic250Windows}' '${exclude.cdi}'" />
       <classpath refid="wad.class.path" />
       <syspropertyset>
          <propertyref name="java.security.egd" />
@@ -380,7 +385,7 @@
 
   <target name="wad.quick" depends="init, wadvalidation">
     <java classname="org.openbravo.wad.Wad" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
-      <arg line="'${base.config}' '${tab}' '${build.AD}/org/openbravo/erpWindows' '${build.AD}/org/openbravo/erpCommon' '${build.sqlc}/src' '${webTab}' '${build.AD}/org/openbravo/erpCommon/ad_actionButton' '${base.design}' '${base.translate.structure}' 'dummyValueUnused' '..' '${attach.path}' '${web.url}' '${base.src}' '${complete}' '${module}' 'quick' '${wad.generateAllClassic250Windows}'" />
+      <arg line="'${base.config}' '${tab}' '${build.AD}/org/openbravo/erpWindows' '${build.AD}/org/openbravo/erpCommon' '${build.sqlc}/src' '${webTab}' '${build.AD}/org/openbravo/erpCommon/ad_actionButton' '${base.design}' '${base.translate.structure}' 'dummyValueUnused' '..' '${attach.path}' '${web.url}' '${base.src}' '${complete}' '${module}' 'quick' '${wad.generateAllClassic250Windows}' '${exclude.cdi}'" />
       <classpath refid="wad.class.path" />
       <syspropertyset>
          <propertyref name="java.security.egd" />
@@ -511,6 +516,9 @@
     <copy todir="${base.context}/WEB-INF/lib" encoding="UTF-8">
       <fileset dir="${base.modules}">
         <include name="*/lib/runtime/**" />
+        <exclude if="exclude.cdi" name="org.openbravo.base.weld/lib/runtime/weld*"/>
+        <exclude if="exclude.cdi" name="org.openbravo.base.weld/lib/runtime/*api*"/>
+        <exclude if="exclude.cdi" name="org.openbravo.base.weld/lib/runtime/javax*"/>
       </fileset>
       <mapper type="regexp" from="(.*\${file.separator}lib\${file.separator}runtime)(.*)" to="\2" />
     </copy>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/base/ServerVersionChecker.java	Mon Oct 31 09:08:25 2016 +0100
@@ -0,0 +1,87 @@
+/*
+ *************************************************************************
+ * 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.base;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Checks Openbravo is deployed on a supported Server version, in case it is not, an error message
+ * is logged and deployment is stopped. Currently, checks are performed only for Tomcat.
+ * 
+ * @author alostale
+ *
+ */
+public class ServerVersionChecker implements ServletContextListener {
+  private static final int MINIMUM_TOMCAT_VERSION = 7;
+
+  private static final Logger log = LoggerFactory.getLogger(ServerVersionChecker.class);
+
+  @Override
+  public void contextInitialized(ServletContextEvent event) {
+    String serverInfo = event.getServletContext().getServerInfo();
+    log.debug("Server: " + serverInfo);
+
+    if (!isRunningOnTomcat(serverInfo)) {
+      log.info("Running on " + serverInfo);
+      // we only check Tomcat
+      return;
+    }
+
+    Integer majorVersion = getMajorVersion(serverInfo);
+    if (majorVersion == null) {
+      log.info("Unknown Tomcat version " + serverInfo);
+      return;
+    }
+
+    if (majorVersion.compareTo(MINIMUM_TOMCAT_VERSION) < 0) {
+      log.error(
+          "The minimum Tomcat version required deploy Openbravo is {}. Trying to deploy it in {} is not allowed. Please, upgrade Tomcat.",
+          MINIMUM_TOMCAT_VERSION, serverInfo);
+      System.exit(1);
+    }
+  }
+
+  private boolean isRunningOnTomcat(String serverInfo) {
+    return serverInfo.toLowerCase().contains("tomcat");
+  }
+
+  private Integer getMajorVersion(String serverInfo) {
+    try {
+      Matcher versionMatcher = Pattern.compile("[^\\d]*([\\d]*)").matcher(serverInfo);
+      if (versionMatcher.find()) {
+        return new Integer(versionMatcher.group(1));
+      }
+    } catch (Exception ignore) {
+    }
+
+    return null;
+  }
+
+  @Override
+  public void contextDestroyed(ServletContextEvent sce) {
+  }
+}
--- a/src/org/openbravo/base/secureApp/LoginHandler.java	Fri Oct 28 14:01:24 2016 +0200
+++ b/src/org/openbravo/base/secureApp/LoginHandler.java	Mon Oct 31 09:08:25 2016 +0100
@@ -32,6 +32,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.obps.ActivationKey;
 import org.openbravo.erpCommon.obps.ActivationKey.LicenseRestriction;
 import org.openbravo.erpCommon.security.Login;
@@ -417,7 +418,7 @@
   protected boolean isErpAccessRestrictedInStoreServer() {
     String restrictErpAccessInStoreServer = cachedPreference
         .getPreferenceValue(CachedPreference.RESTRICT_ERP_ACCESS_IN_STORE_SERVER);
-    return "Y".equals(restrictErpAccessInStoreServer);
+    return Preferences.YES.equals(restrictErpAccessInStoreServer);
   }
 
   private void updateDBSession(String sessionId, boolean sessionActive, String status) {
--- a/src/org/openbravo/base/secureApp/LoginUtils.java	Fri Oct 28 14:01:24 2016 +0200
+++ b/src/org/openbravo/base/secureApp/LoginUtils.java	Mon Oct 31 09:08:25 2016 +0100
@@ -228,7 +228,7 @@
     boolean shouldCheckAccessLevel = true;
 
     try {
-      shouldCheckAccessLevel = "N".equals(Preferences.getPreferenceValue(
+      shouldCheckAccessLevel = Preferences.NO.equals(Preferences.getPreferenceValue(
           "BypassAccessLevelEntityCheck", true, OBContext.getOBContext().getCurrentClient(),
           OBContext.getOBContext().getCurrentOrganization(), OBContext.getOBContext().getUser(),
           OBContext.getOBContext().getRole(), null));
--- a/src/org/openbravo/common/actionhandler/CancelAndReplaceGetCancelledOrderLine.java	Fri Oct 28 14:01:24 2016 +0200
+++ b/src/org/openbravo/common/actionhandler/CancelAndReplaceGetCancelledOrderLine.java	Mon Oct 31 09:08:25 2016 +0100
@@ -21,6 +21,7 @@
 import java.util.Map;
 
 import org.apache.log4j.Logger;
+import org.codehaus.jettison.json.JSONArray;
 import org.codehaus.jettison.json.JSONObject;
 import org.openbravo.client.kernel.BaseActionHandler;
 import org.openbravo.dal.service.OBDal;
@@ -32,12 +33,20 @@
   @Override
   protected JSONObject execute(Map<String, Object> parameters, String data) {
     JSONObject result = new JSONObject();
+    JSONObject resultOrderLine = new JSONObject();
+    JSONArray resultJSONArray = new JSONArray();
     String orderLineId = "";
     try {
-      final JSONObject jsonData = new JSONObject(data);
-      orderLineId = jsonData.getString("orderLineId");
-      OrderLine orderLine = OBDal.getInstance().get(OrderLine.class, orderLineId);
-      result.put("deliveredQuantity", orderLine.getDeliveredQuantity());
+      final JSONArray jsonArray = new JSONObject(data).getJSONArray("records");
+      for (int i = 0, size = jsonArray.length(); i < size; i++) {
+        JSONObject jsonOrderLine = jsonArray.getJSONObject(i);
+        orderLineId = jsonOrderLine.getString("replacedorderline");
+        OrderLine orderLine = OBDal.getInstance().get(OrderLine.class, orderLineId);
+        resultOrderLine.put("deliveredQuantity", orderLine.getDeliveredQuantity());
+        resultOrderLine.put("record", jsonOrderLine);
+        resultJSONArray.put(resultOrderLine);
+      }
+      result.put("result", resultJSONArray);
     } catch (Exception e) {
       log.error("Error retrieving OrderLine with id {}", e);
     }
--- a/src/org/openbravo/costing/AverageAlgorithm.java	Fri Oct 28 14:01:24 2016 +0200
+++ b/src/org/openbravo/costing/AverageAlgorithm.java	Mon Oct 31 09:08:25 2016 +0100
@@ -50,10 +50,10 @@
       BigDecimal trxCostWithSign = (transaction.getMovementQuantity().signum() == -1) ? trxCost
           .negate() : trxCost;
       BigDecimal newCost = null;
-      BigDecimal currentStock = CostingUtils.getCurrentStock(transaction.getProduct(), costOrg,
-          transaction.getTransactionProcessDate(), costDimensions);
-      BigDecimal currentValuedStock = CostingUtils.getCurrentValuedStock(transaction.getProduct(),
-          costOrg, transaction.getTransactionProcessDate(), costDimensions, costCurrency);
+      BigDecimal currentStock = CostingUtils.getCurrentStock(transaction, costOrg, costDimensions,
+          costingRule.isBackdatedTransactionsFixed(), costCurrency);
+      BigDecimal currentValuedStock = CostingUtils.getCurrentValuedStock(transaction, costOrg,
+          costDimensions, costingRule.isBackdatedTransactionsFixed(), costCurrency);
       if (currentCosting == null) {
         if (transaction.getMovementQuantity().signum() == 0) {
           newCost = BigDecimal.ZERO;
@@ -257,6 +257,46 @@
     return costList.get(0);
   }
 
+  protected static Costing getLastCumulatedCosting(Date date, Product product,
+      HashMap<CostDimension, BaseOBObject> costDimensions, Organization costOrg) {
+    StringBuffer where = new StringBuffer();
+    where.append(Costing.PROPERTY_PRODUCT + ".id = :product");
+    where.append("  and " + Costing.PROPERTY_STARTINGDATE + " <= :startingDate");
+    where.append("  and " + Costing.PROPERTY_COSTTYPE + " = 'AVA'");
+    where.append("  and " + Costing.PROPERTY_COST + " is not null");
+    where.append("  and " + Costing.PROPERTY_TOTALMOVEMENTQUANTITY + " is not null");
+    where.append("  and " + Costing.PROPERTY_TOTALSTOCKVALUATION + " is not null");
+    if (costDimensions.get(CostDimension.Warehouse) != null) {
+      where.append("  and " + Costing.PROPERTY_WAREHOUSE + ".id = :warehouse");
+    } else {
+      where.append("  and " + Costing.PROPERTY_WAREHOUSE + " is null");
+    }
+    // FIXME: remove when manufacturing costs are fully migrated
+    if (product.isProduction()) {
+      where.append("  and " + Costing.PROPERTY_CLIENT + ".id = :client");
+    } else {
+      where.append("  and " + Costing.PROPERTY_ORGANIZATION + ".id = :org");
+    }
+    where.append("  order by " + Costing.PROPERTY_STARTINGDATE + " desc,");
+    where.append(" " + Costing.PROPERTY_ENDINGDATE + " desc");
+    OBQuery<Costing> costQry = OBDal.getInstance().createQuery(Costing.class, where.toString());
+    costQry.setFilterOnReadableOrganization(false);
+    costQry.setNamedParameter("product", product.getId());
+    costQry.setNamedParameter("startingDate", date);
+    if (costDimensions.get(CostDimension.Warehouse) != null) {
+      costQry.setNamedParameter("warehouse", costDimensions.get(CostDimension.Warehouse).getId());
+    }
+    // FIXME: remove when manufacturing costs are fully migrated
+    if (product.isProduction()) {
+      costQry.setNamedParameter("client", costOrg.getClient().getId());
+    } else {
+      costQry.setNamedParameter("org", costOrg.getId());
+    }
+
+    costQry.setMaxResult(1);
+    return costQry.uniqueResult();
+  }
+
   private Date getLastDate() {
     SimpleDateFormat outputFormat = new SimpleDateFormat("dd-MM-yyyy");
     try {
--- a/src/org/openbravo/costing/AverageCostAdjustment.java	Fri Oct 28 14:01:24 2016 +0200
+++ b/src/org/openbravo/costing/AverageCostAdjustment.java	Mon Oct 31 09:08:25 2016 +0100
@@ -117,7 +117,7 @@
 
     // Initialize current stock qty and value amt.
     BigDecimal currentStock = CostAdjustmentUtils.getStockOnTransactionDate(getCostOrg(), basetrx,
-        getCostDimensions(), isManufacturingProduct, areBackdatedTrxFixed);
+        getCostDimensions(), isManufacturingProduct, areBackdatedTrxFixed, getCostCurrency());
     BigDecimal currentValueAmt = CostAdjustmentUtils.getValuedStockOnTransactionDate(getCostOrg(),
         basetrx, getCostDimensions(), isManufacturingProduct, areBackdatedTrxFixed,
         getCostCurrency());
@@ -194,8 +194,8 @@
               Organization.ENTITY_NAME, strCostOrgId));
         }
         newCosting.setQuantity(basetrx.getMovementQuantity());
-        newCosting.setTotalMovementQuantity(currentStock);
-        newCosting.setTotalStockValuation(currentValueAmt.add(adjustmentBalance));
+        newCosting.setTotalMovementQuantity(null);
+        newCosting.setTotalStockValuation(null);
         newCosting.setPrice(cost);
         newCosting.setCostType("AVA");
         newCosting.setManual(Boolean.FALSE);
@@ -208,7 +208,8 @@
         Costing curCosting = basetrx.getMaterialMgmtCostingList().get(0);
 
         if (curCosting.getCost().compareTo(cost) != 0
-            || curCosting.getTotalMovementQuantity().compareTo(currentStock) != 0) {
+            || (curCosting.getTotalMovementQuantity() != null && curCosting
+                .getTotalMovementQuantity().compareTo(currentStock) != 0)) {
           curCosting.setPermanent(Boolean.FALSE);
           OBDal.getInstance().save(curCosting);
           OBDal.getInstance().flush();
@@ -220,8 +221,8 @@
             curCosting.setCost(cost);
             curCosting.setPrice(trxPrice);
           }
-          curCosting.setTotalMovementQuantity(currentStock);
-          curCosting.setTotalStockValuation(currentValueAmt.add(adjustmentBalance));
+          curCosting.setTotalMovementQuantity(null);
+          curCosting.setTotalStockValuation(null);
           curCosting.setPermanent(Boolean.TRUE);
           OBDal.getInstance().flush();
           OBDal.getInstance().save(curCosting);
@@ -339,10 +340,35 @@
             cost = trxPrice;
             log.debug("Negative stock correction. Amount: {}, new cost {}",
                 negCorrAmt.toPlainString(), cost.toPlainString());
+          } else if (checkNegativeStockCorrection
+              && currentStock.compareTo(trx.getMovementQuantity()) >= 0) {
+            List<CostAdjustmentLine> costAdjustmentLineList = getNegativeStockAdjustments(trx);
+            BigDecimal revertedNegativeAdjustment = BigDecimal.ZERO;
+            if (!costAdjustmentLineList.isEmpty()) {
+              for (CostAdjustmentLine costAdjustmentLine : costAdjustmentLineList) {
+                revertedNegativeAdjustment = revertedNegativeAdjustment.add(costAdjustmentLine
+                    .getAdjustmentAmount().negate());
+              }
+              adjustmentBalance = adjustmentBalance.add(revertedNegativeAdjustment);
+              trxAdjAmt = trxAdjAmt.add(revertedNegativeAdjustment);
+              // If there is a difference insert a cost adjustment line.
+              CostAdjustmentLine newCAL = insertCostAdjustmentLine(trx, revertedNegativeAdjustment,
+                  null);
+              newCAL.setNegativeStockCorrection(Boolean.TRUE);
+              newCAL.setRelatedTransactionAdjusted(Boolean.TRUE);
+              newCAL.setUnitCost(Boolean.FALSE);
+              OBDal.getInstance().save(newCAL);
+              cost = currentValueAmt.add(adjustmentBalance).divide(currentStock, costCurPrecission,
+                  RoundingMode.HALF_UP);
+              log.debug("Revert Negative stock correction. Amount: {}, new cost {}",
+                  revertedNegativeAdjustment.toPlainString(), cost.toPlainString());
+            }
           }
 
-          if (curCosting.getCost().compareTo(cost) == 0 && StringUtils.isEmpty(bdCostingId)
-              && curCosting.getTotalMovementQuantity().compareTo(currentStock) == 0) {
+          if (curCosting.getCost().compareTo(cost) == 0
+              && StringUtils.isEmpty(bdCostingId)
+              && (curCosting.getTotalMovementQuantity() != null && curCosting
+                  .getTotalMovementQuantity().compareTo(currentStock) == 0)) {
             // new cost hasn't changed and total movement qty is equal to current stock, following
             // transactions will have the same cost, so no more
             // related transactions are needed to include.
@@ -362,8 +388,8 @@
               curCosting.setPrice(trxPrice);
               curCosting.setCost(cost);
             }
-            curCosting.setTotalMovementQuantity(currentStock);
-            curCosting.setTotalStockValuation(currentValueAmt.add(adjustmentBalance));
+            curCosting.setTotalMovementQuantity(null);
+            curCosting.setTotalStockValuation(null);
             curCosting.setPermanent(Boolea