Update to 3.0PR17Q1 3.0PR17Q1
authorRM packaging bot <staff.rm@openbravo.com>
Wed, 15 Mar 2017 11:15:02 +0000
changeset 721 4b89477ee2d3
parent 720 d86ef921265d
child 722 fbe04aedce11
Update to 3.0PR17Q1
java/reference/java.japi.gz
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODEL_OBJECT.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_SYSTEM.xml
model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_TAB.xml
model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_REPORT.xml
model/modules/org.openbravo.client.application/src-db/database/model/triggers/OBUIAPP_REPORT_MOD_TRG.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REF_LIST.xml
model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.client.widgets/src-db/database/model/views/OBWCL_STOCK_BY_WAREHOUSE_V.xml
model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_COLUMN.xml
model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_ELEMENT.xml
model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DBPREFIX.xml
model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_PACKAGE.xml
model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_TABLE.xml
model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBCQL_QUERY_COLUMN.xml
model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBCQL_WIDGET_QUERY.xml
model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml
model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_MERGE.xml
model/src-db/database/model/excludeFilter.xml
model/src-db/database/model/functions/AD_LANGUAGE_CREATE.xml
model/src-db/database/model/functions/C_INVOICE_CREATE.xml
model/src-db/database/model/functions/C_INVOICE_POST.xml
model/src-db/database/model/functions/C_ORDER_POST1.xml
model/src-db/database/model/functions/C_PERIOD_PROCESS.xml
model/src-db/database/model/functions/M_COPY_PRODUCT_TEMPLATE.xml
model/src-db/database/model/functions/M_EXPLODEBOMNOTSTOCK.xml
model/src-db/database/model/functions/M_GET_CONVERTED_AUMQTY.xml
model/src-db/database/model/functions/M_GET_CONVERTED_QTY.xml
model/src-db/database/model/functions/M_GET_DEFAULT_AUM_FOR_DOCUMENT.xml
model/src-db/database/model/functions/M_INITIALIZE_STOCK_VALUATION.xml
model/src-db/database/model/functions/M_INOUTEXPLODEBOMNOTSTOCK.xml
model/src-db/database/model/functions/M_INOUT_CREATE.xml
model/src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml
model/src-db/database/model/functions/M_INOUT_POST.xml
model/src-db/database/model/functions/M_MOVEMENT_POST.xml
model/src-db/database/model/functions/M_PROMOTION_ADJUSTMENT.xml
model/src-db/database/model/functions/M_REQUISITION_CREATEPO.xml
model/src-db/database/model/functions/M_UPDATE_STOCK_VALUATION.xml
model/src-db/database/model/postscript-DB2.sql
model/src-db/database/model/postscript-Oracle.sql
model/src-db/database/model/postscript-PostgreSql.sql
model/src-db/database/model/prescript-DB2.sql
model/src-db/database/model/tables/AD_FIELD.xml
model/src-db/database/model/tables/C_BPARTNER.xml
model/src-db/database/model/tables/C_INVOICELINE.xml
model/src-db/database/model/tables/C_ORDERLINE.xml
model/src-db/database/model/tables/M_INOUT.xml
model/src-db/database/model/tables/M_INOUTLINE.xml
model/src-db/database/model/tables/M_PRODUCT_AUM.xml
model/src-db/database/model/tables/M_REQUISITIONLINE.xml
model/src-db/database/model/tables/M_VALUED_STOCK_AGG.xml
model/src-db/database/model/triggers/AD_ROLE_ORGACCESS_TRG.xml
model/src-db/database/model/triggers/C_INVLINE_CHK_RESTRICTIONS_TRG.xml
model/src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml
model/src-db/database/model/triggers/M_INOUTLINE_TRG.xml
model/src-db/database/model/triggers/M_IOLINE_CHK_RESTRICTIONS_TRG.xml
model/src-db/database/model/triggers/M_PRODUCT_AUM_TRG.xml
model/src-db/database/model/triggers/M_REQUISITIONLINE_TRG.xml
model/src-db/database/model/views/AD_AUDIT_TRAIL_V.xml
model/src-db/database/model/views/C_INVOICE_CANDIDATE_V.xml
model/src-db/database/model/views/M_CREATEPOLINES_PE_V.xml
model/src-db/database/model/views/M_PRODUCT_STOCK_V.xml
model/src-db/database/model/views/M_RM_RECEIPT_PICK_EDIT.xml
model/src-db/database/model/views/M_RM_SHIPMENT_PICK_EDIT.xml
model/src-db/database/sourcedata/AD_AUXILIARINPUT.xml
model/src-db/database/sourcedata/AD_CALLOUT.xml
model/src-db/database/sourcedata/AD_COLUMN.xml
model/src-db/database/sourcedata/AD_ELEMENT.xml
model/src-db/database/sourcedata/AD_FIELD.xml
model/src-db/database/sourcedata/AD_MENU.xml
model/src-db/database/sourcedata/AD_MESSAGE.xml
model/src-db/database/sourcedata/AD_MODEL_OBJECT.xml
model/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
model/src-db/database/sourcedata/AD_MODULE.xml
model/src-db/database/sourcedata/AD_PREFERENCE.xml
model/src-db/database/sourcedata/AD_PROCESS.xml
model/src-db/database/sourcedata/AD_REFERENCE.xml
model/src-db/database/sourcedata/AD_REF_LIST.xml
model/src-db/database/sourcedata/AD_REF_TABLE.xml
model/src-db/database/sourcedata/AD_TAB.xml
model/src-db/database/sourcedata/AD_TABLE.xml
model/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
model/src-db/database/sourcedata/AD_TREENODE.xml
model/src-db/database/sourcedata/AD_VAL_RULE.xml
model/src-db/database/sourcedata/AD_WINDOW.xml
model/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
model/src-db/database/sourcedata/OBUIAPP_PROCESS.xml
model/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
Binary file java/reference/java.japi.gz has changed
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -300,6 +300,18 @@
 <!--2EE9E3A8A29044C5B6A1BCB77EB37B87-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--2EE9E3A8A29044C5B6A1BCB77EB37B87--></AD_MESSAGE>
 
+<!--2FCA4882990D431BB1E0AB7CA7505E6B--><AD_MESSAGE>
+<!--2FCA4882990D431BB1E0AB7CA7505E6B-->  <AD_MESSAGE_ID><![CDATA[2FCA4882990D431BB1E0AB7CA7505E6B]]></AD_MESSAGE_ID>
+<!--2FCA4882990D431BB1E0AB7CA7505E6B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2FCA4882990D431BB1E0AB7CA7505E6B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2FCA4882990D431BB1E0AB7CA7505E6B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2FCA4882990D431BB1E0AB7CA7505E6B-->  <VALUE><![CDATA[APRM_InvoiceAwaitingExcutionPaymentRelated]]></VALUE>
+<!--2FCA4882990D431BB1E0AB7CA7505E6B-->  <MSGTEXT><![CDATA[Invoice can not be voided as there is an awaiting execution payment related. Please either execute that payment or cancel it]]></MSGTEXT>
+<!--2FCA4882990D431BB1E0AB7CA7505E6B-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--2FCA4882990D431BB1E0AB7CA7505E6B-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--2FCA4882990D431BB1E0AB7CA7505E6B-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--2FCA4882990D431BB1E0AB7CA7505E6B--></AD_MESSAGE>
+
 <!--2FD618C9D5064C75BFF13B57B767C912--><AD_MESSAGE>
 <!--2FD618C9D5064C75BFF13B57B767C912-->  <AD_MESSAGE_ID><![CDATA[2FD618C9D5064C75BFF13B57B767C912]]></AD_MESSAGE_ID>
 <!--2FD618C9D5064C75BFF13B57B767C912-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODEL_OBJECT.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODEL_OBJECT.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -57,7 +57,7 @@
 <!--560040FB16CB46A0ABDED8047D25D4CD-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_BankStatementProcess]]></CLASSNAME>
 <!--560040FB16CB46A0ABDED8047D25D4CD-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--560040FB16CB46A0ABDED8047D25D4CD-->  <AD_PROCESS_ID><![CDATA[2DDE7D3618034C38A4462B7F3456C28D]]></AD_PROCESS_ID>
-<!--560040FB16CB46A0ABDED8047D25D4CD-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--560040FB16CB46A0ABDED8047D25D4CD-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--560040FB16CB46A0ABDED8047D25D4CD--></AD_MODEL_OBJECT>
 
 <!--62CA7E15A1D94659808D715D1A6D65F9--><AD_MODEL_OBJECT>
@@ -81,7 +81,7 @@
 <!--640FC5F514AA4798B36A15D1E70335EC-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_ReconciliationProcess]]></CLASSNAME>
 <!--640FC5F514AA4798B36A15D1E70335EC-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--640FC5F514AA4798B36A15D1E70335EC-->  <AD_PROCESS_ID><![CDATA[6BF16EFC772843AC9A17552AE0B26AB7]]></AD_PROCESS_ID>
-<!--640FC5F514AA4798B36A15D1E70335EC-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--640FC5F514AA4798B36A15D1E70335EC-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--640FC5F514AA4798B36A15D1E70335EC--></AD_MODEL_OBJECT>
 
 <!--668D8470721B430687DFE2F97A75751F--><AD_MODEL_OBJECT>
@@ -93,7 +93,7 @@
 <!--668D8470721B430687DFE2F97A75751F-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_DoubtfulDebtProcess]]></CLASSNAME>
 <!--668D8470721B430687DFE2F97A75751F-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--668D8470721B430687DFE2F97A75751F-->  <AD_PROCESS_ID><![CDATA[0BDC2164ED3E48539FCEF4D306F29EFD]]></AD_PROCESS_ID>
-<!--668D8470721B430687DFE2F97A75751F-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--668D8470721B430687DFE2F97A75751F-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--668D8470721B430687DFE2F97A75751F--></AD_MODEL_OBJECT>
 
 <!--733555DE925D4789BF94835D50EEEE14--><AD_MODEL_OBJECT>
@@ -105,7 +105,7 @@
 <!--733555DE925D4789BF94835D50EEEE14-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_AddPaymentFromJournal]]></CLASSNAME>
 <!--733555DE925D4789BF94835D50EEEE14-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--733555DE925D4789BF94835D50EEEE14-->  <AD_PROCESS_ID><![CDATA[5BE14AA10165490A9ADEFB7532F7FA94]]></AD_PROCESS_ID>
-<!--733555DE925D4789BF94835D50EEEE14-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--733555DE925D4789BF94835D50EEEE14-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--733555DE925D4789BF94835D50EEEE14--></AD_MODEL_OBJECT>
 
 <!--89313103AC3C4CC0BF080175CE85AEE9--><AD_MODEL_OBJECT>
@@ -153,7 +153,7 @@
 <!--95620B3F5CA04222A12CD446B0581DF3-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_BankStatementProcess]]></CLASSNAME>
 <!--95620B3F5CA04222A12CD446B0581DF3-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--95620B3F5CA04222A12CD446B0581DF3-->  <AD_PROCESS_ID><![CDATA[58A9261BACEF45DDA526F29D8557272D]]></AD_PROCESS_ID>
-<!--95620B3F5CA04222A12CD446B0581DF3-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--95620B3F5CA04222A12CD446B0581DF3-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--95620B3F5CA04222A12CD446B0581DF3--></AD_MODEL_OBJECT>
 
 <!--A7A562CD91CB42D9977E12B098CBC9EC--><AD_MODEL_OBJECT>
@@ -177,7 +177,7 @@
 <!--AA1C0D6D318943808A75A24F5781AEBF-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_TransactionModify]]></CLASSNAME>
 <!--AA1C0D6D318943808A75A24F5781AEBF-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--AA1C0D6D318943808A75A24F5781AEBF-->  <AD_PROCESS_ID><![CDATA[15C8708DFC464C2D91286E59624FDD18]]></AD_PROCESS_ID>
-<!--AA1C0D6D318943808A75A24F5781AEBF-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--AA1C0D6D318943808A75A24F5781AEBF-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--AA1C0D6D318943808A75A24F5781AEBF--></AD_MODEL_OBJECT>
 
 <!--ACF0CCE03B9648CDB143478B8DD9A8F3--><AD_MODEL_OBJECT>
@@ -189,7 +189,7 @@
 <!--ACF0CCE03B9648CDB143478B8DD9A8F3-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_DoubtfulDebtRunProcess]]></CLASSNAME>
 <!--ACF0CCE03B9648CDB143478B8DD9A8F3-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--ACF0CCE03B9648CDB143478B8DD9A8F3-->  <AD_PROCESS_ID><![CDATA[017312F51139438A9665775E3B5392A1]]></AD_PROCESS_ID>
-<!--ACF0CCE03B9648CDB143478B8DD9A8F3-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--ACF0CCE03B9648CDB143478B8DD9A8F3-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--ACF0CCE03B9648CDB143478B8DD9A8F3--></AD_MODEL_OBJECT>
 
 <!--B18447439CAB419395BDA44287722832--><AD_MODEL_OBJECT>
@@ -201,7 +201,7 @@
 <!--B18447439CAB419395BDA44287722832-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_PaymentProcess]]></CLASSNAME>
 <!--B18447439CAB419395BDA44287722832-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--B18447439CAB419395BDA44287722832-->  <AD_PROCESS_ID><![CDATA[6255BE488882480599C81284B70CD9B3]]></AD_PROCESS_ID>
-<!--B18447439CAB419395BDA44287722832-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--B18447439CAB419395BDA44287722832-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--B18447439CAB419395BDA44287722832--></AD_MODEL_OBJECT>
 
 <!--C200D584303B4C9BA59CD232F16610D7--><AD_MODEL_OBJECT>
@@ -225,7 +225,7 @@
 <!--D4B8EDB86914439A9E10B5D4D8372C6C-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_TransactionProcess]]></CLASSNAME>
 <!--D4B8EDB86914439A9E10B5D4D8372C6C-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--D4B8EDB86914439A9E10B5D4D8372C6C-->  <AD_PROCESS_ID><![CDATA[F68F2890E96D4D85A1DEF0274D105BCE]]></AD_PROCESS_ID>
-<!--D4B8EDB86914439A9E10B5D4D8372C6C-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--D4B8EDB86914439A9E10B5D4D8372C6C-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--D4B8EDB86914439A9E10B5D4D8372C6C--></AD_MODEL_OBJECT>
 
 <!--DC6F77826AD54AEF865E47C8FC356143--><AD_MODEL_OBJECT>
@@ -249,7 +249,7 @@
 <!--DF09705B3D7F4756A1E741FB3E73B825-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_PaymentProcess]]></CLASSNAME>
 <!--DF09705B3D7F4756A1E741FB3E73B825-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--DF09705B3D7F4756A1E741FB3E73B825-->  <AD_PROCESS_ID><![CDATA[29D17F515727436DBCE32BC6CA28382B]]></AD_PROCESS_ID>
-<!--DF09705B3D7F4756A1E741FB3E73B825-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--DF09705B3D7F4756A1E741FB3E73B825-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--DF09705B3D7F4756A1E741FB3E73B825--></AD_MODEL_OBJECT>
 
 <!--E711C538D5414BC6AABC2281BEA2F738--><AD_MODEL_OBJECT>
@@ -261,7 +261,7 @@
 <!--E711C538D5414BC6AABC2281BEA2F738-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_AddPaymentFromJournalLine]]></CLASSNAME>
 <!--E711C538D5414BC6AABC2281BEA2F738-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--E711C538D5414BC6AABC2281BEA2F738-->  <AD_PROCESS_ID><![CDATA[DE1B382FDD2540199D223586F6E216D0]]></AD_PROCESS_ID>
-<!--E711C538D5414BC6AABC2281BEA2F738-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--E711C538D5414BC6AABC2281BEA2F738-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--E711C538D5414BC6AABC2281BEA2F738--></AD_MODEL_OBJECT>
 
 <!--E7D054B44F5848B6B6FC5923EBA4E1DE--><AD_MODEL_OBJECT>
@@ -297,7 +297,7 @@
 <!--F621B518B6264CDF9285A590995013E4-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_PaymentProposalProcess]]></CLASSNAME>
 <!--F621B518B6264CDF9285A590995013E4-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--F621B518B6264CDF9285A590995013E4-->  <AD_PROCESS_ID><![CDATA[D16966FBF9604A3D91A50DC83C6EA8E3]]></AD_PROCESS_ID>
-<!--F621B518B6264CDF9285A590995013E4-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--F621B518B6264CDF9285A590995013E4-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--F621B518B6264CDF9285A590995013E4--></AD_MODEL_OBJECT>
 
 <!--F9CAF92FC3A84BAD8644B0006EF483FB--><AD_MODEL_OBJECT>
@@ -345,7 +345,7 @@
 <!--FF8080812E437710012E43BE26A3000E-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_ReconciliationProcess]]></CLASSNAME>
 <!--FF8080812E437710012E43BE26A3000E-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--FF8080812E437710012E43BE26A3000E-->  <AD_PROCESS_ID><![CDATA[FF8080812E2F8EAE012E2F94CF470014]]></AD_PROCESS_ID>
-<!--FF8080812E437710012E43BE26A3000E-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--FF8080812E437710012E43BE26A3000E-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--FF8080812E437710012E43BE26A3000E--></AD_MODEL_OBJECT>
 
 <!--FF8080812F348A97012F349E7610000A--><AD_MODEL_OBJECT>
@@ -357,7 +357,7 @@
 <!--FF8080812F348A97012F349E7610000A-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.ad_actionbutton.DeleteTransaction]]></CLASSNAME>
 <!--FF8080812F348A97012F349E7610000A-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--FF8080812F348A97012F349E7610000A-->  <AD_PROCESS_ID><![CDATA[FF8080812F348A97012F349DC24F0007]]></AD_PROCESS_ID>
-<!--FF8080812F348A97012F349E7610000A-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--FF8080812F348A97012F349E7610000A-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--FF8080812F348A97012F349E7610000A--></AD_MODEL_OBJECT>
 
 </data>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -6,7 +6,7 @@
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.30440]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.31087]]></VERSION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements.
 If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP>
@@ -25,7 +25,7 @@
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <UPDATEINFO><![CDATA[Fixed issue with document sequence numbers reset in case of applying dataset second time.
 Fixed issue 15305.]]></UPDATEINFO>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <REFERENCEDATAINFO><![CDATA[Document types and default algorithm for bank statement auto matching]]></REFERENCEDATAINFO>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION_LABEL><![CDATA[PR16Q4]]></VERSION_LABEL>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION_LABEL><![CDATA[PR17Q1]]></VERSION_LABEL>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--A918E3331C404B889D69AA9BFAFB23AC--></AD_MODULE>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -7,7 +7,7 @@
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.30440]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.31087]]></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.30440]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.31087]]></STARTVERSION>
 <!--B97FC854C6DD41E692161585645A900F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -6,7 +6,7 @@
 <!--8A098711BB324335A19833286BDB093D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--8A098711BB324335A19833286BDB093D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8A098711BB324335A19833286BDB093D-->  <NAME><![CDATA[Apache External Connection Pool]]></NAME>
-<!--8A098711BB324335A19833286BDB093D-->  <VERSION><![CDATA[1.0.30440]]></VERSION>
+<!--8A098711BB324335A19833286BDB093D-->  <VERSION><![CDATA[1.0.31087]]></VERSION>
 <!--8A098711BB324335A19833286BDB093D-->  <DESCRIPTION><![CDATA[Apache External Connection Pool]]></DESCRIPTION>
 <!--8A098711BB324335A19833286BDB093D-->  <HELP><![CDATA[This module implements the Apache JDBC Connection Pool (http://wiki.openbravo.com/wiki/Modules:Apache_JDBC_Connection_Pool).]]></HELP>
 <!--8A098711BB324335A19833286BDB093D-->  <TYPE><![CDATA[M]]></TYPE>
@@ -20,7 +20,7 @@
 <!--8A098711BB324335A19833286BDB093D-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--8A098711BB324335A19833286BDB093D-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--8A098711BB324335A19833286BDB093D-->  <UPDATEINFO><![CDATA[fixed issue #26663: configuration is read from servlet context]]></UPDATEINFO>
-<!--8A098711BB324335A19833286BDB093D-->  <VERSION_LABEL><![CDATA[PR16Q4]]></VERSION_LABEL>
+<!--8A098711BB324335A19833286BDB093D-->  <VERSION_LABEL><![CDATA[PR17Q1]]></VERSION_LABEL>
 <!--8A098711BB324335A19833286BDB093D-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--8A098711BB324335A19833286BDB093D-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--8A098711BB324335A19833286BDB093D--></AD_MODULE>
--- a/model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -7,7 +7,7 @@
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <AD_MODULE_ID><![CDATA[8A098711BB324335A19833286BDB093D]]></AD_MODULE_ID>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--1467C397BC5F4999A5606F39CD6FF8A4-->  <STARTVERSION><![CDATA[2.1.30440]]></STARTVERSION>
+<!--1467C397BC5F4999A5606F39CD6FF8A4-->  <STARTVERSION><![CDATA[2.1.31087]]></STARTVERSION>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -6,7 +6,7 @@
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <NAME><![CDATA[JBoss Weld]]></NAME>
-<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.30440]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.31087]]></VERSION>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <DESCRIPTION><![CDATA[JBoss Weld]]></DESCRIPTION>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <HELP><![CDATA[Provides the JBoss Weld framework: Java Contexts and Dependency Injection for the Java EE platform (CDI). For more information see http://seamframework.org/Weld]]></HELP>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL>
@@ -22,7 +22,7 @@
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <UPDATEINFO><![CDATA[Bug fixing.]]></UPDATEINFO>
-<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION_LABEL><![CDATA[PR16Q4]]></VERSION_LABEL>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION_LABEL><![CDATA[PR17Q1]]></VERSION_LABEL>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--C70732EA90A14EC0916078B85CC33D2D--></AD_MODULE>
--- a/model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -7,7 +7,7 @@
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.30440]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.31087]]></STARTVERSION>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_SYSTEM.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_SYSTEM.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -73,6 +73,10 @@
         <default><![CDATA[10]]></default>
         <onCreateDefault><![CDATA['10']]></onCreateDefault>
       </column>
+      <column name="ALLOWSUMMARYFUNCTIONS" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="OBUIAPP_GC_SYSTEM_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
@@ -84,6 +88,7 @@
       <check name="OBUIAPP_GC_SYS_ISLAZY_CHK"><![CDATA[ISLAZYFILTERING IN ('Y', 'N')]]></check>
       <check name="OBUIAPP_GC_SYS_ISSORT_CHK"><![CDATA[ISSORTABLE IN ('Y', 'N')]]></check>
       <check name="OBUIAPP_GC_SYS_ONCHNG_CHK"><![CDATA[FILTERONCHANGE IN ('Y', 'N')]]></check>
+      <check name="OBUIAPP_GC_SYS_SUMMARY_CHK"><![CDATA[ALLOWSUMMARYFUNCTIONS IN ('Y', 'N')]]></check>
       <check name="OBUIAPP_GC_SYS_UNFILTDD_CHK"><![CDATA[ISFKDROPDOWNUNFILTERED IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_TAB.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_TAB.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -77,6 +77,10 @@
         <default><![CDATA[10]]></default>
         <onCreateDefault><![CDATA['10']]></onCreateDefault>
       </column>
+      <column name="ALLOWSUMMARYFUNCTIONS" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false">
+        <default><![CDATA[D]]></default>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="OBUIAPP_GC_TAB_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
--- a/model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_REPORT.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_REPORT.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -49,6 +49,14 @@
         <default><![CDATA[N]]></default>
         <onCreateDefault/>
       </column>
+      <column name="HTML_TEMPLATE" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="USE_PDF_AS_HTML_TEMPLATE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault><![CDATA['N']]></onCreateDefault>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="OBUIAPP_REPORT_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
@@ -62,6 +70,7 @@
         <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 OR HTML_TEMPLATE IS NOT NULL]]></check>
     </table>
--- a/model/modules/org.openbravo.client.application/src-db/database/model/triggers/OBUIAPP_REPORT_MOD_TRG.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.client.application/src-db/database/model/triggers/OBUIAPP_REPORT_MOD_TRG.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -55,7 +55,9 @@
         COALESCE(:NEW.OBUIAPP_Process_ID , '.') != COALESCE(:OLD.OBUIAPP_Process_ID , '.') OR
         COALESCE(:NEW.PDF_Template , '.') != COALESCE(:OLD.PDF_Template , '.') OR
         COALESCE(:NEW.XLS_Template , '.') != COALESCE(:OLD.XLS_Template , '.') OR
+        COALESCE(:NEW.HTML_Template , '.') != COALESCE(:OLD.HTML_Template , '.') OR
         COALESCE(:NEW.USE_PDF_AS_XLS_TEMPLATE , '.') != COALESCE(:OLD.USE_PDF_AS_XLS_TEMPLATE , '.') OR
+        COALESCE(:NEW.USE_PDF_AS_HTML_TEMPLATE , '.') != COALESCE(:OLD.USE_PDF_AS_HTML_TEMPLATE , '.') OR
         1=2) THEN
       RAISE_APPLICATION_ERROR(-20000, '@20532@');
     END IF;
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -1470,6 +1470,45 @@
 <!--178D324AD10947149B7F79F140AA6832-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--178D324AD10947149B7F79F140AA6832--></AD_COLUMN>
 
+<!--17BDFF7E011B456AA35E388543741F7C--><AD_COLUMN>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <AD_COLUMN_ID><![CDATA[17BDFF7E011B456AA35E388543741F7C]]></AD_COLUMN_ID>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <NAME><![CDATA[AllowSummaryFunctions]]></NAME>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <DESCRIPTION><![CDATA[If this flag is enabled then the user can add summary functions into the grid, by using the column header context menu. If not enabled, then the summary functions menu will not be available.]]></DESCRIPTION>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <HELP><![CDATA[If this flag is enabled then the user can add summary functions into the grid, by using the column header context menu. If not enabled, then the summary functions menu will not be available.]]></HELP>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <COLUMNNAME><![CDATA[AllowSummaryFunctions]]></COLUMNNAME>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <AD_TABLE_ID><![CDATA[5D50320222DD4865ADFD50364C84291D]]></AD_TABLE_ID>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <SEQNO><![CDATA[190]]></SEQNO>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <AD_ELEMENT_ID><![CDATA[6F89D13CC2D547DF82B8B835DC91BC39]]></AD_ELEMENT_ID>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <POSITION><![CDATA[20]]></POSITION>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--17BDFF7E011B456AA35E388543741F7C-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--17BDFF7E011B456AA35E388543741F7C--></AD_COLUMN>
+
 <!--182023ADC5294B6C87123A6AF98F567D--><AD_COLUMN>
 <!--182023ADC5294B6C87123A6AF98F567D-->  <AD_COLUMN_ID><![CDATA[182023ADC5294B6C87123A6AF98F567D]]></AD_COLUMN_ID>
 <!--182023ADC5294B6C87123A6AF98F567D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3578,6 +3617,46 @@
 <!--566FA3846A514CB48A5B470711520415-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--566FA3846A514CB48A5B470711520415--></AD_COLUMN>
 
+<!--56C7AD9229D94A15A80AE69AB27D9AC7--><AD_COLUMN>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <AD_COLUMN_ID><![CDATA[56C7AD9229D94A15A80AE69AB27D9AC7]]></AD_COLUMN_ID>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <NAME><![CDATA[AllowSummaryFunctions]]></NAME>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <DESCRIPTION><![CDATA[If this flag is enabled then the user can add summary functions into the grid, by using the column header context menu. If not enabled, then the summary functions menu will not be available.]]></DESCRIPTION>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <HELP><![CDATA[If this flag is enabled then the user can add summary functions into the grid, by using the column header context menu. If not enabled, then the summary functions menu will not be available.]]></HELP>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <COLUMNNAME><![CDATA[AllowSummaryFunctions]]></COLUMNNAME>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <AD_TABLE_ID><![CDATA[8A16662B37184121A1EDAA89890E160C]]></AD_TABLE_ID>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <AD_REFERENCE_VALUE_ID><![CDATA[892231CFE03848758D74B0209B801C14]]></AD_REFERENCE_VALUE_ID>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <DEFAULTVALUE><![CDATA[D]]></DEFAULTVALUE>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <SEQNO><![CDATA[210]]></SEQNO>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <AD_ELEMENT_ID><![CDATA[6F89D13CC2D547DF82B8B835DC91BC39]]></AD_ELEMENT_ID>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <POSITION><![CDATA[20]]></POSITION>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--56C7AD9229D94A15A80AE69AB27D9AC7--></AD_COLUMN>
+
 <!--57C992741B824BE5A3B285A4E2B9AF02--><AD_COLUMN>
 <!--57C992741B824BE5A3B285A4E2B9AF02-->  <AD_COLUMN_ID><![CDATA[57C992741B824BE5A3B285A4E2B9AF02]]></AD_COLUMN_ID>
 <!--57C992741B824BE5A3B285A4E2B9AF02-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -5791,6 +5870,45 @@
 <!--8A70E8C4933E45169F74BC730318D1B5-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--8A70E8C4933E45169F74BC730318D1B5--></AD_COLUMN>
 
+<!--8BAD159F88D64983917E5D2D4DF400F7--><AD_COLUMN>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <AD_COLUMN_ID><![CDATA[8BAD159F88D64983917E5D2D4DF400F7]]></AD_COLUMN_ID>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <NAME><![CDATA[Use PDF as HTML Template]]></NAME>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <DESCRIPTION><![CDATA[Determines whether the PDF Template needs to be used to generate the HTML report instead of defining a specific template for it.]]></DESCRIPTION>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <HELP><![CDATA[Determines whether the PDF Template needs to be used to generate the HTML report instead of defining a specific template for it.]]></HELP>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <COLUMNNAME><![CDATA[USE_Pdf_As_Html_Template]]></COLUMNNAME>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <AD_TABLE_ID><![CDATA[C7CAB786F3EF4DF0B5E7B9AC6EC7DED8]]></AD_TABLE_ID>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <SEQNO><![CDATA[140]]></SEQNO>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <AD_ELEMENT_ID><![CDATA[0FA9076400FE4EF2BEACC722292144C5]]></AD_ELEMENT_ID>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <POSITION><![CDATA[14]]></POSITION>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--8BAD159F88D64983917E5D2D4DF400F7--></AD_COLUMN>
+
 <!--8BE595E8BE9940578AF409B85AFE02AA--><AD_COLUMN>
 <!--8BE595E8BE9940578AF409B85AFE02AA-->  <AD_COLUMN_ID><![CDATA[8BE595E8BE9940578AF409B85AFE02AA]]></AD_COLUMN_ID>
 <!--8BE595E8BE9940578AF409B85AFE02AA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -8214,6 +8332,44 @@
 <!--A1A338DE694D4B849A249AD2C709B36C-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A1A338DE694D4B849A249AD2C709B36C--></AD_COLUMN>
 
+<!--A215112D541C479796B314D93155993F--><AD_COLUMN>
+<!--A215112D541C479796B314D93155993F-->  <AD_COLUMN_ID><![CDATA[A215112D541C479796B314D93155993F]]></AD_COLUMN_ID>
+<!--A215112D541C479796B314D93155993F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A215112D541C479796B314D93155993F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A215112D541C479796B314D93155993F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A215112D541C479796B314D93155993F-->  <NAME><![CDATA[HTML Template]]></NAME>
+<!--A215112D541C479796B314D93155993F-->  <DESCRIPTION><![CDATA[JRXML template to use for exporting the report to HTML format]]></DESCRIPTION>
+<!--A215112D541C479796B314D93155993F-->  <HELP><![CDATA[JRXML template to use for exporting the report to HTML format]]></HELP>
+<!--A215112D541C479796B314D93155993F-->  <COLUMNNAME><![CDATA[HTML_Template]]></COLUMNNAME>
+<!--A215112D541C479796B314D93155993F-->  <AD_TABLE_ID><![CDATA[C7CAB786F3EF4DF0B5E7B9AC6EC7DED8]]></AD_TABLE_ID>
+<!--A215112D541C479796B314D93155993F-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--A215112D541C479796B314D93155993F-->  <FIELDLENGTH><![CDATA[255]]></FIELDLENGTH>
+<!--A215112D541C479796B314D93155993F-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--A215112D541C479796B314D93155993F-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--A215112D541C479796B314D93155993F-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--A215112D541C479796B314D93155993F-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--A215112D541C479796B314D93155993F-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--A215112D541C479796B314D93155993F-->  <SEQNO><![CDATA[130]]></SEQNO>
+<!--A215112D541C479796B314D93155993F-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--A215112D541C479796B314D93155993F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A215112D541C479796B314D93155993F-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--A215112D541C479796B314D93155993F-->  <AD_ELEMENT_ID><![CDATA[7B0DBFCC0E5C429092E23014127C44B8]]></AD_ELEMENT_ID>
+<!--A215112D541C479796B314D93155993F-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--A215112D541C479796B314D93155993F-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--A215112D541C479796B314D93155993F-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--A215112D541C479796B314D93155993F-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--A215112D541C479796B314D93155993F-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--A215112D541C479796B314D93155993F-->  <POSITION><![CDATA[13]]></POSITION>
+<!--A215112D541C479796B314D93155993F-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--A215112D541C479796B314D93155993F-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--A215112D541C479796B314D93155993F-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--A215112D541C479796B314D93155993F-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--A215112D541C479796B314D93155993F-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--A215112D541C479796B314D93155993F-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--A215112D541C479796B314D93155993F-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A215112D541C479796B314D93155993F-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--A215112D541C479796B314D93155993F--></AD_COLUMN>
+
 <!--A296915242174A738010EB453701B187--><AD_COLUMN>
 <!--A296915242174A738010EB453701B187-->  <AD_COLUMN_ID><![CDATA[A296915242174A738010EB453701B187]]></AD_COLUMN_ID>
 <!--A296915242174A738010EB453701B187-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -80,6 +80,20 @@
 <!--0E87BDD6E59C4B5FB9273E2580CC76B2-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--0E87BDD6E59C4B5FB9273E2580CC76B2--></AD_ELEMENT>
 
+<!--0FA9076400FE4EF2BEACC722292144C5--><AD_ELEMENT>
+<!--0FA9076400FE4EF2BEACC722292144C5-->  <AD_ELEMENT_ID><![CDATA[0FA9076400FE4EF2BEACC722292144C5]]></AD_ELEMENT_ID>
+<!--0FA9076400FE4EF2BEACC722292144C5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0FA9076400FE4EF2BEACC722292144C5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0FA9076400FE4EF2BEACC722292144C5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0FA9076400FE4EF2BEACC722292144C5-->  <COLUMNNAME><![CDATA[USE_Pdf_As_Html_Template]]></COLUMNNAME>
+<!--0FA9076400FE4EF2BEACC722292144C5-->  <NAME><![CDATA[Use PDF as HTML Template]]></NAME>
+<!--0FA9076400FE4EF2BEACC722292144C5-->  <PRINTNAME><![CDATA[Use PDF as HTML Template]]></PRINTNAME>
+<!--0FA9076400FE4EF2BEACC722292144C5-->  <DESCRIPTION><![CDATA[Determines whether the PDF Template needs to be used to generate the HTML report instead of defining a specific template for it.]]></DESCRIPTION>
+<!--0FA9076400FE4EF2BEACC722292144C5-->  <HELP><![CDATA[Determines whether the PDF Template needs to be used to generate the HTML report instead of defining a specific template for it.]]></HELP>
+<!--0FA9076400FE4EF2BEACC722292144C5-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--0FA9076400FE4EF2BEACC722292144C5-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--0FA9076400FE4EF2BEACC722292144C5--></AD_ELEMENT>
+
 <!--10922048465547F48765035389E22977--><AD_ELEMENT>
 <!--10922048465547F48765035389E22977-->  <AD_ELEMENT_ID><![CDATA[10922048465547F48765035389E22977]]></AD_ELEMENT_ID>
 <!--10922048465547F48765035389E22977-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -408,6 +422,20 @@
 <!--6DBAB16113DB4879A0EA095E80FBA959-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--6DBAB16113DB4879A0EA095E80FBA959--></AD_ELEMENT>
 
+<!--6F89D13CC2D547DF82B8B835DC91BC39--><AD_ELEMENT>
+<!--6F89D13CC2D547DF82B8B835DC91BC39-->  <AD_ELEMENT_ID><![CDATA[6F89D13CC2D547DF82B8B835DC91BC39]]></AD_ELEMENT_ID>
+<!--6F89D13CC2D547DF82B8B835DC91BC39-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6F89D13CC2D547DF82B8B835DC91BC39-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6F89D13CC2D547DF82B8B835DC91BC39-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6F89D13CC2D547DF82B8B835DC91BC39-->  <COLUMNNAME><![CDATA[AllowSummaryFunctions]]></COLUMNNAME>
+<!--6F89D13CC2D547DF82B8B835DC91BC39-->  <NAME><![CDATA[Allow Summary Functions]]></NAME>
+<!--6F89D13CC2D547DF82B8B835DC91BC39-->  <PRINTNAME><![CDATA[Allow Summary Functions]]></PRINTNAME>
+<!--6F89D13CC2D547DF82B8B835DC91BC39-->  <DESCRIPTION><![CDATA[If this flag is enabled then the user can add summary functions into the grid, by using the column header context menu. If not enabled, then the summary functions menu will not be available.]]></DESCRIPTION>
+<!--6F89D13CC2D547DF82B8B835DC91BC39-->  <HELP><![CDATA[If this flag is enabled then the user can add summary functions into the grid, by using the column header context menu. If not enabled, then the summary functions menu will not be available.]]></HELP>
+<!--6F89D13CC2D547DF82B8B835DC91BC39-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--6F89D13CC2D547DF82B8B835DC91BC39-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--6F89D13CC2D547DF82B8B835DC91BC39--></AD_ELEMENT>
+
 <!--7A18B7D741A349B493D145C80DB54E5E--><AD_ELEMENT>
 <!--7A18B7D741A349B493D145C80DB54E5E-->  <AD_ELEMENT_ID><![CDATA[7A18B7D741A349B493D145C80DB54E5E]]></AD_ELEMENT_ID>
 <!--7A18B7D741A349B493D145C80DB54E5E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -420,6 +448,20 @@
 <!--7A18B7D741A349B493D145C80DB54E5E-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--7A18B7D741A349B493D145C80DB54E5E--></AD_ELEMENT>
 
+<!--7B0DBFCC0E5C429092E23014127C44B8--><AD_ELEMENT>
+<!--7B0DBFCC0E5C429092E23014127C44B8-->  <AD_ELEMENT_ID><![CDATA[7B0DBFCC0E5C429092E23014127C44B8]]></AD_ELEMENT_ID>
+<!--7B0DBFCC0E5C429092E23014127C44B8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7B0DBFCC0E5C429092E23014127C44B8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7B0DBFCC0E5C429092E23014127C44B8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7B0DBFCC0E5C429092E23014127C44B8-->  <COLUMNNAME><![CDATA[HTML_Template]]></COLUMNNAME>
+<!--7B0DBFCC0E5C429092E23014127C44B8-->  <NAME><![CDATA[HTML Template]]></NAME>
+<!--7B0DBFCC0E5C429092E23014127C44B8-->  <PRINTNAME><![CDATA[HTML Template]]></PRINTNAME>
+<!--7B0DBFCC0E5C429092E23014127C44B8-->  <DESCRIPTION><![CDATA[JRXML template to use for exporting the report to HTML format]]></DESCRIPTION>
+<!--7B0DBFCC0E5C429092E23014127C44B8-->  <HELP><![CDATA[JRXML template to use for exporting the report to HTML format]]></HELP>
+<!--7B0DBFCC0E5C429092E23014127C44B8-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--7B0DBFCC0E5C429092E23014127C44B8-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--7B0DBFCC0E5C429092E23014127C44B8--></AD_ELEMENT>
+
 <!--7F257DE6A0C847A8A121804BC5F9B7A8--><AD_ELEMENT>
 <!--7F257DE6A0C847A8A121804BC5F9B7A8-->  <AD_ELEMENT_ID><![CDATA[7F257DE6A0C847A8A121804BC5F9B7A8]]></AD_ELEMENT_ID>
 <!--7F257DE6A0C847A8A121804BC5F9B7A8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -623,7 +623,7 @@
 <!--08AEFECA5A607AECE050007F0100529C-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--08AEFECA5A607AECE050007F0100529C-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--08AEFECA5A607AECE050007F0100529C-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--08AEFECA5A607AECE050007F0100529C-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--08AEFECA5A607AECE050007F0100529C-->  <STARTNEWLINE><![CDATA[Y]]></STARTNEWLINE>
 <!--08AEFECA5A607AECE050007F0100529C-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
 <!--08AEFECA5A607AECE050007F0100529C-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--08AEFECA5A607AECE050007F0100529C--></AD_FIELD>
@@ -2362,6 +2362,34 @@
 <!--2D7AB3C1F38B437A878AE286C3AF9D17-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--2D7AB3C1F38B437A878AE286C3AF9D17--></AD_FIELD>
 
+<!--2E33383FC304491FBBA8F4593AF9918C--><AD_FIELD>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <AD_FIELD_ID><![CDATA[2E33383FC304491FBBA8F4593AF9918C]]></AD_FIELD_ID>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <NAME><![CDATA[Allow Summary Functions]]></NAME>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <DESCRIPTION><![CDATA[If this flag is enabled then the user can add summary functions into the grid, by using the column header context menu. If not enabled, then the summary functions menu will not be available.]]></DESCRIPTION>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <HELP><![CDATA[If this flag is enabled then the user can add summary functions into the grid, by using the column header context menu. If not enabled, then the summary functions menu will not be available.]]></HELP>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <AD_TAB_ID><![CDATA[49B33DC2EDFD45A48EECE139AD5E9AC9]]></AD_TAB_ID>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <AD_COLUMN_ID><![CDATA[56C7AD9229D94A15A80AE69AB27D9AC7]]></AD_COLUMN_ID>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <SEQNO><![CDATA[140]]></SEQNO>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--2E33383FC304491FBBA8F4593AF9918C-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--2E33383FC304491FBBA8F4593AF9918C--></AD_FIELD>
+
 <!--2F84AAB44351416C8F48DC36CE6B9E58--><AD_FIELD>
 <!--2F84AAB44351416C8F48DC36CE6B9E58-->  <AD_FIELD_ID><![CDATA[2F84AAB44351416C8F48DC36CE6B9E58]]></AD_FIELD_ID>
 <!--2F84AAB44351416C8F48DC36CE6B9E58-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -5630,6 +5658,35 @@
 <!--961A9B93266A41F1BF3BAE222A7E07DB-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--961A9B93266A41F1BF3BAE222A7E07DB--></AD_FIELD>
 
+<!--964F43EDD5CC4EA092F49DEFE4C2E040--><AD_FIELD>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <AD_FIELD_ID><![CDATA[964F43EDD5CC4EA092F49DEFE4C2E040]]></AD_FIELD_ID>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <NAME><![CDATA[HTML Template]]></NAME>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <DESCRIPTION><![CDATA[JRXML template to use for exporting the report to HTML format]]></DESCRIPTION>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <HELP><![CDATA[JRXML template to use for exporting the report to HTML format]]></HELP>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <AD_TAB_ID><![CDATA[2B7B3CCDC940436F93437445AA7752F3]]></AD_TAB_ID>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <AD_COLUMN_ID><![CDATA[A215112D541C479796B314D93155993F]]></AD_COLUMN_ID>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <DISPLAYLOGIC><![CDATA[@USE_Pdf_As_Html_Template@='N']]></DISPLAYLOGIC>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <DISPLAYLENGTH><![CDATA[255]]></DISPLAYLENGTH>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <STARTNEWLINE><![CDATA[Y]]></STARTNEWLINE>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040--></AD_FIELD>
+
 <!--96B87B69B9C8458888D81C486932E9A9--><AD_FIELD>
 <!--96B87B69B9C8458888D81C486932E9A9-->  <AD_FIELD_ID><![CDATA[96B87B69B9C8458888D81C486932E9A9]]></AD_FIELD_ID>
 <!--96B87B69B9C8458888D81C486932E9A9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -6759,6 +6816,35 @@
 <!--C216C156DB954876BB6F0B830038E599-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--C216C156DB954876BB6F0B830038E599--></AD_FIELD>
 
+<!--C257145471DD451BA2F7E09F7B87B66A--><AD_FIELD>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <AD_FIELD_ID><![CDATA[C257145471DD451BA2F7E09F7B87B66A]]></AD_FIELD_ID>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <NAME><![CDATA[Use PDF as HTML Template]]></NAME>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <DESCRIPTION><![CDATA[Determines whether the PDF Template needs to be used to generate the HTML report instead of defining a specific template for it.]]></DESCRIPTION>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <HELP><![CDATA[Determines whether the PDF Template needs to be used to generate the HTML report instead of defining a specific template for it.]]></HELP>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <AD_TAB_ID><![CDATA[2B7B3CCDC940436F93437445AA7752F3]]></AD_TAB_ID>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <AD_COLUMN_ID><![CDATA[8BAD159F88D64983917E5D2D4DF400F7]]></AD_COLUMN_ID>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <DISPLAYLOGIC><![CDATA[@HTML_Template@='']]></DISPLAYLOGIC>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--C257145471DD451BA2F7E09F7B87B66A-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--C257145471DD451BA2F7E09F7B87B66A--></AD_FIELD>
+
 <!--C2B8716DE89B4A69BD3F0F77667A9938--><AD_FIELD>
 <!--C2B8716DE89B4A69BD3F0F77667A9938-->  <AD_FIELD_ID><![CDATA[C2B8716DE89B4A69BD3F0F77667A9938]]></AD_FIELD_ID>
 <!--C2B8716DE89B4A69BD3F0F77667A9938-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -7234,6 +7320,34 @@
 <!--CD0E9652F46441AA9A75A0A2FC467706-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--CD0E9652F46441AA9A75A0A2FC467706--></AD_FIELD>
 
+<!--CF40B74CE6A4408F8349E3709BD08D70--><AD_FIELD>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <AD_FIELD_ID><![CDATA[CF40B74CE6A4408F8349E3709BD08D70]]></AD_FIELD_ID>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <NAME><![CDATA[Allow Summary Functions]]></NAME>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <DESCRIPTION><![CDATA[If this flag is enabled then the user can add summary functions into the grid, by using the column header context menu. If not enabled, then the summary functions menu will not be available.]]></DESCRIPTION>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <HELP><![CDATA[If this flag is enabled then the user can add summary functions into the grid, by using the column header context menu. If not enabled, then the summary functions menu will not be available.]]></HELP>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <AD_TAB_ID><![CDATA[13FE911F7F684A47801DF55525BAD4A1]]></AD_TAB_ID>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <AD_COLUMN_ID><![CDATA[17BDFF7E011B456AA35E388543741F7C]]></AD_COLUMN_ID>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <SEQNO><![CDATA[130]]></SEQNO>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--CF40B74CE6A4408F8349E3709BD08D70-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--CF40B74CE6A4408F8349E3709BD08D70--></AD_FIELD>
+
 <!--D31CFA8B415F48B79A7D939291850D7F--><AD_FIELD>
 <!--D31CFA8B415F48B79A7D939291850D7F-->  <AD_FIELD_ID><![CDATA[D31CFA8B415F48B79A7D939291850D7F]]></AD_FIELD_ID>
 <!--D31CFA8B415F48B79A7D939291850D7F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -228,6 +228,18 @@
 <!--090A37D22ED3AFD5012ED3C5DE60001C-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--090A37D22ED3AFD5012ED3C5DE60001C--></AD_MESSAGE>
 
+<!--0BB85B43F187432F934B3A7AF6456685--><AD_MESSAGE>
+<!--0BB85B43F187432F934B3A7AF6456685-->  <AD_MESSAGE_ID><![CDATA[0BB85B43F187432F934B3A7AF6456685]]></AD_MESSAGE_ID>
+<!--0BB85B43F187432F934B3A7AF6456685-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0BB85B43F187432F934B3A7AF6456685-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0BB85B43F187432F934B3A7AF6456685-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0BB85B43F187432F934B3A7AF6456685-->  <VALUE><![CDATA[OBUIAPP_HTMLExport]]></VALUE>
+<!--0BB85B43F187432F934B3A7AF6456685-->  <MSGTEXT><![CDATA[View]]></MSGTEXT>
+<!--0BB85B43F187432F934B3A7AF6456685-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--0BB85B43F187432F934B3A7AF6456685-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--0BB85B43F187432F934B3A7AF6456685-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--0BB85B43F187432F934B3A7AF6456685--></AD_MESSAGE>
+
 <!--0BEB24CF954E410EAFE4EF198C38A902--><AD_MESSAGE>
 <!--0BEB24CF954E410EAFE4EF198C38A902-->  <AD_MESSAGE_ID><![CDATA[0BEB24CF954E410EAFE4EF198C38A902]]></AD_MESSAGE_ID>
 <!--0BEB24CF954E410EAFE4EF198C38A902-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -665,6 +677,18 @@
 <!--42B286FCB7054BD49A7FCDE676DB736A-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--42B286FCB7054BD49A7FCDE676DB736A--></AD_MESSAGE>
 
+<!--449C8BE622434987A5BF5CEEAD846E43--><AD_MESSAGE>
+<!--449C8BE622434987A5BF5CEEAD846E43-->  <AD_MESSAGE_ID><![CDATA[449C8BE622434987A5BF5CEEAD846E43]]></AD_MESSAGE_ID>
+<!--449C8BE622434987A5BF5CEEAD846E43-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--449C8BE622434987A5BF5CEEAD846E43-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--449C8BE622434987A5BF5CEEAD846E43-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--449C8BE622434987A5BF5CEEAD846E43-->  <VALUE><![CDATA[OBUIAPP_RM_OutOfRange_AUM]]></VALUE>
+<!--449C8BE622434987A5BF5CEEAD846E43-->  <MSGTEXT><![CDATA[Returning %0 %1, considering quantity returned in other RM Orders, Returned Qty exceeds the Quantity. Please enter a valid range: 0 - %2.]]></MSGTEXT>
+<!--449C8BE622434987A5BF5CEEAD846E43-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--449C8BE622434987A5BF5CEEAD846E43-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--449C8BE622434987A5BF5CEEAD846E43-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--449C8BE622434987A5BF5CEEAD846E43--></AD_MESSAGE>
+
 <!--48A6793A3C364216B184A33117EF7ED1--><AD_MESSAGE>
 <!--48A6793A3C364216B184A33117EF7ED1-->  <AD_MESSAGE_ID><![CDATA[48A6793A3C364216B184A33117EF7ED1]]></AD_MESSAGE_ID>
 <!--48A6793A3C364216B184A33117EF7ED1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1135,6 +1159,18 @@
 <!--7E8A12D43C0D404F868CE36DB349C9FC-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--7E8A12D43C0D404F868CE36DB349C9FC--></AD_MESSAGE>
 
+<!--7F4934C893024B329C8A230264C0D603--><AD_MESSAGE>
+<!--7F4934C893024B329C8A230264C0D603-->  <AD_MESSAGE_ID><![CDATA[7F4934C893024B329C8A230264C0D603]]></AD_MESSAGE_ID>
+<!--7F4934C893024B329C8A230264C0D603-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7F4934C893024B329C8A230264C0D603-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7F4934C893024B329C8A230264C0D603-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7F4934C893024B329C8A230264C0D603-->  <VALUE><![CDATA[OBUIAPP_Filter_By_Column]]></VALUE>
+<!--7F4934C893024B329C8A230264C0D603-->  <MSGTEXT><![CDATA[Filter by %0]]></MSGTEXT>
+<!--7F4934C893024B329C8A230264C0D603-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--7F4934C893024B329C8A230264C0D603-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--7F4934C893024B329C8A230264C0D603-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--7F4934C893024B329C8A230264C0D603--></AD_MESSAGE>
+
 <!--80A295E6A2EE4213BD9D975158749977--><AD_MESSAGE>
 <!--80A295E6A2EE4213BD9D975158749977-->  <AD_MESSAGE_ID><![CDATA[80A295E6A2EE4213BD9D975158749977]]></AD_MESSAGE_ID>
 <!--80A295E6A2EE4213BD9D975158749977-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1406,7 +1442,7 @@
 <!--A497EC573BCE49F093FFA012620BD082-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A497EC573BCE49F093FFA012620BD082-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A497EC573BCE49F093FFA012620BD082-->  <VALUE><![CDATA[OBUIAPP_REPORT_TMP_CHK]]></VALUE>
-<!--A497EC573BCE49F093FFA012620BD082-->  <MSGTEXT><![CDATA[You have to define at least one of PDF Template or XLS Template fields.]]></MSGTEXT>
+<!--A497EC573BCE49F093FFA012620BD082-->  <MSGTEXT><![CDATA[You have to define at least one of PDF Template or XLS Template or HTML Template fields.]]></MSGTEXT>
 <!--A497EC573BCE49F093FFA012620BD082-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
 <!--A497EC573BCE49F093FFA012620BD082-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--A497EC573BCE49F093FFA012620BD082-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
@@ -1821,6 +1857,18 @@
 <!--D71BBF4693BD45329F17355A907B9D39-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--D71BBF4693BD45329F17355A907B9D39--></AD_MESSAGE>
 
+<!--D779698DB3A6486B801ED22037369E18--><AD_MESSAGE>
+<!--D779698DB3A6486B801ED22037369E18-->  <AD_MESSAGE_ID><![CDATA[D779698DB3A6486B801ED22037369E18]]></AD_MESSAGE_ID>
+<!--D779698DB3A6486B801ED22037369E18-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D779698DB3A6486B801ED22037369E18-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D779698DB3A6486B801ED22037369E18-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D779698DB3A6486B801ED22037369E18-->  <VALUE><![CDATA[OBUIAPP_RM_TooMuchShippedInUomManagement]]></VALUE>
+<!--D779698DB3A6486B801ED22037369E18-->  <MSGTEXT><![CDATA[The sum of the Ship Qty exceeds the Pending Qty for that particular RM Order No. and Line No.]]></MSGTEXT>
+<!--D779698DB3A6486B801ED22037369E18-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--D779698DB3A6486B801ED22037369E18-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--D779698DB3A6486B801ED22037369E18-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--D779698DB3A6486B801ED22037369E18--></AD_MESSAGE>
+
 <!--DAC8C406FB1D497CAF91619E6B8A5458--><AD_MESSAGE>
 <!--DAC8C406FB1D497CAF91619E6B8A5458-->  <AD_MESSAGE_ID><![CDATA[DAC8C406FB1D497CAF91619E6B8A5458]]></AD_MESSAGE_ID>
 <!--DAC8C406FB1D497CAF91619E6B8A5458-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -6,7 +6,7 @@
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <NAME><![CDATA[User Interface Application]]></NAME>
-<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.30440]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.31087]]></VERSION>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <DESCRIPTION><![CDATA[Provides the main application components for the openbravo user interface]]></DESCRIPTION>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <HELP><![CDATA[Provides the main application components for the openbravo user interface. The main layout incorporates a navigation bar and a main view area.]]></HELP>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL>
@@ -22,7 +22,7 @@
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <UPDATEINFO><![CDATA[Styling bugfixing]]></UPDATEINFO>
-<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION_LABEL><![CDATA[PR16Q4]]></VERSION_LABEL>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION_LABEL><![CDATA[PR17Q1]]></VERSION_LABEL>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--9BA0836A3CD74EE4AB48753A47211BCC--></AD_MODULE>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -7,7 +7,7 @@
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.30440]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.31087]]></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.30440]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.31087]]></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.30440]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.31087]]></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.30440]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.31087]]></STARTVERSION>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REF_LIST.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REF_LIST.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -140,6 +140,18 @@
 <!--4C0466BB94BD413BB8D523C3FADB4E4C-->  <SEQNO><![CDATA[60]]></SEQNO>
 <!--4C0466BB94BD413BB8D523C3FADB4E4C--></AD_REF_LIST>
 
+<!--557BFB777B164892BB8BC97772EEA71A--><AD_REF_LIST>
+<!--557BFB777B164892BB8BC97772EEA71A-->  <AD_REF_LIST_ID><![CDATA[557BFB777B164892BB8BC97772EEA71A]]></AD_REF_LIST_ID>
+<!--557BFB777B164892BB8BC97772EEA71A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--557BFB777B164892BB8BC97772EEA71A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--557BFB777B164892BB8BC97772EEA71A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--557BFB777B164892BB8BC97772EEA71A-->  <VALUE><![CDATA[OBUIAPP_DisableLinkedItemsSection]]></VALUE>
+<!--557BFB777B164892BB8BC97772EEA71A-->  <NAME><![CDATA[Disable Linked Items Section]]></NAME>
+<!--557BFB777B164892BB8BC97772EEA71A-->  <DESCRIPTION><![CDATA[This property allows to disable the Linked Items section]]></DESCRIPTION>
+<!--557BFB777B164892BB8BC97772EEA71A-->  <AD_REFERENCE_ID><![CDATA[A26BA480E2014707B47257024C3CBFF7]]></AD_REFERENCE_ID>
+<!--557BFB777B164892BB8BC97772EEA71A-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--557BFB777B164892BB8BC97772EEA71A--></AD_REF_LIST>
+
 <!--57A4B4D636954DF88444CAD72B20598B--><AD_REF_LIST>
 <!--57A4B4D636954DF88444CAD72B20598B-->  <AD_REF_LIST_ID><![CDATA[57A4B4D636954DF88444CAD72B20598B]]></AD_REF_LIST_ID>
 <!--57A4B4D636954DF88444CAD72B20598B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -6,7 +6,7 @@
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <NAME><![CDATA[HTML Widget]]></NAME>
-<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.30440]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.31087]]></VERSION>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <DESCRIPTION><![CDATA[Provides the HTML Widget superclass that allows to create widget classes that embed the html code.]]></DESCRIPTION>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <HELP><![CDATA[With this module you can define your own widget classes just setting up your own html code or the html code provided by third parties.]]></HELP>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <URL><![CDATA[http://forge.openbravo.com/projects/htmlwidget]]></URL>
@@ -21,7 +21,7 @@
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION_LABEL><![CDATA[PR16Q4]]></VERSION_LABEL>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION_LABEL><![CDATA[PR17Q1]]></VERSION_LABEL>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--D393BE6F22BB44B7B728259B34FC795A--></AD_MODULE>
--- a/model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -7,7 +7,7 @@
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <AD_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_MODULE_ID>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.30440]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.31087]]></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/model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -6,7 +6,7 @@
 <!--4B828F4D03264080AA1D2057B13F613C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <NAME><![CDATA[User Interface Client Kernel]]></NAME>
-<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.30440]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.31087]]></VERSION>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <DESCRIPTION><![CDATA[Provides framework functionality for the Openbravo User Interface]]></DESCRIPTION>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <HELP><![CDATA[The user interface client kernel is a generation framework for generating client (browser) components used in Openbravo. Its components are mainly used by other modules to provide customizable and extendable user interfaces.]]></HELP>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravoclientkernel]]></URL>
@@ -22,7 +22,7 @@
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <UPDATEINFO><![CDATA[Bug fix for issue 15289]]></UPDATEINFO>
-<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION_LABEL><![CDATA[PR16Q4]]></VERSION_LABEL>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION_LABEL><![CDATA[PR17Q1]]></VERSION_LABEL>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--4B828F4D03264080AA1D2057B13F613C--></AD_MODULE>
--- a/model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -7,7 +7,7 @@
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.30440]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.31087]]></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.30440]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.31087]]></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.30440]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.31087]]></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/model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -6,7 +6,7 @@
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <NAME><![CDATA[Workspace & Widgets]]></NAME>
-<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.30440]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.31087]]></VERSION>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <DESCRIPTION><![CDATA[Workspace & Widgets]]></DESCRIPTION>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <HELP><![CDATA[Provides the infrastructure of workspace tab (formerly My Openbravo)]]></HELP>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <URL><![CDATA[http://forge.openbravo.com/projects/myopenbravo]]></URL>
@@ -23,7 +23,7 @@
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <UPDATEINFO><![CDATA[Styling bugfixing]]></UPDATEINFO>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <REFERENCEDATAINFO><![CDATA[Provides the infrastructure of workspace tab]]></REFERENCEDATAINFO>
-<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION_LABEL><![CDATA[PR16Q4]]></VERSION_LABEL>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION_LABEL><![CDATA[PR17Q1]]></VERSION_LABEL>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--2758CD25B2704AF6BBAD10365FC82C06--></AD_MODULE>
--- a/model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -7,7 +7,7 @@
 <!--15F51F03882F444CAB6593B4566DC929-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--15F51F03882F444CAB6593B4566DC929-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--15F51F03882F444CAB6593B4566DC929-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.30440]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.31087]]></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.30440]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.31087]]></STARTVERSION>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -6,7 +6,7 @@
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <NAME><![CDATA[Query/List Widget]]></NAME>
-<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.30440]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.31087]]></VERSION>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <DESCRIPTION><![CDATA[Provides the Query/List superclass widget that allows to create widget classes that prints a grid of data based on a query.]]></DESCRIPTION>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <HELP><![CDATA[With this module you can define your own widget classes that just with simple Application Dictionary shows a grid of data based on a HQL Query.]]></HELP>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <URL><![CDATA[http://forge.openbravo.com/projects/querylistwidget]]></URL>
@@ -21,7 +21,7 @@
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION_LABEL><![CDATA[PR16Q4]]></VERSION_LABEL>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION_LABEL><![CDATA[PR17Q1]]></VERSION_LABEL>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC--></AD_MODULE>
--- a/model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -7,7 +7,7 @@
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--26558497C31140BFAB067BA4BC47D799-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
 <!--26558497C31140BFAB067BA4BC47D799-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.30440]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.31087]]></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/model/modules/org.openbravo.client.widgets/src-db/database/model/views/OBWCL_STOCK_BY_WAREHOUSE_V.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+  <database name="VIEW OBWCL_STOCK_BY_WAREHOUSE_V">
+    <view name="OBWCL_STOCK_BY_WAREHOUSE_V"><![CDATA[SELECT sd.m_product_id || sd.m_storage_detail_id AS obwcl_stock_by_warehouse_v_id, p.ad_client_id, p.isactive, p.created, p.createdby, p.updated, p.updatedby, o.ad_org_id, o.name AS orgname, w.m_warehouse_id, w.name AS warehousename, p.m_product_id, p.value, p.name AS productname, pc.m_product_category_id, pc.name AS categoryname, u.name AS uomname, sd.description, sd.qtyonhand FROM (SELECT max(sd_1.m_storage_detail_id) AS m_storage_detail_id, sd_1.m_product_id, sd_1.c_uom_id, l.m_warehouse_id, a.description, sum(sd_1.qtyonhand) AS qtyonhand FROM m_storage_detail sd_1 JOIN m_locator l ON sd_1.m_locator_id = l.m_locator_id JOIN m_attributesetinstance a ON sd_1.m_attributesetinstance_id = a.m_attributesetinstance_id WHERE COALESCE(sd_1.qtyonhand, 0) <> 0 OR COALESCE(sd_1.qtyorderonhand, 0) <> 0 GROUP BY sd_1.m_product_id, sd_1.c_uom_id, l.m_warehouse_id, a.description HAVING sum(sd_1.qtyonhand) <> 0 OR sum(sd_1.qtyorderonhand) <> 0) sd JOIN m_product p ON sd.m_product_id = p.m_product_id JOIN m_product_category pc ON p.m_product_category_id = pc.m_product_category_id JOIN m_warehouse w ON sd.m_warehouse_id = w.m_warehouse_id JOIN ad_org o ON w.ad_org_id = o.ad_org_id JOIN c_uom u ON sd.c_uom_id = u.c_uom_id WHERE p.isactive = 'Y' AND p.isstocked = 'Y']]></view>
+  </database>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_COLUMN.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -0,0 +1,719 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<data>
+<!--06D974D658C2455FB61B719781A2B637--><AD_COLUMN>
+<!--06D974D658C2455FB61B719781A2B637-->  <AD_COLUMN_ID><![CDATA[06D974D658C2455FB61B719781A2B637]]></AD_COLUMN_ID>
+<!--06D974D658C2455FB61B719781A2B637-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--06D974D658C2455FB61B719781A2B637-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--06D974D658C2455FB61B719781A2B637-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--06D974D658C2455FB61B719781A2B637-->  <NAME><![CDATA[Client]]></NAME>
+<!--06D974D658C2455FB61B719781A2B637-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--06D974D658C2455FB61B719781A2B637-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--06D974D658C2455FB61B719781A2B637-->  <COLUMNNAME><![CDATA[AD_Client_ID]]></COLUMNNAME>
+<!--06D974D658C2455FB61B719781A2B637-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--06D974D658C2455FB61B719781A2B637-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--06D974D658C2455FB61B719781A2B637-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--06D974D658C2455FB61B719781A2B637-->  <DEFAULTVALUE><![CDATA[@AD_CLIENT_ID@]]></DEFAULTVALUE>
+<!--06D974D658C2455FB61B719781A2B637-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--06D974D658C2455FB61B719781A2B637-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--06D974D658C2455FB61B719781A2B637-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--06D974D658C2455FB61B719781A2B637-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--06D974D658C2455FB61B719781A2B637-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--06D974D658C2455FB61B719781A2B637-->  <SEQNO><![CDATA[140]]></SEQNO>
+<!--06D974D658C2455FB61B719781A2B637-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--06D974D658C2455FB61B719781A2B637-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--06D974D658C2455FB61B719781A2B637-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--06D974D658C2455FB61B719781A2B637-->  <AD_ELEMENT_ID><![CDATA[102]]></AD_ELEMENT_ID>
+<!--06D974D658C2455FB61B719781A2B637-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--06D974D658C2455FB61B719781A2B637-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--06D974D658C2455FB61B719781A2B637-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--06D974D658C2455FB61B719781A2B637-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--06D974D658C2455FB61B719781A2B637-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--06D974D658C2455FB61B719781A2B637-->  <POSITION><![CDATA[14]]></POSITION>
+<!--06D974D658C2455FB61B719781A2B637-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--06D974D658C2455FB61B719781A2B637-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--06D974D658C2455FB61B719781A2B637-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--06D974D658C2455FB61B719781A2B637-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--06D974D658C2455FB61B719781A2B637-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--06D974D658C2455FB61B719781A2B637-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--06D974D658C2455FB61B719781A2B637-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--06D974D658C2455FB61B719781A2B637-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--06D974D658C2455FB61B719781A2B637--></AD_COLUMN>
+
+<!--06DDA74009444320B5CB67B3DE99E1FE--><AD_COLUMN>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <AD_COLUMN_ID><![CDATA[06DDA74009444320B5CB67B3DE99E1FE]]></AD_COLUMN_ID>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <NAME><![CDATA[Product Category]]></NAME>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <DESCRIPTION><![CDATA[A classification of items based on similar characteristics or attributes.]]></DESCRIPTION>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <HELP><![CDATA[Identifies the category which this product belongs to.  Product categories are used for pricing.]]></HELP>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <COLUMNNAME><![CDATA[M_Product_Category_ID]]></COLUMNNAME>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <SEQNO><![CDATA[90]]></SEQNO>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <AD_ELEMENT_ID><![CDATA[453]]></AD_ELEMENT_ID>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <POSITION><![CDATA[9]]></POSITION>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--06DDA74009444320B5CB67B3DE99E1FE-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--06DDA74009444320B5CB67B3DE99E1FE--></AD_COLUMN>
+
+<!--0FE9B55261314ACEB7235297818D5B41--><AD_COLUMN>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <AD_COLUMN_ID><![CDATA[0FE9B55261314ACEB7235297818D5B41]]></AD_COLUMN_ID>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <NAME><![CDATA[Search Key]]></NAME>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <DESCRIPTION><![CDATA[A fast method for finding a particular record.]]></DESCRIPTION>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <HELP><![CDATA[A search key allows for a fast method of finding a particular record. If you leave the search key empty, the system automatically creates a numeric number originating from a document sequence defined in the  "Document Sequence" window. The sequence naming convention follows a rule "DocumentNo_TableName", where TableName is the actual name of the database table (e.g. C_Order).
+
+Usually, company's internal identifiers for various records (products, customers, etc) are stored here.]]></HELP>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <COLUMNNAME><![CDATA[Value]]></COLUMNNAME>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <FIELDLENGTH><![CDATA[40]]></FIELDLENGTH>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <AD_ELEMENT_ID><![CDATA[620]]></AD_ELEMENT_ID>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <POSITION><![CDATA[5]]></POSITION>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--0FE9B55261314ACEB7235297818D5B41-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--0FE9B55261314ACEB7235297818D5B41--></AD_COLUMN>
+
+<!--13D633E6F18B4240B912581876AAF521--><AD_COLUMN>
+<!--13D633E6F18B4240B912581876AAF521-->  <AD_COLUMN_ID><![CDATA[13D633E6F18B4240B912581876AAF521]]></AD_COLUMN_ID>
+<!--13D633E6F18B4240B912581876AAF521-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--13D633E6F18B4240B912581876AAF521-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--13D633E6F18B4240B912581876AAF521-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--13D633E6F18B4240B912581876AAF521-->  <NAME><![CDATA[Updated By]]></NAME>
+<!--13D633E6F18B4240B912581876AAF521-->  <DESCRIPTION><![CDATA[User who updated this records]]></DESCRIPTION>
+<!--13D633E6F18B4240B912581876AAF521-->  <HELP><![CDATA[The Updated By field indicates the user who updated this record.]]></HELP>
+<!--13D633E6F18B4240B912581876AAF521-->  <COLUMNNAME><![CDATA[Updatedby]]></COLUMNNAME>
+<!--13D633E6F18B4240B912581876AAF521-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--13D633E6F18B4240B912581876AAF521-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--13D633E6F18B4240B912581876AAF521-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--13D633E6F18B4240B912581876AAF521-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--13D633E6F18B4240B912581876AAF521-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--13D633E6F18B4240B912581876AAF521-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--13D633E6F18B4240B912581876AAF521-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--13D633E6F18B4240B912581876AAF521-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--13D633E6F18B4240B912581876AAF521-->  <SEQNO><![CDATA[190]]></SEQNO>
+<!--13D633E6F18B4240B912581876AAF521-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--13D633E6F18B4240B912581876AAF521-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--13D633E6F18B4240B912581876AAF521-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--13D633E6F18B4240B912581876AAF521-->  <AD_ELEMENT_ID><![CDATA[608]]></AD_ELEMENT_ID>
+<!--13D633E6F18B4240B912581876AAF521-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--13D633E6F18B4240B912581876AAF521-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--13D633E6F18B4240B912581876AAF521-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--13D633E6F18B4240B912581876AAF521-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--13D633E6F18B4240B912581876AAF521-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--13D633E6F18B4240B912581876AAF521-->  <POSITION><![CDATA[19]]></POSITION>
+<!--13D633E6F18B4240B912581876AAF521-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--13D633E6F18B4240B912581876AAF521-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--13D633E6F18B4240B912581876AAF521-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--13D633E6F18B4240B912581876AAF521-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--13D633E6F18B4240B912581876AAF521-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--13D633E6F18B4240B912581876AAF521-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--13D633E6F18B4240B912581876AAF521-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--13D633E6F18B4240B912581876AAF521-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--13D633E6F18B4240B912581876AAF521--></AD_COLUMN>
+
+<!--21B675B173D34598B4E21FFC80531EF7--><AD_COLUMN>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <AD_COLUMN_ID><![CDATA[21B675B173D34598B4E21FFC80531EF7]]></AD_COLUMN_ID>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <NAME><![CDATA[Quantity on Hand]]></NAME>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <DESCRIPTION><![CDATA[On Hand Quantity]]></DESCRIPTION>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <HELP><![CDATA[The On Hand Quantity indicates the quantity of a product that is on hand in a warehouse.]]></HELP>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <COLUMNNAME><![CDATA[Qtyonhand]]></COLUMNNAME>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <AD_REFERENCE_ID><![CDATA[29]]></AD_REFERENCE_ID>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <AD_ELEMENT_ID><![CDATA[530]]></AD_ELEMENT_ID>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <POSITION><![CDATA[11]]></POSITION>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--21B675B173D34598B4E21FFC80531EF7-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--21B675B173D34598B4E21FFC80531EF7--></AD_COLUMN>
+
+<!--2A299D4DCE1043529CFBFC933DA2A4FD--><AD_COLUMN>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <AD_COLUMN_ID><![CDATA[2A299D4DCE1043529CFBFC933DA2A4FD]]></AD_COLUMN_ID>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <NAME><![CDATA[Warehouse Name]]></NAME>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <COLUMNNAME><![CDATA[Warehousename]]></COLUMNNAME>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <AD_ELEMENT_ID><![CDATA[83F192931C7142E7872BFE1428EE5C66]]></AD_ELEMENT_ID>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <POSITION><![CDATA[3]]></POSITION>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--2A299D4DCE1043529CFBFC933DA2A4FD--></AD_COLUMN>
+
+<!--39C7E523BBED43C5846CCE4F5AB02739--><AD_COLUMN>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <AD_COLUMN_ID><![CDATA[39C7E523BBED43C5846CCE4F5AB02739]]></AD_COLUMN_ID>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <NAME><![CDATA[Product Name]]></NAME>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <COLUMNNAME><![CDATA[Productname]]></COLUMNNAME>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <AD_ELEMENT_ID><![CDATA[C30C07EF67E648AB9DDCA74E8449B866]]></AD_ELEMENT_ID>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <POSITION><![CDATA[6]]></POSITION>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--39C7E523BBED43C5846CCE4F5AB02739-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--39C7E523BBED43C5846CCE4F5AB02739--></AD_COLUMN>
+
+<!--54916FD9A1EC4090B2E6877E1A78B968--><AD_COLUMN>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <AD_COLUMN_ID><![CDATA[54916FD9A1EC4090B2E6877E1A78B968]]></AD_COLUMN_ID>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <NAME><![CDATA[Description]]></NAME>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <DESCRIPTION><![CDATA[A space to write additional related information.]]></DESCRIPTION>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <HELP><![CDATA[A description is limited to 255 characters.]]></HELP>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <COLUMNNAME><![CDATA[Description]]></COLUMNNAME>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <FIELDLENGTH><![CDATA[255]]></FIELDLENGTH>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <SEQNO><![CDATA[120]]></SEQNO>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <AD_ELEMENT_ID><![CDATA[275]]></AD_ELEMENT_ID>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <POSITION><![CDATA[12]]></POSITION>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--54916FD9A1EC4090B2E6877E1A78B968-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--54916FD9A1EC4090B2E6877E1A78B968--></AD_COLUMN>
+
+<!--6117F7BC72F946E6A1D628381E7D7245--><AD_COLUMN>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <AD_COLUMN_ID><![CDATA[6117F7BC72F946E6A1D628381E7D7245]]></AD_COLUMN_ID>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <NAME><![CDATA[Created By]]></NAME>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <DESCRIPTION><![CDATA[User who created this records]]></DESCRIPTION>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <HELP><![CDATA[The Created By field indicates the user who created this record.]]></HELP>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <COLUMNNAME><![CDATA[Createdby]]></COLUMNNAME>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <SEQNO><![CDATA[170]]></SEQNO>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <AD_ELEMENT_ID><![CDATA[246]]></AD_ELEMENT_ID>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <POSITION><![CDATA[17]]></POSITION>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--6117F7BC72F946E6A1D628381E7D7245-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--6117F7BC72F946E6A1D628381E7D7245--></AD_COLUMN>
+
+<!--64F5D19FD3A84FE984B4E2879700FFA0--><AD_COLUMN>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <AD_COLUMN_ID><![CDATA[64F5D19FD3A84FE984B4E2879700FFA0]]></AD_COLUMN_ID>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <NAME><![CDATA[Updated]]></NAME>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <SEQNO><![CDATA[180]]></SEQNO>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <AD_ELEMENT_ID><![CDATA[607]]></AD_ELEMENT_ID>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <POSITION><![CDATA[18]]></POSITION>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--64F5D19FD3A84FE984B4E2879700FFA0-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--64F5D19FD3A84FE984B4E2879700FFA0--></AD_COLUMN>
+
+<!--744A1539F3544FA09AD8E6118D0247C4--><AD_COLUMN>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <AD_COLUMN_ID><![CDATA[744A1539F3544FA09AD8E6118D0247C4]]></AD_COLUMN_ID>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <NAME><![CDATA[Product Category Name]]></NAME>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <COLUMNNAME><![CDATA[Categoryname]]></COLUMNNAME>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <AD_ELEMENT_ID><![CDATA[FD26CDBF9E664164AA0E5DA365F44F44]]></AD_ELEMENT_ID>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <POSITION><![CDATA[8]]></POSITION>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--744A1539F3544FA09AD8E6118D0247C4-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--744A1539F3544FA09AD8E6118D0247C4--></AD_COLUMN>
+
+<!--91F12EFDBB0041268CB300DC098DF148--><AD_COLUMN>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <AD_COLUMN_ID><![CDATA[91F12EFDBB0041268CB300DC098DF148]]></AD_COLUMN_ID>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <NAME><![CDATA[Warehouse]]></NAME>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <DESCRIPTION><![CDATA[The location where products arrive to or are sent from.]]></DESCRIPTION>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <HELP><![CDATA[The Warehouse identifies a unique Warehouse where products are stored or Services are provided.]]></HELP>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <COLUMNNAME><![CDATA[M_Warehouse_ID]]></COLUMNNAME>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <SEQNO><![CDATA[130]]></SEQNO>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <AD_ELEMENT_ID><![CDATA[459]]></AD_ELEMENT_ID>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <POSITION><![CDATA[13]]></POSITION>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--91F12EFDBB0041268CB300DC098DF148-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--91F12EFDBB0041268CB300DC098DF148--></AD_COLUMN>
+
+<!--9D7286015DBD48FEAE695D83265CFEBA--><AD_COLUMN>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <AD_COLUMN_ID><![CDATA[9D7286015DBD48FEAE695D83265CFEBA]]></AD_COLUMN_ID>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <NAME><![CDATA[Orgname]]></NAME>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <COLUMNNAME><![CDATA[Orgname]]></COLUMNNAME>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <AD_ELEMENT_ID><![CDATA[4DD6EF0E4F104300975B5B49ABCB3484]]></AD_ELEMENT_ID>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <POSITION><![CDATA[2]]></POSITION>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--9D7286015DBD48FEAE695D83265CFEBA-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--9D7286015DBD48FEAE695D83265CFEBA--></AD_COLUMN>
+
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2--><AD_COLUMN>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <AD_COLUMN_ID><![CDATA[A6EB6CB9E7384043B0B65D7094CD4CC2]]></AD_COLUMN_ID>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <NAME><![CDATA[Creation Date]]></NAME>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <DESCRIPTION><![CDATA[The date that this record is completed.]]></DESCRIPTION>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <HELP><![CDATA[The Created field indicates the date that this record was created.]]></HELP>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <COLUMNNAME><![CDATA[Created]]></COLUMNNAME>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <SEQNO><![CDATA[160]]></SEQNO>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <AD_ELEMENT_ID><![CDATA[245]]></AD_ELEMENT_ID>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <POSITION><![CDATA[16]]></POSITION>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--A6EB6CB9E7384043B0B65D7094CD4CC2--></AD_COLUMN>
+
+<!--AEC8374FCF604585B9D944C5921E69DF--><AD_COLUMN>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <AD_COLUMN_ID><![CDATA[AEC8374FCF604585B9D944C5921E69DF]]></AD_COLUMN_ID>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <NAME><![CDATA[Active]]></NAME>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <HELP><![CDATA[There are two methods of making records unavailable in the system: One is to delete the record, the other is to de-activate the record. A de-activated record is not available for selection, but available for reporting. There are two reasons for de-activating and not deleting records: 
+(1) The system requires the record for auditing purposes.
+(2) The record is referenced by other records. E.g., you cannot delete a Business Partner, if there are existing invoices for it. By de-activating the Business Partner you prevent it from being used in future transactions.]]></HELP>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <COLUMNNAME><![CDATA[Isactive]]></COLUMNNAME>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <SEQNO><![CDATA[150]]></SEQNO>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <AD_ELEMENT_ID><![CDATA[348]]></AD_ELEMENT_ID>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <POSITION><![CDATA[15]]></POSITION>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--AEC8374FCF604585B9D944C5921E69DF-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--AEC8374FCF604585B9D944C5921E69DF--></AD_COLUMN>
+
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5--><AD_COLUMN>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <AD_COLUMN_ID><![CDATA[BCEF7EAA55144BF6A83BC4D76AD64CD5]]></AD_COLUMN_ID>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <NAME><![CDATA[Organization]]></NAME>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <DEFAULTVALUE><![CDATA[@AD_ORG_ID@]]></DEFAULTVALUE>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <POSITION><![CDATA[4]]></POSITION>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--BCEF7EAA55144BF6A83BC4D76AD64CD5--></AD_COLUMN>
+
+<!--C7BEA57889594B81A8388FF58B8FED62--><AD_COLUMN>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <AD_COLUMN_ID><![CDATA[C7BEA57889594B81A8388FF58B8FED62]]></AD_COLUMN_ID>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <NAME><![CDATA[Stock By Warehouse View]]></NAME>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <COLUMNNAME><![CDATA[Obwcl_Stock_By_Warehouse_V_ID]]></COLUMNNAME>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <FIELDLENGTH><![CDATA[64]]></FIELDLENGTH>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ISKEY><![CDATA[Y]]></ISKEY>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <SEQNO><![CDATA[200]]></SEQNO>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <AD_ELEMENT_ID><![CDATA[A6C7103ED87049F3B87CC96C05F56722]]></AD_ELEMENT_ID>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--C7BEA57889594B81A8388FF58B8FED62-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--C7BEA57889594B81A8388FF58B8FED62--></AD_COLUMN>
+
+<!--C9B0AC9139444AB599AABF5E762D27E8--><AD_COLUMN>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <AD_COLUMN_ID><![CDATA[C9B0AC9139444AB599AABF5E762D27E8]]></AD_COLUMN_ID>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <NAME><![CDATA[UOM Name]]></NAME>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <COLUMNNAME><![CDATA[Uomname]]></COLUMNNAME>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <SEQNO><![CDATA[100]]></SEQNO>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <AD_ELEMENT_ID><![CDATA[7C0B2441091D498A8B7885FEE83F38DF]]></AD_ELEMENT_ID>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <POSITION><![CDATA[10]]></POSITION>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--C9B0AC9139444AB599AABF5E762D27E8-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--C9B0AC9139444AB599AABF5E762D27E8--></AD_COLUMN>
+
+<!--CBDDD2456D1743C6AB544BBA2478091C--><AD_COLUMN>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <AD_COLUMN_ID><![CDATA[CBDDD2456D1743C6AB544BBA2478091C]]></AD_COLUMN_ID>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <NAME><![CDATA[Product]]></NAME>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <DESCRIPTION><![CDATA[An item produced by a process.]]></DESCRIPTION>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <HELP><![CDATA[Identifies an item which is either purchased or sold in this organization.]]></HELP>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <COLUMNNAME><![CDATA[M_Product_ID]]></COLUMNNAME>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <AD_REFERENCE_VALUE_ID><![CDATA[800060]]></AD_REFERENCE_VALUE_ID>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <AD_ELEMENT_ID><![CDATA[454]]></AD_ELEMENT_ID>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <POSITION><![CDATA[7]]></POSITION>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--CBDDD2456D1743C6AB544BBA2478091C-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--CBDDD2456D1743C6AB544BBA2478091C--></AD_COLUMN>
+
+</data>
--- a/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_ELEMENT.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_ELEMENT.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -12,6 +12,42 @@
 <!--32873C7A39ED464F9D781AB4BE08323B-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--32873C7A39ED464F9D781AB4BE08323B--></AD_ELEMENT>
 
+<!--4DD6EF0E4F104300975B5B49ABCB3484--><AD_ELEMENT>
+<!--4DD6EF0E4F104300975B5B49ABCB3484-->  <AD_ELEMENT_ID><![CDATA[4DD6EF0E4F104300975B5B49ABCB3484]]></AD_ELEMENT_ID>
+<!--4DD6EF0E4F104300975B5B49ABCB3484-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4DD6EF0E4F104300975B5B49ABCB3484-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4DD6EF0E4F104300975B5B49ABCB3484-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4DD6EF0E4F104300975B5B49ABCB3484-->  <COLUMNNAME><![CDATA[Orgname]]></COLUMNNAME>
+<!--4DD6EF0E4F104300975B5B49ABCB3484-->  <NAME><![CDATA[Orgname]]></NAME>
+<!--4DD6EF0E4F104300975B5B49ABCB3484-->  <PRINTNAME><![CDATA[Orgname]]></PRINTNAME>
+<!--4DD6EF0E4F104300975B5B49ABCB3484-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--4DD6EF0E4F104300975B5B49ABCB3484-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--4DD6EF0E4F104300975B5B49ABCB3484--></AD_ELEMENT>
+
+<!--7C0B2441091D498A8B7885FEE83F38DF--><AD_ELEMENT>
+<!--7C0B2441091D498A8B7885FEE83F38DF-->  <AD_ELEMENT_ID><![CDATA[7C0B2441091D498A8B7885FEE83F38DF]]></AD_ELEMENT_ID>
+<!--7C0B2441091D498A8B7885FEE83F38DF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7C0B2441091D498A8B7885FEE83F38DF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7C0B2441091D498A8B7885FEE83F38DF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7C0B2441091D498A8B7885FEE83F38DF-->  <COLUMNNAME><![CDATA[Uomname]]></COLUMNNAME>
+<!--7C0B2441091D498A8B7885FEE83F38DF-->  <NAME><![CDATA[UOM Name]]></NAME>
+<!--7C0B2441091D498A8B7885FEE83F38DF-->  <PRINTNAME><![CDATA[UOM Name]]></PRINTNAME>
+<!--7C0B2441091D498A8B7885FEE83F38DF-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--7C0B2441091D498A8B7885FEE83F38DF-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--7C0B2441091D498A8B7885FEE83F38DF--></AD_ELEMENT>
+
+<!--83F192931C7142E7872BFE1428EE5C66--><AD_ELEMENT>
+<!--83F192931C7142E7872BFE1428EE5C66-->  <AD_ELEMENT_ID><![CDATA[83F192931C7142E7872BFE1428EE5C66]]></AD_ELEMENT_ID>
+<!--83F192931C7142E7872BFE1428EE5C66-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--83F192931C7142E7872BFE1428EE5C66-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--83F192931C7142E7872BFE1428EE5C66-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--83F192931C7142E7872BFE1428EE5C66-->  <COLUMNNAME><![CDATA[Warehousename]]></COLUMNNAME>
+<!--83F192931C7142E7872BFE1428EE5C66-->  <NAME><![CDATA[Warehouse Name]]></NAME>
+<!--83F192931C7142E7872BFE1428EE5C66-->  <PRINTNAME><![CDATA[Warehouse Name]]></PRINTNAME>
+<!--83F192931C7142E7872BFE1428EE5C66-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--83F192931C7142E7872BFE1428EE5C66-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--83F192931C7142E7872BFE1428EE5C66--></AD_ELEMENT>
+
 <!--9C7735D7BEB33C9EE040A8C0EB06271C--><AD_ELEMENT>
 <!--9C7735D7BEB33C9EE040A8C0EB06271C-->  <AD_ELEMENT_ID><![CDATA[9C7735D7BEB33C9EE040A8C0EB06271C]]></AD_ELEMENT_ID>
 <!--9C7735D7BEB33C9EE040A8C0EB06271C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -122,4 +158,40 @@
 <!--9C7735D7BEC33C9EE040A8C0EB06271C-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9C7735D7BEC33C9EE040A8C0EB06271C--></AD_ELEMENT>
 
+<!--A6C7103ED87049F3B87CC96C05F56722--><AD_ELEMENT>
+<!--A6C7103ED87049F3B87CC96C05F56722-->  <AD_ELEMENT_ID><![CDATA[A6C7103ED87049F3B87CC96C05F56722]]></AD_ELEMENT_ID>
+<!--A6C7103ED87049F3B87CC96C05F56722-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A6C7103ED87049F3B87CC96C05F56722-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A6C7103ED87049F3B87CC96C05F56722-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A6C7103ED87049F3B87CC96C05F56722-->  <COLUMNNAME><![CDATA[Obwcl_Stock_By_Warehouse_V_ID]]></COLUMNNAME>
+<!--A6C7103ED87049F3B87CC96C05F56722-->  <NAME><![CDATA[Stock By Warehouse View]]></NAME>
+<!--A6C7103ED87049F3B87CC96C05F56722-->  <PRINTNAME><![CDATA[Stock By Warehouse View]]></PRINTNAME>
+<!--A6C7103ED87049F3B87CC96C05F56722-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--A6C7103ED87049F3B87CC96C05F56722-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--A6C7103ED87049F3B87CC96C05F56722--></AD_ELEMENT>
+
+<!--C30C07EF67E648AB9DDCA74E8449B866--><AD_ELEMENT>
+<!--C30C07EF67E648AB9DDCA74E8449B866-->  <AD_ELEMENT_ID><![CDATA[C30C07EF67E648AB9DDCA74E8449B866]]></AD_ELEMENT_ID>
+<!--C30C07EF67E648AB9DDCA74E8449B866-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C30C07EF67E648AB9DDCA74E8449B866-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C30C07EF67E648AB9DDCA74E8449B866-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C30C07EF67E648AB9DDCA74E8449B866-->  <COLUMNNAME><![CDATA[Productname]]></COLUMNNAME>
+<!--C30C07EF67E648AB9DDCA74E8449B866-->  <NAME><![CDATA[Product Name]]></NAME>
+<!--C30C07EF67E648AB9DDCA74E8449B866-->  <PRINTNAME><![CDATA[Product Name]]></PRINTNAME>
+<!--C30C07EF67E648AB9DDCA74E8449B866-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--C30C07EF67E648AB9DDCA74E8449B866-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--C30C07EF67E648AB9DDCA74E8449B866--></AD_ELEMENT>
+
+<!--FD26CDBF9E664164AA0E5DA365F44F44--><AD_ELEMENT>
+<!--FD26CDBF9E664164AA0E5DA365F44F44-->  <AD_ELEMENT_ID><![CDATA[FD26CDBF9E664164AA0E5DA365F44F44]]></AD_ELEMENT_ID>
+<!--FD26CDBF9E664164AA0E5DA365F44F44-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FD26CDBF9E664164AA0E5DA365F44F44-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FD26CDBF9E664164AA0E5DA365F44F44-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FD26CDBF9E664164AA0E5DA365F44F44-->  <COLUMNNAME><![CDATA[Categoryname]]></COLUMNNAME>
+<!--FD26CDBF9E664164AA0E5DA365F44F44-->  <NAME><![CDATA[Product Category Name]]></NAME>
+<!--FD26CDBF9E664164AA0E5DA365F44F44-->  <PRINTNAME><![CDATA[Product Category Name]]></PRINTNAME>
+<!--FD26CDBF9E664164AA0E5DA365F44F44-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--FD26CDBF9E664164AA0E5DA365F44F44-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--FD26CDBF9E664164AA0E5DA365F44F44--></AD_ELEMENT>
+
 </data>
--- a/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -6,7 +6,7 @@
 <!--FF8080812D842086012D844F3CC0003E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080812D842086012D844F3CC0003E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080812D842086012D844F3CC0003E-->  <NAME><![CDATA[Widgets Collection]]></NAME>
-<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.30440]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.31087]]></VERSION>
 <!--FF8080812D842086012D844F3CC0003E-->  <DESCRIPTION><![CDATA[Collection of Workspace Widgets]]></DESCRIPTION>
 <!--FF8080812D842086012D844F3CC0003E-->  <HELP><![CDATA[Collection of Workspace Widgets]]></HELP>
 <!--FF8080812D842086012D844F3CC0003E-->  <URL><![CDATA[http://forge.openbravo.com/projects/widgetscollection]]></URL>
@@ -22,7 +22,7 @@
 <!--FF8080812D842086012D844F3CC0003E-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--FF8080812D842086012D844F3CC0003E-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--FF8080812D842086012D844F3CC0003E-->  <UPDATEINFO><![CDATA[Added Currency Converter. Added Google Docs]]></UPDATEINFO>
-<!--FF8080812D842086012D844F3CC0003E-->  <VERSION_LABEL><![CDATA[PR16Q4]]></VERSION_LABEL>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION_LABEL><![CDATA[PR17Q1]]></VERSION_LABEL>
 <!--FF8080812D842086012D844F3CC0003E-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--FF8080812D842086012D844F3CC0003E-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--FF8080812D842086012D844F3CC0003E--></AD_MODULE>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DBPREFIX.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<data>
+<!--DDD987A4FCC3430F9E8DE9DCF06EFA45--><AD_MODULE_DBPREFIX>
+<!--DDD987A4FCC3430F9E8DE9DCF06EFA45-->  <AD_MODULE_DBPREFIX_ID><![CDATA[DDD987A4FCC3430F9E8DE9DCF06EFA45]]></AD_MODULE_DBPREFIX_ID>
+<!--DDD987A4FCC3430F9E8DE9DCF06EFA45-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DDD987A4FCC3430F9E8DE9DCF06EFA45-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DDD987A4FCC3430F9E8DE9DCF06EFA45-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DDD987A4FCC3430F9E8DE9DCF06EFA45-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--DDD987A4FCC3430F9E8DE9DCF06EFA45-->  <NAME><![CDATA[OBWCL]]></NAME>
+<!--DDD987A4FCC3430F9E8DE9DCF06EFA45--></AD_MODULE_DBPREFIX>
+
+</data>
--- a/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -7,7 +7,7 @@
 <!--FF8080812D842086012D845002070046-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080812D842086012D845002070046-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
 <!--FF8080812D842086012D845002070046-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.30440]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.31087]]></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/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_PACKAGE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<data>
+<!--FEEE36C196994F6CAFC1B81C905B07B2--><AD_PACKAGE>
+<!--FEEE36C196994F6CAFC1B81C905B07B2-->  <AD_PACKAGE_ID><![CDATA[FEEE36C196994F6CAFC1B81C905B07B2]]></AD_PACKAGE_ID>
+<!--FEEE36C196994F6CAFC1B81C905B07B2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FEEE36C196994F6CAFC1B81C905B07B2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FEEE36C196994F6CAFC1B81C905B07B2-->  <NAME><![CDATA[org.openbravo.client.widgets]]></NAME>
+<!--FEEE36C196994F6CAFC1B81C905B07B2-->  <JAVAPACKAGE><![CDATA[org.openbravo.client.widgets]]></JAVAPACKAGE>
+<!--FEEE36C196994F6CAFC1B81C905B07B2-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--FEEE36C196994F6CAFC1B81C905B07B2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FEEE36C196994F6CAFC1B81C905B07B2--></AD_PACKAGE>
+
+</data>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_TABLE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<data>
+<!--8729F059389F45EAA096F2CB9C36CC65--><AD_TABLE>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <AD_TABLE_ID><![CDATA[8729F059389F45EAA096F2CB9C36CC65]]></AD_TABLE_ID>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <NAME><![CDATA[OBWCL_StockByWarehouseView]]></NAME>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <TABLENAME><![CDATA[OBWCL_Stock_By_Warehouse_V]]></TABLENAME>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <CLASSNAME><![CDATA[OBWCL_StockByWarehouseView]]></CLASSNAME>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <ISVIEW><![CDATA[Y]]></ISVIEW>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <ISSECURITYENABLED><![CDATA[N]]></ISSECURITYENABLED>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <ISDELETEABLE><![CDATA[N]]></ISDELETEABLE>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <ISHIGHVOLUME><![CDATA[N]]></ISHIGHVOLUME>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <IMPORTTABLE><![CDATA[N]]></IMPORTTABLE>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <ISCHANGELOG><![CDATA[N]]></ISCHANGELOG>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <ISDEFAULTACCT><![CDATA[N]]></ISDEFAULTACCT>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <AD_PACKAGE_ID><![CDATA[FEEE36C196994F6CAFC1B81C905B07B2]]></AD_PACKAGE_ID>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--8729F059389F45EAA096F2CB9C36CC65-->  <ISTREE><![CDATA[N]]></ISTREE>
+<!--8729F059389F45EAA096F2CB9C36CC65--></AD_TABLE>
+
+</data>
--- a/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBCQL_QUERY_COLUMN.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBCQL_QUERY_COLUMN.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -35,6 +35,25 @@
 <!--28F920CD36E14AFBB2025802363E8B02-->  <CAN_BE_FILTERED><![CDATA[N]]></CAN_BE_FILTERED>
 <!--28F920CD36E14AFBB2025802363E8B02--></OBCQL_QUERY_COLUMN>
 
+<!--321C5D48888745C3A042FF005E7375AC--><OBCQL_QUERY_COLUMN>
+<!--321C5D48888745C3A042FF005E7375AC-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[321C5D48888745C3A042FF005E7375AC]]></OBCQL_QUERY_COLUMN_ID>
+<!--321C5D48888745C3A042FF005E7375AC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--321C5D48888745C3A042FF005E7375AC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--321C5D48888745C3A042FF005E7375AC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--321C5D48888745C3A042FF005E7375AC-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[97FD9C124D5D409DB94BB6500A418A60]]></OBCQL_WIDGET_QUERY_ID>
+<!--321C5D48888745C3A042FF005E7375AC-->  <DISPLAY_EXPRESSION><![CDATA[store]]></DISPLAY_EXPRESSION>
+<!--321C5D48888745C3A042FF005E7375AC-->  <NAME><![CDATA[Organization]]></NAME>
+<!--321C5D48888745C3A042FF005E7375AC-->  <WIDTH><![CDATA[10]]></WIDTH>
+<!--321C5D48888745C3A042FF005E7375AC-->  <LINK_EXPRESSION><![CDATA[orgid]]></LINK_EXPRESSION>
+<!--321C5D48888745C3A042FF005E7375AC-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--321C5D48888745C3A042FF005E7375AC-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--321C5D48888745C3A042FF005E7375AC-->  <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
+<!--321C5D48888745C3A042FF005E7375AC-->  <HAS_LINK><![CDATA[Y]]></HAS_LINK>
+<!--321C5D48888745C3A042FF005E7375AC-->  <AD_TAB_ID><![CDATA[143]]></AD_TAB_ID>
+<!--321C5D48888745C3A042FF005E7375AC-->  <CAN_BE_FILTERED><![CDATA[Y]]></CAN_BE_FILTERED>
+<!--321C5D48888745C3A042FF005E7375AC-->  <WHERECLAUSE_LEFT_PART><![CDATA[orgName]]></WHERECLAUSE_LEFT_PART>
+<!--321C5D48888745C3A042FF005E7375AC--></OBCQL_QUERY_COLUMN>
+
 <!--39ECC838BD604F49BA07220A64D855A3--><OBCQL_QUERY_COLUMN>
 <!--39ECC838BD604F49BA07220A64D855A3-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[39ECC838BD604F49BA07220A64D855A3]]></OBCQL_QUERY_COLUMN_ID>
 <!--39ECC838BD604F49BA07220A64D855A3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -68,6 +87,44 @@
 <!--3A8324D4520B42B08DDED26BD05F98B5-->  <CAN_BE_FILTERED><![CDATA[N]]></CAN_BE_FILTERED>
 <!--3A8324D4520B42B08DDED26BD05F98B5--></OBCQL_QUERY_COLUMN>
 
+<!--3DA8615A37CD447EB85FE4B9386E8622--><OBCQL_QUERY_COLUMN>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[3DA8615A37CD447EB85FE4B9386E8622]]></OBCQL_QUERY_COLUMN_ID>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[97FD9C124D5D409DB94BB6500A418A60]]></OBCQL_WIDGET_QUERY_ID>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <DISPLAY_EXPRESSION><![CDATA[category]]></DISPLAY_EXPRESSION>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <NAME><![CDATA[Product Category]]></NAME>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <WIDTH><![CDATA[10]]></WIDTH>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <LINK_EXPRESSION><![CDATA[pcid]]></LINK_EXPRESSION>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <HAS_LINK><![CDATA[Y]]></HAS_LINK>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <AD_TAB_ID><![CDATA[189]]></AD_TAB_ID>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <CAN_BE_FILTERED><![CDATA[Y]]></CAN_BE_FILTERED>
+<!--3DA8615A37CD447EB85FE4B9386E8622-->  <WHERECLAUSE_LEFT_PART><![CDATA[productCategoryName]]></WHERECLAUSE_LEFT_PART>
+<!--3DA8615A37CD447EB85FE4B9386E8622--></OBCQL_QUERY_COLUMN>
+
+<!--5CE9158CF68C406199B5D7E501F0AE0E--><OBCQL_QUERY_COLUMN>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[5CE9158CF68C406199B5D7E501F0AE0E]]></OBCQL_QUERY_COLUMN_ID>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[97FD9C124D5D409DB94BB6500A418A60]]></OBCQL_WIDGET_QUERY_ID>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <DISPLAY_EXPRESSION><![CDATA[warehouse]]></DISPLAY_EXPRESSION>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <NAME><![CDATA[Warehouse]]></NAME>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <WIDTH><![CDATA[10]]></WIDTH>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <LINK_EXPRESSION><![CDATA[whid]]></LINK_EXPRESSION>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <INCLUDE_IN><![CDATA[M]]></INCLUDE_IN>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <HAS_LINK><![CDATA[Y]]></HAS_LINK>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <AD_TAB_ID><![CDATA[178]]></AD_TAB_ID>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <CAN_BE_FILTERED><![CDATA[Y]]></CAN_BE_FILTERED>
+<!--5CE9158CF68C406199B5D7E501F0AE0E-->  <WHERECLAUSE_LEFT_PART><![CDATA[warehouseName]]></WHERECLAUSE_LEFT_PART>
+<!--5CE9158CF68C406199B5D7E501F0AE0E--></OBCQL_QUERY_COLUMN>
+
 <!--7D6F8F4432754AB5872B925CF2BD1E37--><OBCQL_QUERY_COLUMN>
 <!--7D6F8F4432754AB5872B925CF2BD1E37-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[7D6F8F4432754AB5872B925CF2BD1E37]]></OBCQL_QUERY_COLUMN_ID>
 <!--7D6F8F4432754AB5872B925CF2BD1E37-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -242,6 +299,38 @@
 <!--D3C5848B4225429A90B63B888EA5E1C6-->  <CAN_BE_FILTERED><![CDATA[N]]></CAN_BE_FILTERED>
 <!--D3C5848B4225429A90B63B888EA5E1C6--></OBCQL_QUERY_COLUMN>
 
+<!--DA677F18E1234D25850C4016B02CFB45--><OBCQL_QUERY_COLUMN>
+<!--DA677F18E1234D25850C4016B02CFB45-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[DA677F18E1234D25850C4016B02CFB45]]></OBCQL_QUERY_COLUMN_ID>
+<!--DA677F18E1234D25850C4016B02CFB45-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DA677F18E1234D25850C4016B02CFB45-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DA677F18E1234D25850C4016B02CFB45-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DA677F18E1234D25850C4016B02CFB45-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[97FD9C124D5D409DB94BB6500A418A60]]></OBCQL_WIDGET_QUERY_ID>
+<!--DA677F18E1234D25850C4016B02CFB45-->  <DISPLAY_EXPRESSION><![CDATA[qtyonhand]]></DISPLAY_EXPRESSION>
+<!--DA677F18E1234D25850C4016B02CFB45-->  <NAME><![CDATA[Quantity On Hand]]></NAME>
+<!--DA677F18E1234D25850C4016B02CFB45-->  <WIDTH><![CDATA[10]]></WIDTH>
+<!--DA677F18E1234D25850C4016B02CFB45-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--DA677F18E1234D25850C4016B02CFB45-->  <AD_REFERENCE_ID><![CDATA[29]]></AD_REFERENCE_ID>
+<!--DA677F18E1234D25850C4016B02CFB45-->  <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
+<!--DA677F18E1234D25850C4016B02CFB45-->  <HAS_LINK><![CDATA[N]]></HAS_LINK>
+<!--DA677F18E1234D25850C4016B02CFB45-->  <CAN_BE_FILTERED><![CDATA[N]]></CAN_BE_FILTERED>
+<!--DA677F18E1234D25850C4016B02CFB45--></OBCQL_QUERY_COLUMN>
+
+<!--DE3F5D2B067645B6A0F1266BFCB9F821--><OBCQL_QUERY_COLUMN>
+<!--DE3F5D2B067645B6A0F1266BFCB9F821-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[DE3F5D2B067645B6A0F1266BFCB9F821]]></OBCQL_QUERY_COLUMN_ID>
+<!--DE3F5D2B067645B6A0F1266BFCB9F821-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DE3F5D2B067645B6A0F1266BFCB9F821-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DE3F5D2B067645B6A0F1266BFCB9F821-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DE3F5D2B067645B6A0F1266BFCB9F821-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[97FD9C124D5D409DB94BB6500A418A60]]></OBCQL_WIDGET_QUERY_ID>
+<!--DE3F5D2B067645B6A0F1266BFCB9F821-->  <DISPLAY_EXPRESSION><![CDATA[attr]]></DISPLAY_EXPRESSION>
+<!--DE3F5D2B067645B6A0F1266BFCB9F821-->  <NAME><![CDATA[Product Attribute]]></NAME>
+<!--DE3F5D2B067645B6A0F1266BFCB9F821-->  <WIDTH><![CDATA[10]]></WIDTH>
+<!--DE3F5D2B067645B6A0F1266BFCB9F821-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--DE3F5D2B067645B6A0F1266BFCB9F821-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--DE3F5D2B067645B6A0F1266BFCB9F821-->  <INCLUDE_IN><![CDATA[M]]></INCLUDE_IN>
+<!--DE3F5D2B067645B6A0F1266BFCB9F821-->  <HAS_LINK><![CDATA[N]]></HAS_LINK>
+<!--DE3F5D2B067645B6A0F1266BFCB9F821-->  <CAN_BE_FILTERED><![CDATA[N]]></CAN_BE_FILTERED>
+<!--DE3F5D2B067645B6A0F1266BFCB9F821--></OBCQL_QUERY_COLUMN>
+
 <!--E4755A4156FE4E87AFC771FDCE3F9A0B--><OBCQL_QUERY_COLUMN>
 <!--E4755A4156FE4E87AFC771FDCE3F9A0B-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[E4755A4156FE4E87AFC771FDCE3F9A0B]]></OBCQL_QUERY_COLUMN_ID>
 <!--E4755A4156FE4E87AFC771FDCE3F9A0B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -297,4 +386,23 @@
 <!--F80128948ADD4FDFBAC82BF7EBF0FEFD-->  <CAN_BE_FILTERED><![CDATA[N]]></CAN_BE_FILTERED>
 <!--F80128948ADD4FDFBAC82BF7EBF0FEFD--></OBCQL_QUERY_COLUMN>
 
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB--><OBCQL_QUERY_COLUMN>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[FCD6D2F3AAA34DF7BA0B97B11A7A15CB]]></OBCQL_QUERY_COLUMN_ID>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[97FD9C124D5D409DB94BB6500A418A60]]></OBCQL_WIDGET_QUERY_ID>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <DISPLAY_EXPRESSION><![CDATA[product]]></DISPLAY_EXPRESSION>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <NAME><![CDATA[Product]]></NAME>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <WIDTH><![CDATA[10]]></WIDTH>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <LINK_EXPRESSION><![CDATA[pid]]></LINK_EXPRESSION>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <HAS_LINK><![CDATA[Y]]></HAS_LINK>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <AD_TAB_ID><![CDATA[180]]></AD_TAB_ID>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <CAN_BE_FILTERED><![CDATA[Y]]></CAN_BE_FILTERED>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB-->  <WHERECLAUSE_LEFT_PART><![CDATA[productName]]></WHERECLAUSE_LEFT_PART>
+<!--FCD6D2F3AAA34DF7BA0B97B11A7A15CB--></OBCQL_QUERY_COLUMN>
+
 </data>
--- a/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBCQL_WIDGET_QUERY.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBCQL_WIDGET_QUERY.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -23,6 +23,21 @@
 <!--53389C2060AD4DBEA1F9009A3C82B63F-->  <TYPE><![CDATA[HQL]]></TYPE>
 <!--53389C2060AD4DBEA1F9009A3C82B63F--></OBCQL_WIDGET_QUERY>
 
+<!--97FD9C124D5D409DB94BB6500A418A60--><OBCQL_WIDGET_QUERY>
+<!--97FD9C124D5D409DB94BB6500A418A60-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[97FD9C124D5D409DB94BB6500A418A60]]></OBCQL_WIDGET_QUERY_ID>
+<!--97FD9C124D5D409DB94BB6500A418A60-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--97FD9C124D5D409DB94BB6500A418A60-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--97FD9C124D5D409DB94BB6500A418A60-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--97FD9C124D5D409DB94BB6500A418A60-->  <OBKMO_WIDGET_CLASS_ID><![CDATA[5291D3D3B07B4CFC87928071377740E8]]></OBKMO_WIDGET_CLASS_ID>
+<!--97FD9C124D5D409DB94BB6500A418A60-->  <HQL><![CDATA[select orgname as store, warehouseName as warehouse, organization.id as orgid, searchKey as identifier, productName as product, product.id as pid, productCategoryName as category, productCategory.id as pcid, uOMName as uom, quantityOnHand as qtyonhand, description as attr, warehouse.id as whid
+from OBWCL_StockByWarehouseView sbw
+where sbw.client.id=:client
+and sbw.organization.id IN (:organizationList)
+and @optional_filters@
+order by qtyonhand desc]]></HQL>
+<!--97FD9C124D5D409DB94BB6500A418A60-->  <TYPE><![CDATA[HQL]]></TYPE>
+<!--97FD9C124D5D409DB94BB6500A418A60--></OBCQL_WIDGET_QUERY>
+
 <!--CFDF8EE593F04CFE9709F5AD19A3A573--><OBCQL_WIDGET_QUERY>
 <!--CFDF8EE593F04CFE9709F5AD19A3A573-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[CFDF8EE593F04CFE9709F5AD19A3A573]]></OBCQL_WIDGET_QUERY_ID>
 <!--CFDF8EE593F04CFE9709F5AD19A3A573-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -50,6 +50,23 @@
 <!--35002C82027448708D173B75FB27D037-->  <AVAILABLE_IN_WORKSPACE><![CDATA[Y]]></AVAILABLE_IN_WORKSPACE>
 <!--35002C82027448708D173B75FB27D037--></OBKMO_WIDGET_CLASS>
 
+<!--5291D3D3B07B4CFC87928071377740E8--><OBKMO_WIDGET_CLASS>
+<!--5291D3D3B07B4CFC87928071377740E8-->  <OBKMO_WIDGET_CLASS_ID><![CDATA[5291D3D3B07B4CFC87928071377740E8]]></OBKMO_WIDGET_CLASS_ID>
+<!--5291D3D3B07B4CFC87928071377740E8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5291D3D3B07B4CFC87928071377740E8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5291D3D3B07B4CFC87928071377740E8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5291D3D3B07B4CFC87928071377740E8-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--5291D3D3B07B4CFC87928071377740E8-->  <TITLE><![CDATA[Simple Stock By Warehouse]]></TITLE>
+<!--5291D3D3B07B4CFC87928071377740E8-->  <HEIGHT><![CDATA[300]]></HEIGHT>
+<!--5291D3D3B07B4CFC87928071377740E8-->  <DESCRIPTION><![CDATA[Stock product by warehouse, attribute and unit of measure]]></DESCRIPTION>
+<!--5291D3D3B07B4CFC87928071377740E8-->  <ALLOW_ANONYMOUS_ACCESS><![CDATA[Y]]></ALLOW_ANONYMOUS_ACCESS>
+<!--5291D3D3B07B4CFC87928071377740E8-->  <ISSUPERCLASS><![CDATA[N]]></ISSUPERCLASS>
+<!--5291D3D3B07B4CFC87928071377740E8-->  <WIDGET_SUPERCLASS_ID><![CDATA[2A32CF26F3F64FE39C7F94E9D82497D1]]></WIDGET_SUPERCLASS_ID>
+<!--5291D3D3B07B4CFC87928071377740E8-->  <CAN_MAXIMIZE><![CDATA[N]]></CAN_MAXIMIZE>
+<!--5291D3D3B07B4CFC87928071377740E8-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
+<!--5291D3D3B07B4CFC87928071377740E8-->  <AVAILABLE_IN_WORKSPACE><![CDATA[Y]]></AVAILABLE_IN_WORKSPACE>
+<!--5291D3D3B07B4CFC87928071377740E8--></OBKMO_WIDGET_CLASS>
+
 <!--5B41A19E11494C519BE33BBED6012DAE--><OBKMO_WIDGET_CLASS>
 <!--5B41A19E11494C519BE33BBED6012DAE-->  <OBKMO_WIDGET_CLASS_ID><![CDATA[5B41A19E11494C519BE33BBED6012DAE]]></OBKMO_WIDGET_CLASS_ID>
 <!--5B41A19E11494C519BE33BBED6012DAE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -24,6 +24,28 @@
 <!--04718E066E4E4C71BC35BBE44433BBC1-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[8A6B99392E2D9088012E2DCFC39B005F]]></EM_OBKMO_WIDGET_CLASS_ID>
 <!--04718E066E4E4C71BC35BBE44433BBC1--></OBUIAPP_PARAMETER>
 
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C--><OBUIAPP_PARAMETER>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <OBUIAPP_PARAMETER_ID><![CDATA[0DE3BBDF680446F3A88ADC7F3FAF174C]]></OBUIAPP_PARAMETER_ID>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <NAME><![CDATA[Number of Rows]]></NAME>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <SEQNO><![CDATA[0]]></SEQNO>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <COLUMNNAME><![CDATA[RowsNumber]]></COLUMNNAME>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <AD_ELEMENT_ID><![CDATA[9A0C92898CF17AC8E040007F01003160]]></AD_ELEMENT_ID>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <ISFIXED><![CDATA[N]]></ISFIXED>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[5291D3D3B07B4CFC87928071377740E8]]></EM_OBKMO_WIDGET_CLASS_ID>
+<!--0DE3BBDF680446F3A88ADC7F3FAF174C--></OBUIAPP_PARAMETER>
+
 <!--14A332D4D9534D5D84F399FF8128462E--><OBUIAPP_PARAMETER>
 <!--14A332D4D9534D5D84F399FF8128462E-->  <OBUIAPP_PARAMETER_ID><![CDATA[14A332D4D9534D5D84F399FF8128462E]]></OBUIAPP_PARAMETER_ID>
 <!--14A332D4D9534D5D84F399FF8128462E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -215,6 +237,30 @@
 <!--5DA6BE86940349C58FF5A3CC9A3F8FFF-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[5B41A19E11494C519BE33BBED6012DAE]]></EM_OBKMO_WIDGET_CLASS_ID>
 <!--5DA6BE86940349C58FF5A3CC9A3F8FFF--></OBUIAPP_PARAMETER>
 
+<!--5F280DC1145E425AAAFC34586DB10B74--><OBUIAPP_PARAMETER>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <OBUIAPP_PARAMETER_ID><![CDATA[5F280DC1145E425AAAFC34586DB10B74]]></OBUIAPP_PARAMETER_ID>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <NAME><![CDATA[Client]]></NAME>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <COLUMNNAME><![CDATA[client]]></COLUMNNAME>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <AD_ELEMENT_ID><![CDATA[9C7735D7BEB73C9EE040A8C0EB06271C]]></AD_ELEMENT_ID>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <ISFIXED><![CDATA[Y]]></ISFIXED>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <FIXEDVALUE><![CDATA[OB.getContext().getCurrentClient().id]]></FIXEDVALUE>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <EVALUATEFIXEDVALUE><![CDATA[Y]]></EVALUATEFIXEDVALUE>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
+<!--5F280DC1145E425AAAFC34586DB10B74-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[5291D3D3B07B4CFC87928071377740E8]]></EM_OBKMO_WIDGET_CLASS_ID>
+<!--5F280DC1145E425AAAFC34586DB10B74--></OBUIAPP_PARAMETER>
+
 <!--61C0446937F449BC9FC32EC62857C504--><OBUIAPP_PARAMETER>
 <!--61C0446937F449BC9FC32EC62857C504-->  <OBUIAPP_PARAMETER_ID><![CDATA[61C0446937F449BC9FC32EC62857C504]]></OBUIAPP_PARAMETER_ID>
 <!--61C0446937F449BC9FC32EC62857C504-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -384,6 +430,29 @@
 <!--A7EBA6BDA2C248378C86EF1B162423AE-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[5B41A19E11494C519BE33BBED6012DAE]]></EM_OBKMO_WIDGET_CLASS_ID>
 <!--A7EBA6BDA2C248378C86EF1B162423AE--></OBUIAPP_PARAMETER>
 
+<!--A8FC8FF493734DDEACCA0202963EC9C1--><OBUIAPP_PARAMETER>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <OBUIAPP_PARAMETER_ID><![CDATA[A8FC8FF493734DDEACCA0202963EC9C1]]></OBUIAPP_PARAMETER_ID>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <NAME><![CDATA[Show all data]]></NAME>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <COLUMNNAME><![CDATA[showAll]]></COLUMNNAME>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <DEFAULTVALUE><![CDATA[false]]></DEFAULTVALUE>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <AD_ELEMENT_ID><![CDATA[9A0C92898CEE7AC8E040007F01003160]]></AD_ELEMENT_ID>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <ISFIXED><![CDATA[N]]></ISFIXED>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
+<!--A8FC8FF493734DDEACCA0202963EC9C1-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[5291D3D3B07B4CFC87928071377740E8]]></EM_OBKMO_WIDGET_CLASS_ID>
+<!--A8FC8FF493734DDEACCA0202963EC9C1--></OBUIAPP_PARAMETER>
+
 <!--B181513A8B0141FB953295A0F1D02DDA--><OBUIAPP_PARAMETER>
 <!--B181513A8B0141FB953295A0F1D02DDA-->  <OBUIAPP_PARAMETER_ID><![CDATA[B181513A8B0141FB953295A0F1D02DDA]]></OBUIAPP_PARAMETER_ID>
 <!--B181513A8B0141FB953295A0F1D02DDA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -466,6 +535,30 @@
 <!--B838E24559DD4B4B98B7B0D1CC10E2D0-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[8A6B99392E2B4192012E2B58F5790056]]></EM_OBKMO_WIDGET_CLASS_ID>
 <!--B838E24559DD4B4B98B7B0D1CC10E2D0--></OBUIAPP_PARAMETER>
 
+<!--D1BE41F04FD14C3A9E6980369BC97E87--><OBUIAPP_PARAMETER>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <OBUIAPP_PARAMETER_ID><![CDATA[D1BE41F04FD14C3A9E6980369BC97E87]]></OBUIAPP_PARAMETER_ID>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <NAME><![CDATA[Organization List]]></NAME>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <COLUMNNAME><![CDATA[organizationList]]></COLUMNNAME>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <AD_ELEMENT_ID><![CDATA[32873C7A39ED464F9D781AB4BE08323B]]></AD_ELEMENT_ID>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <ISFIXED><![CDATA[Y]]></ISFIXED>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <FIXEDVALUE><![CDATA[OB.getContext().getReadableOrganizations()]]></FIXEDVALUE>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <EVALUATEFIXEDVALUE><![CDATA[Y]]></EVALUATEFIXEDVALUE>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
+<!--D1BE41F04FD14C3A9E6980369BC97E87-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[5291D3D3B07B4CFC87928071377740E8]]></EM_OBKMO_WIDGET_CLASS_ID>
+<!--D1BE41F04FD14C3A9E6980369BC97E87--></OBUIAPP_PARAMETER>
+
 <!--D57E85EA046B475C94EEE74A9CF67C78--><OBUIAPP_PARAMETER>
 <!--D57E85EA046B475C94EEE74A9CF67C78-->  <OBUIAPP_PARAMETER_ID><![CDATA[D57E85EA046B475C94EEE74A9CF67C78]]></OBUIAPP_PARAMETER_ID>
 <!--D57E85EA046B475C94EEE74A9CF67C78-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -6,7 +6,7 @@
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <NAME><![CDATA[Payment Report]]></NAME>
-<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.30440]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.31087]]></VERSION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <DESCRIPTION><![CDATA[Payment Report]]></DESCRIPTION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <URL><![CDATA[http://forge.openbravo.com/projects/paymentreport]]></URL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <TYPE><![CDATA[M]]></TYPE>
@@ -22,7 +22,7 @@
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION_LABEL><![CDATA[PR16Q4]]></VERSION_LABEL>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION_LABEL><![CDATA[PR17Q1]]></VERSION_LABEL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--2A5EE903D7974AC298C0504FBC4501A7--></AD_MODULE>
--- a/model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -7,7 +7,7 @@
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.30440]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.31087]]></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/model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -6,7 +6,7 @@
 <!--3A3A943684D64DEF9EC39F588A656848-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <NAME><![CDATA[Orders Awaiting Delivery]]></NAME>
-<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.30440]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.31087]]></VERSION>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <DESCRIPTION><![CDATA[Report displaying sales orders not shipped.]]></DESCRIPTION>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <URL><![CDATA[http://forge.openbravo.com/projects/ordersawaitingdlivery]]></URL>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <TYPE><![CDATA[M]]></TYPE>
@@ -19,7 +19,7 @@
 <!--3A3A943684D64DEF9EC39F588A656848-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION_LABEL><![CDATA[PR16Q4]]></VERSION_LABEL>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION_LABEL><![CDATA[PR17Q1]]></VERSION_LABEL>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--3A3A943684D64DEF9EC39F588A656848--></AD_MODULE>
--- a/model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -7,7 +7,7 @@
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <AD_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_MODULE_ID>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.30440]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.31087]]></STARTVERSION>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -1,5 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <data>
+<!--1264AC4A209749BD9709EF88CAB71153--><AD_TEXTINTERFACES>
+<!--1264AC4A209749BD9709EF88CAB71153-->  <AD_TEXTINTERFACES_ID><![CDATA[1264AC4A209749BD9709EF88CAB71153]]></AD_TEXTINTERFACES_ID>
+<!--1264AC4A209749BD9709EF88CAB71153-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1264AC4A209749BD9709EF88CAB71153-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1264AC4A209749BD9709EF88CAB71153-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1264AC4A209749BD9709EF88CAB71153-->  <TEXT><![CDATA[Show quantities in AUM]]></TEXT>
+<!--1264AC4A209749BD9709EF88CAB71153-->  <FILENAME><![CDATA[/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.html]]></FILENAME>
+<!--1264AC4A209749BD9709EF88CAB71153-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--1264AC4A209749BD9709EF88CAB71153-->  <AD_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_MODULE_ID>
+<!--1264AC4A209749BD9709EF88CAB71153--></AD_TEXTINTERFACES>
+
 <!--D217B67C621E11DEBEE4001B388C05F0--><AD_TEXTINTERFACES>
 <!--D217B67C621E11DEBEE4001B388C05F0-->  <AD_TEXTINTERFACES_ID><![CDATA[D217B67C621E11DEBEE4001B388C05F0]]></AD_TEXTINTERFACES_ID>
 <!--D217B67C621E11DEBEE4001B388C05F0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -6,7 +6,7 @@
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <NAME><![CDATA[JSON Datasource]]></NAME>
-<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.30440]]></VERSION>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.31087]]></VERSION>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <DESCRIPTION><![CDATA[Provides data source CRUD functionality using JSON as the data format]]></DESCRIPTION>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <HELP><![CDATA[This module implements the datasource concept. Datasources play a central role in Smartclient applications. The datasource module automatically creates a datasource for each Openbravo entity. In addition custom data source implementations can be defined.]]></HELP>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <URL><![CDATA[http://forge.openbravo.com/projects/datasourceservice]]></URL>
@@ -22,7 +22,7 @@
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0]]></UPDATEINFO>
-<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION_LABEL><![CDATA[PR16Q4]]></VERSION_LABEL>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION_LABEL><![CDATA[PR17Q1]]></VERSION_LABEL>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4--></AD_MODULE>
--- a/model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -7,7 +7,7 @@
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.30440]]></STARTVERSION>
+<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.31087]]></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.30440]]></STARTVERSION>
+<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.31087]]></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.30440]]></STARTVERSION>
+<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.31087]]></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.30440]]></STARTVERSION>
+<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.31087]]></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.30440]]></STARTVERSION>
+<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.31087]]></STARTVERSION>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -6,7 +6,7 @@
 <!--FF8080813129ADA401312CA1222A0005-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813129ADA401312CA1222A0005-->  <NAME><![CDATA[Integration with Google APIs]]></NAME>
-<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.30440]]></VERSION>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.31087]]></VERSION>
 <!--FF8080813129ADA401312CA1222A0005-->  <DESCRIPTION><![CDATA[Integration with Google APIs]]></DESCRIPTION>
 <!--FF8080813129ADA401312CA1222A0005-->  <TYPE><![CDATA[M]]></TYPE>
 <!--FF8080813129ADA401312CA1222A0005-->  <LICENSE><![CDATA[Licensed under the Openbravo Public License Version 1.1.
@@ -19,7 +19,7 @@
 <!--FF8080813129ADA401312CA1222A0005-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--FF8080813129ADA401312CA1222A0005-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--FF8080813129ADA401312CA1222A0005-->  <VERSION_LABEL><![CDATA[PR16Q4]]></VERSION_LABEL>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION_LABEL><![CDATA[PR17Q1]]></VERSION_LABEL>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--FF8080813129ADA401312CA1222A0005--></AD_MODULE>
--- a/model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -7,7 +7,7 @@
 <!--FF8080813141B198013141BA0F7D0012-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141BA0F7D0012-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
 <!--FF8080813141B198013141BA0F7D0012-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.30440]]></STARTVERSION>
+<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.31087]]></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.30440]]></STARTVERSION>
+<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.31087]]></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/model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -6,7 +6,7 @@
 <!--FF8080813141B198013141B86DD70003-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080813141B198013141B86DD70003-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141B86DD70003-->  <NAME><![CDATA[OpenID Service Integration]]></NAME>
-<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.30440]]></VERSION>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.31087]]></VERSION>
 <!--FF8080813141B198013141B86DD70003-->  <DESCRIPTION><![CDATA[OpenID Service Integration]]></DESCRIPTION>
 <!--FF8080813141B198013141B86DD70003-->  <TYPE><![CDATA[M]]></TYPE>
 <!--FF8080813141B198013141B86DD70003-->  <LICENSE><![CDATA[Licensed under the Openbravo Public License Version 1.1.
@@ -19,7 +19,7 @@
 <!--FF8080813141B198013141B86DD70003-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--FF8080813141B198013141B86DD70003-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--FF8080813141B198013141B86DD70003-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--FF8080813141B198013141B86DD70003-->  <VERSION_LABEL><![CDATA[PR16Q4]]></VERSION_LABEL>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION_LABEL><![CDATA[PR17Q1]]></VERSION_LABEL>
 <!--FF8080813141B198013141B86DD70003-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--FF8080813141B198013141B86DD70003-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--FF8080813141B198013141B86DD70003--></AD_MODULE>
--- a/model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -7,7 +7,7 @@
 <!--FF8080813141B198013141B8B21B0006-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141B8B21B0006-->  <AD_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_MODULE_ID>
 <!--FF8080813141B198013141B8B21B0006-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.30440]]></STARTVERSION>
+<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.31087]]></STARTVERSION>
 <!--FF8080813141B198013141B8B21B0006-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813141B198013141B8B21B0006-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813141B198013141B8B21B0006-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -6,7 +6,7 @@
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <NAME><![CDATA[JSON REST Webservice]]></NAME>
-<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.30440]]></VERSION>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.31087]]></VERSION>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <DESCRIPTION><![CDATA[Provides a JSON REST webservice for CRUD service requests]]></DESCRIPTION>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <HELP><![CDATA[Provides a JSON REST webservice for CRUD service requests. Both the servlet implementation (receiving HTTP REST requests in JSON) as the backend processing are provided.]]></HELP>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravojsonrest]]></URL>
@@ -22,7 +22,7 @@
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0]]></UPDATEINFO>
-<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION_LABEL><![CDATA[PR16Q4]]></VERSION_LABEL>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION_LABEL><![CDATA[PR17Q1]]></VERSION_LABEL>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1--></AD_MODULE>
--- a/model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -7,7 +7,7 @@
 <!--9E3E7B42DB16405FB794496D309D7044-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <AD_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_MODULE_ID>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.30440]]></STARTVERSION>
+<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.31087]]></STARTVERSION>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -6,7 +6,7 @@
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <NAME><![CDATA[User Interface Selector]]></NAME>
-<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.30440]]></VERSION>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.31087]]></VERSION>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <DESCRIPTION><![CDATA[Provides a selector with a suggestion box and popup grid window]]></DESCRIPTION>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <HELP><![CDATA[The Openbravo selector provides new selector functionality which is used inside of existing Openbravo forms. The selector is mainly used for supporting foreign key references in the user interface. The selector combines both suggestion box behavior with a popup grid.]]></HELP>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <URL><![CDATA[http://forge.openbravo.com/projects/selector]]></URL>
@@ -22,7 +22,7 @@
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0]]></UPDATEINFO>
-<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION_LABEL><![CDATA[PR16Q4]]></VERSION_LABEL>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION_LABEL><![CDATA[PR17Q1]]></VERSION_LABEL>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--5EB4F15C80684ACA904756BDC12ADBE5--></AD_MODULE>
--- a/model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -7,7 +7,7 @@
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.30440]]></STARTVERSION>
+<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.31087]]></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.30440]]></STARTVERSION>
+<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.31087]]></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.30440]]></STARTVERSION>
+<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.31087]]></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.30440]]></STARTVERSION>
+<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.31087]]></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.30440]]></STARTVERSION>
+<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.31087]]></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.30440]]></STARTVERSION>
+<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.31087]]></STARTVERSION>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -6,7 +6,7 @@
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <NAME><![CDATA[2.50 to 3.00 Compatibility Skin]]></NAME>
-<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.30440]]></VERSION>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.31087]]></VERSION>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <DESCRIPTION><![CDATA[Skin module to proper visualization of classic windows inside the MDI interface]]></DESCRIPTION>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <HELP><![CDATA[With this skin module the classic windows styles will display in a way more coherent with the new 3.00 styles]]></HELP>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <URL><![CDATA[www.openbravo.com]]></URL>
@@ -23,7 +23,7 @@
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION_LABEL><![CDATA[PR16Q4]]></VERSION_LABEL>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION_LABEL><![CDATA[PR17Q1]]></VERSION_LABEL>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--96998CBC42744B3DBEE28AC8095C9335--></AD_MODULE>
--- a/model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -7,7 +7,7 @@
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <AD_MODULE_ID><![CDATA[96998CBC42744B3DBEE28AC8095C9335]]></AD_MODULE_ID>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.30440]]></STARTVERSION>
+<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.31087]]></STARTVERSION>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -6,7 +6,7 @@
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <NAME><![CDATA[Smartclient]]></NAME>
-<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.30440]]></VERSION>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.31087]]></VERSION>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <DESCRIPTION><![CDATA[SmartClient libraries for use within Openbravo]]></DESCRIPTION>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <HELP><![CDATA[This module contains the SmartClient libraries for usage by other modules. It also contains some simple test pages to validate that SmartClient is working correctly. Also contains generic Openbravo SmartClient components]]></HELP>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <URL><![CDATA[http://forge.openbravo.com/projects/obsmartclient]]></URL>
@@ -23,7 +23,7 @@
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0
 Updated to new SmartClient 8.3d 26-May-2012]]></UPDATEINFO>
-<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION_LABEL><![CDATA[PR16Q4]]></VERSION_LABEL>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION_LABEL><![CDATA[PR17Q1]]></VERSION_LABEL>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9--></AD_MODULE>
--- a/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -7,7 +7,7 @@
 <!--086331E18477496B8AC74D2CFEBD1307-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.30440]]></STARTVERSION>
+<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.31087]]></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.30440]]></STARTVERSION>
+<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.31087]]></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.30440]]></STARTVERSION>
+<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.31087]]></STARTVERSION>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -6,7 +6,7 @@
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <NAME><![CDATA[Log Clean Up Utility]]></NAME>
-<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION><![CDATA[1.0.30440]]></VERSION>
+<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION><![CDATA[1.0.31087]]></VERSION>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <DESCRIPTION><![CDATA[Log Clean Up Utility]]></DESCRIPTION>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <HELP><![CDATA[Utility to periodically cleanup log tables]]></HELP>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <URL><![CDATA[http://centralrepository.openbravo.com/heartbeat-server/org.openbravo.forge.ui/ForgeProjectDetail?projectId=7DC25E3B7ADE426CAD71E7804B95C1BF]]></URL>
@@ -21,7 +21,7 @@
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
-<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION_LABEL><![CDATA[PR16Q4]]></VERSION_LABEL>
+<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION_LABEL><![CDATA[PR17Q1]]></VERSION_LABEL>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--8A34B301DC524EA3A07513DF9F42CC90--></AD_MODULE>
--- a/model/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -7,7 +7,7 @@
 <!--86EBD30DEB8045508185B457896C9F6D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <AD_MODULE_ID><![CDATA[8A34B301DC524EA3A07513DF9F42CC90]]></AD_MODULE_ID>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--86EBD30DEB8045508185B457896C9F6D-->  <STARTVERSION><![CDATA[2.1.30440]]></STARTVERSION>
+<!--86EBD30DEB8045508185B457896C9F6D-->  <STARTVERSION><![CDATA[2.1.31087]]></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/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -6,7 +6,7 @@
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <NAME><![CDATA[Standard Roles]]></NAME>
-<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.30440]]></VERSION>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.31087]]></VERSION>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <DESCRIPTION><![CDATA[Pre-configured collection of standard ERP roles]]></DESCRIPTION>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <HELP><![CDATA[This dataset contains the following roles with their access to corresponding Openbravo entities - windows, reports, actions.
 * Employee - Any person of the enterprise
@@ -28,7 +28,7 @@
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <REFERENCEDATAINFO><![CDATA[Pre-configured collection of standard ERP roles]]></REFERENCEDATAINFO>
-<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION_LABEL><![CDATA[PR16Q4]]></VERSION_LABEL>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION_LABEL><![CDATA[PR17Q1]]></VERSION_LABEL>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61--></AD_MODULE>
--- a/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -7,7 +7,7 @@
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <AD_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_MODULE_ID>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.30440]]></STARTVERSION>
+<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.31087]]></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.30440]]></STARTVERSION>
+<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.31087]]></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.30440]]></STARTVERSION>
+<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.31087]]></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/model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -6,7 +6,7 @@
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <NAME><![CDATA[Openbravo 3.0 Framework]]></NAME>
-<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.30440]]></VERSION>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.31087]]></VERSION>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <DESCRIPTION><![CDATA[Openbravo 3.0 Framework]]></DESCRIPTION>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <HELP><![CDATA[Contains all the components required to run the Openbravo 3.0 framework]]></HELP>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravov30framework]]></URL>
@@ -24,7 +24,7 @@
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <UPDATEINFO><![CDATA[minor bugfix release to include latest client.application 2.0.1, client.myob 2.0.2 and client.kernel 2.0.1]]></UPDATEINFO>
-<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION_LABEL><![CDATA[PR16Q4]]></VERSION_LABEL>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION_LABEL><![CDATA[PR17Q1]]></VERSION_LABEL>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--7E48CDD73B7E493A8BED4F7253E7C989--></AD_MODULE>
--- a/model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -7,7 +7,7 @@
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.30440]]></STARTVERSION>
+<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.31087]]></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.30440]]></STARTVERSION>
+<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.31087]]></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.30440]]></STARTVERSION>
+<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.31087]]></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.30440]]></STARTVERSION>
+<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.31087]]></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.30440]]></STARTVERSION>
+<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.31087]]></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.30440]]></STARTVERSION>
+<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.31087]]></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.30440]]></STARTVERSION>
+<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.31087]]></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.30440]]></STARTVERSION>
+<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.31087]]></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.30440]]></STARTVERSION>
+<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.31087]]></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.30440]]></STARTVERSION>
+<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.31087]]></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.30440]]></STARTVERSION>
+<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.31087]]></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.30440]]></STARTVERSION>
+<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.31087]]></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/model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -6,7 +6,7 @@
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <NAME><![CDATA[Openbravo 3.0]]></NAME>
-<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.30440]]></VERSION>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.31087]]></VERSION>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <DESCRIPTION><![CDATA[Openbravo 3.0 distribution template]]></DESCRIPTION>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HELP><![CDATA[Openbravo 3.0 is a collection (distribution) of modules. This template is a container of all the modules and configuration changes that compose Openbravo 3.0.]]></HELP>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <URL><![CDATA[http://forge.openbravo.com/projects/vthree]]></URL>
@@ -20,7 +20,7 @@
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION_LABEL><![CDATA[PR16Q4]]></VERSION_LABEL>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION_LABEL><![CDATA[PR17Q1]]></VERSION_LABEL>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--0138E7A89B5E4DC3932462252801FFBC--></AD_MODULE>
--- a/model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -7,7 +7,7 @@
 <!--48D556894CE54CF998DC97882E904CBD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--48D556894CE54CF998DC97882E904CBD-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--48D556894CE54CF998DC97882E904CBD-->  <AD_DEPENDENT_MODULE_ID><![CDATA[8A098711BB324335A19833286BDB093D]]></AD_DEPENDENT_MODULE_ID>
-<!--48D556894CE54CF998DC97882E904CBD-->  <STARTVERSION><![CDATA[1.0.30440]]></STARTVERSION>
+<!--48D556894CE54CF998DC97882E904CBD-->  <STARTVERSION><![CDATA[1.0.31087]]></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.30440]]></STARTVERSION>
+<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.31087]]></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.30440]]></STARTVERSION>
+<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.31087]]></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.30440]]></STARTVERSION>
+<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.31087]]></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.30440]]></STARTVERSION>
+<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.31087]]></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.30440]]></STARTVERSION>
+<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.31087]]></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.30440]]></STARTVERSION>
+<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.31087]]></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.30440]]></STARTVERSION>
+<!--FEF6E40F244A4061B7C62CB755663712-->  <STARTVERSION><![CDATA[1.0.31087]]></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.30440]]></STARTVERSION>
+<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.31087]]></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.30440]]></STARTVERSION>
+<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.31087]]></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.30440]]></STARTVERSION>
+<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.31087]]></STARTVERSION>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDANT_MODULE_NAME><![CDATA[Widgets Collection]]></DEPENDANT_MODULE_NAME>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_MERGE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_MERGE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -10,6 +10,16 @@
 <!--10FBB7E64CFC495EB32B3C6F17D10197-->  <MERGED_MODULE_NAME><![CDATA[Inventory Average Cost transactions]]></MERGED_MODULE_NAME>
 <!--10FBB7E64CFC495EB32B3C6F17D10197--></AD_MODULE_MERGE>
 
+<!--9AF40DD3765F4F048F3C9764C3A82796--><AD_MODULE_MERGE>
+<!--9AF40DD3765F4F048F3C9764C3A82796-->  <AD_MODULE_MERGE_ID><![CDATA[9AF40DD3765F4F048F3C9764C3A82796]]></AD_MODULE_MERGE_ID>
+<!--9AF40DD3765F4F048F3C9764C3A82796-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9AF40DD3765F4F048F3C9764C3A82796-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9AF40DD3765F4F048F3C9764C3A82796-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9AF40DD3765F4F048F3C9764C3A82796-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
+<!--9AF40DD3765F4F048F3C9764C3A82796-->  <MERGED_MODULE_UUID><![CDATA[DB9AE8D87B0D43C68430D5BA415143FD]]></MERGED_MODULE_UUID>
+<!--9AF40DD3765F4F048F3C9764C3A82796-->  <MERGED_MODULE_NAME><![CDATA[Report: Valued Stock Enhanced]]></MERGED_MODULE_NAME>
+<!--9AF40DD3765F4F048F3C9764C3A82796--></AD_MODULE_MERGE>
+
 <!--FF808181304FE89F01304FEB9709000A--><AD_MODULE_MERGE>
 <!--FF808181304FE89F01304FEB9709000A-->  <AD_MODULE_MERGE_ID><![CDATA[FF808181304FE89F01304FEB9709000A]]></AD_MODULE_MERGE_ID>
 <!--FF808181304FE89F01304FEB9709000A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/model/excludeFilter.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/excludeFilter.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -65,4 +65,6 @@
     <excludedFunction name="TEMP_FINDINARRAY"/>
     <excludedFunction name="AD_EXECUTE_FUNCTION"/>
     <excludedFunction name="ADD_HMS"/>
+    <excludedFunction name="PG\_%"/> <!-- PostgreSQL extension functions -->
+    <excludedTrigger name="AU\_%"/> <!-- Audit trail triggers -->
   </vector>
--- a/model/src-db/database/model/functions/AD_LANGUAGE_CREATE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/functions/AD_LANGUAGE_CREATE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -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/model/src-db/database/model/functions/C_INVOICE_CREATE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/functions/C_INVOICE_CREATE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -92,6 +92,10 @@
     v_period_inv C_InvoiceLine.c_period_id%TYPE;
     v_InOutLine_ID C_InvoiceLine.M_InOutLine_ID%TYPE;
 
+    v_uom_preference VARCHAR(1);	
+    v_default_aum C_UOM.C_UOM_ID%TYPE;
+    v_aum_qty NUMBER;
+    c_soo_doctype C_DOCTYPE.C_DOCTYPE_ID%TYPE := '01360D369B5F473686354A701A6EA559';
 
     Cur_Bpblocked RECORD;
     
@@ -124,6 +128,8 @@
           ol.C_Charge_ID,
           ol.ChargeAmt,
           COALESCE(sl.C_UOM_ID, ol.C_UOM_ID) AS C_UOM_ID,
+          sl.AUMQTY,
+          sl.C_AUM,
           --MODIFIED BY F.IRIAZABAL
           sl.M_PRODUCT_UOM_ID,
           ol.C_Tax_ID, --ol.IsTaxIncluded,
@@ -237,6 +243,16 @@
           END;
         END IF;
       BEGIN --BODY
+        -- Get UOMPreference value
+        v_uom_preference := 'N';
+        BEGIN
+          v_uom_preference := AD_GET_PREFERENCE_VALUE('UomManagement', 'Y', NULL, v_AD_Org_ID, v_ADUserId, NULL, NULL);
+          EXCEPTION
+            WHEN OTHERS THEN
+            -- Nothing to do, v_uom_preference = 'N'
+            DBMS_OUTPUT.PUT_LINE('No UomManagement preference found') ;
+        END;
+        
         /**
         * Order Loop == all not completely invoiced orders == No Summary ==
         */
@@ -540,6 +556,7 @@
                     Description, M_Product_ID, QtyInvoiced, PriceList,
                     PriceActual, PriceLimit, LineNetAmt, C_Charge_ID,
                     ChargeAmt, C_UOM_ID, C_Tax_ID, PriceStd, 
+                    AUMQTY, C_AUM,
                     explode, bom_parent_id,
                     C_Project_ID, C_Bpartner_ID, A_Asset_ID,
                     C_Costcenter_ID, User1_ID, User2_ID
@@ -552,6 +569,7 @@
                     v_Reference, NULL, 0, 0,
                     0, 0, 0, NULL,
                     0, NULL, NULL, 0, 
+                    NULL, NULL,
                     ptr_sl.explode, (SELECT c_invoiceline_id 
                                             FROM c_invoiceline 
                                             WHERE c_invoice_id=p_Invoice_ID 
@@ -638,6 +656,15 @@
 												END IF;
 											END IF;
 	                  END IF;
+
+	            v_default_aum := CASE WHEN v_uom_preference = 'Y' AND ptr_ol.AUMQTY IS NULL AND ptr_ol.M_Product_Uom_ID IS NULL 
+					 THEN M_GET_DEFAULT_AUM_FOR_DOCUMENT(ptr_ol.M_Product_ID, c_soo_doctype) 
+					 ELSE ptr_ol.C_AUM 
+					 END;
+		        v_aum_qty := CASE WHEN v_uom_preference = 'Y' AND ptr_ol.AUMQTY IS NULL AND ptr_ol.M_Product_Uom_ID IS NULL 
+				     THEN M_GET_CONVERTED_AUMQTY(ptr_ol.M_Product_ID,v_Qty,v_default_aum) 
+				     ELSE ptr_ol.AUMQTY 
+				     END;					
                     INSERT
                     INTO C_INVOICELINE
                       (
@@ -647,6 +674,7 @@
                         Description, M_Product_ID, QtyInvoiced, PriceList,
                         PriceActual, PriceLimit, LineNetAmt, C_Charge_ID,
                         ChargeAmt, C_UOM_ID,
+                        AUMQTY, C_AUM,
                         C_Tax_ID,  --MODIFIED BY F.IRIAZABAL
                         QuantityOrder, M_Product_Uom_ID, PriceStd,
                         m_attributesetinstance_id, taxbaseamt,
@@ -662,9 +690,12 @@
                         v_NextNo, ptr_ol.AD_Client_ID, ptr_ol.AD_Org_ID, 'Y',
                         now(), v_ADUserId, now(), v_ADUserId,
                         p_Invoice_ID, ptr_ol.C_OrderLine_ID, v_InOutLine_ID, v_LineNo,
-                        ptr_ol.Description, ptr_ol.M_Product_ID, v_Qty, ptr_ol.PriceList,
+                        ptr_ol.Description, ptr_ol.M_Product_ID,
+						v_Qty, 
+						ptr_ol.PriceList,
                         ptr_ol.PriceActual, ptr_ol.PriceLimit, C_Currency_Round(v_Qty*ptr_ol.PriceActual, Cur_Order.C_Currency_ID, NULL), ptr_ol.C_Charge_ID,
                         ptr_ol.ChargeAmt, ptr_ol.C_UOM_ID,
+                        v_aum_qty, v_default_aum,
                         ptr_ol.C_Tax_ID,  --MODIFIED BY F.IRIAZABAL
                         v_QtyOrder, ptr_ol.M_Product_Uom_ID, ptr_ol.PriceStd,
                         ptr_ol.m_attributesetinstance_id, ptr_ol.taxbaseamt,
@@ -738,7 +769,16 @@
 												END IF;
 											END IF;
 	                  END IF;
-
+		    
+		    v_default_aum := CASE WHEN v_uom_preference = 'Y' AND ptr_sl.AUMQTY IS NULL AND ptr_sl.M_Product_Uom_ID IS NULL 
+					 THEN M_GET_DEFAULT_AUM_FOR_DOCUMENT(ptr_sl.M_Product_ID, c_soo_doctype) 
+					 ELSE ptr_sl.C_AUM 
+					 END;
+		    v_aum_qty := CASE WHEN v_uom_preference = 'Y' AND ptr_sl.AUMQTY IS NULL AND ptr_sl.M_Product_Uom_ID IS NULL 
+				     THEN M_GET_CONVERTED_AUMQTY(ptr_sl.M_Product_ID,ptr_sl.MovementQty,v_default_aum) 
+				     ELSE ptr_sl.AUMQTY 
+				     END;
+				
                     INSERT
                     INTO C_INVOICELINE
                       (
@@ -748,6 +788,7 @@
                         Description, M_Product_ID, QtyInvoiced, PriceList,
                         PriceActual, PriceLimit, LineNetAmt, C_Charge_ID,
                         ChargeAmt, C_UOM_ID,
+                        AUMQTY, C_AUM,
                         C_Tax_ID,  --MODIFIED BY F.IRIAZABAL
                         QuantityOrder, M_Product_Uom_ID, PriceStd,
                         m_attributesetinstance_id, 
@@ -767,6 +808,7 @@
                         ptr_sl.Description, ptr_sl.M_Product_ID, ptr_sl.MovementQty, ptr_sl.PriceList,
                         ptr_sl.PriceActual, ptr_sl.PriceLimit, C_Currency_Round(ptr_sl.MovementQty*ptr_sl.PriceActual, Cur_Order.C_Currency_ID, NULL), ptr_sl.C_Charge_ID,
                         ptr_sl.ChargeAmt, ptr_sl.C_UOM_ID,
+                        v_aum_qty, v_default_aum,
                         ptr_sl.C_Tax_ID,  --MODIFIED BY F.IRIAZABAL
                         ptr_sl.QuantityOrder, ptr_sl.M_Product_Uom_ID, ptr_sl.PriceStd,
                         ptr_sl.m_attributesetinstance_id,
@@ -916,6 +958,8 @@
                 sl.C_UOM_ID,
                 sl.MovementQty,
                 --MODIFIED BY F.IRIAZABAL
+                sl.AUMQTY,
+                sl.C_AUM,
                 sl.QuantityOrder,
                 sl.M_Product_UOM_ID,
                 COALESCE(ol.PriceList, 0) AS PriceList,
@@ -1293,6 +1337,16 @@
 										v_periodnumber_inv := NULL;
 									END IF;
                 END IF;
+
+                v_default_aum := CASE WHEN v_uom_preference = 'Y' AND Cur_InvoiceSchedule.AUMQTY IS NULL AND Cur_InvoiceSchedule.M_Product_Uom_ID IS NULL 
+					 THEN M_GET_DEFAULT_AUM_FOR_DOCUMENT(Cur_InvoiceSchedule.M_Product_ID, c_soo_doctype) 
+					 ELSE Cur_InvoiceSchedule.C_AUM 
+					 END;
+		        v_aum_qty := CASE WHEN v_uom_preference = 'Y' AND Cur_InvoiceSchedule.AUMQTY IS NULL AND Cur_InvoiceSchedule.M_Product_Uom_ID IS NULL 
+				     THEN M_GET_CONVERTED_AUMQTY(Cur_InvoiceSchedule.M_Product_ID,Cur_InvoiceSchedule.MovementQty,v_default_aum) 
+				     ELSE Cur_InvoiceSchedule.AUMQTY 
+				     END;
+				     
                 INSERT
                 INTO C_INVOICELINE
                   (
@@ -1302,6 +1356,7 @@
                     Description, M_Product_ID, QtyInvoiced, PriceList,
                     PriceActual, PriceLimit, LineNetAmt, C_Charge_ID,
                     ChargeAmt, C_UOM_ID,
+                    AUMQTY, C_AUM,
                     C_Tax_ID,  --MODIFIED BY F.IRIAZABAL
                     QuantityOrder, M_Product_Uom_ID, PriceStd,
                     m_attributesetinstance_id, 
@@ -1321,6 +1376,7 @@
                     Cur_InvoiceSchedule.Line_Description, Cur_InvoiceSchedule.M_Product_ID, Cur_InvoiceSchedule.MovementQty, Cur_InvoiceSchedule.PriceList,
                     Cur_InvoiceSchedule.PriceActual, Cur_InvoiceSchedule.PriceLimit, C_Currency_Round(Cur_InvoiceSchedule.MovementQty*Cur_InvoiceSchedule.PriceActual, Cur_InvoiceSchedule.C_Currency_ID, NULL), Cur_InvoiceSchedule.Line_C_Charge_ID,
                     Cur_InvoiceSchedule.Line_ChargeAmt, Cur_InvoiceSchedule.C_UOM_ID,
+                    v_aum_qty, v_default_aum,
                     Cur_InvoiceSchedule.C_Tax_ID,  --MODIFIED BY F.IRIAZABAL
                     Cur_InvoiceSchedule.QuantityOrder, Cur_InvoiceSchedule.M_Product_Uom_ID, Cur_InvoiceSchedule.PriceStd,
                     Cur_InvoiceSchedule.m_attributesetinstance_id, 
--- a/model/src-db/database/model/functions/C_INVOICE_POST.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/functions/C_INVOICE_POST.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -635,8 +635,8 @@
             v_UpdatedBy, IsSOTrx, v_RDocumentNo, 'DR',
              'CO', 'N', 'N', v_DoctypeReversed_ID,
             v_DoctypeReversed_ID, '(*R*: ' || DocumentNo || ') ' || COALESCE(TO_CHAR(Description), ''), SalesRep_ID,
-            now(), NULL, 'N', NULL,
-            now(), C_PaymentTerm_ID, C_BPartner_ID, C_BPartner_Location_ID,
+            TRUNC(now()), NULL, 'N', NULL,
+            TRUNC(now()), C_PaymentTerm_ID, C_BPartner_ID, C_BPartner_Location_ID,
             AD_User_ID, POReference, DateOrdered, IsDiscountPrinted,
             C_Currency_ID, PaymentRule, C_Charge_ID, ChargeAmt * -1,
             0, 0, --Totals are recalculed adding invoice lines
@@ -705,7 +705,8 @@
               gross_unit_price, line_gross_amount,
               isdeferred, defplantype, periodnumber, c_period_id,
               c_bpartner_id, c_project_id, c_projectline_id, a_asset_id,
-              user1_id, user2_id, c_costcenter_id)
+              user1_id, user2_id, c_costcenter_id,
+              C_AUM, AUMQTY)
             VALUES
             (
               v_NextNo, Cur_InvoiceLine.AD_Client_ID, Cur_InvoiceLine.AD_Org_ID, 'Y',
@@ -718,7 +719,8 @@
               Cur_InvoiceLine.gross_unit_price, Cur_InvoiceLine.line_gross_amount * -1,
               Cur_InvoiceLine.isdeferred, Cur_InvoiceLine.defplantype, Cur_InvoiceLine.periodnumber, Cur_InvoiceLine.c_period_id,
               Cur_InvoiceLine.c_bpartner_id, Cur_InvoiceLine.c_project_id, Cur_InvoiceLine.c_projectline_id, Cur_InvoiceLine.a_asset_id,
-              Cur_InvoiceLine.user1_id, Cur_InvoiceLine.user2_id, Cur_InvoiceLine.C_CostCenter_ID
+              Cur_InvoiceLine.user1_id, Cur_InvoiceLine.user2_id, Cur_InvoiceLine.C_CostCenter_ID,
+              Cur_InvoiceLine.C_AUM, Cur_InvoiceLine.AUMQTY
             );
           INSERT INTO M_MATCHINV
             (M_MATCHINV_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE, CREATED, CREATEDBY, UPDATED, UPDATEDBY,
@@ -1282,7 +1284,8 @@
            TAXAMT, M_ATTRIBUTESETINSTANCE_ID, ISDESCRIPTION,
            QUANTITYORDER, M_PRODUCT_UOM_ID, PRICESTD,
            GROSS_UNIT_PRICE, TAXBASEAMT, LINE_GROSS_AMOUNT,
-           ISDEFERRED, DEFPLANTYPE, PERIODNUMBER, C_PERIOD_ID
+           ISDEFERRED, DEFPLANTYPE, PERIODNUMBER, C_PERIOD_ID,
+           C_AUM, AUMQTY
           )
           VALUES
           (
@@ -1295,7 +1298,8 @@
            NULL, NULL, 'N' ,
            NULL, NULL, v_Discount,
            ROUND(v_gross_unit_price, v_precision), v_Discount  ,ROUND(v_line_gross_amount, v_precision),
-           v_isdeferred_inv, v_defplantype_inv, v_periodnumber_inv, v_period_inv
+           v_isdeferred_inv, v_defplantype_inv, v_periodnumber_inv, v_period_inv,
+           NULL, NULL
           );
         --v_InvoiceDiscount:=Ad_Sequence_Nextno('C_InvoiceLine');
         UPDATE C_INVOICELINE
--- a/model/src-db/database/model/functions/C_ORDER_POST1.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/functions/C_ORDER_POST1.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -547,7 +547,7 @@
           FOR Cur_ResLine IN
             (SELECT l.M_Warehouse_ID, l.M_Product_ID, l.M_AttributeSetInstance_ID, l.C_OrderLine_ID,
                  l.QtyOrdered AS Qty, l.QUANTITYORDER, l.qtyreserved, l.qtydelivered,
-                l.C_UOM_ID, l.M_PRODUCT_UOM_ID
+                l.C_UOM_ID, l.M_PRODUCT_UOM_ID, l.C_AUM
              FROM C_ORDERLINE l, M_PRODUCT p
              WHERE l.C_Order_ID=v_Record_ID  -- Reserve Products (not: services, null products)
                AND l.M_Product_ID=p.M_Product_ID
@@ -563,7 +563,7 @@
               v_QtyOrderPO:=NULL;
               IF (Cur_ResLine.QtyDelivered=0) THEN
                 v_QtyOrderPO := -Cur_ResLine.QuantityOrder;
-              ELSIF Cur_ResLine.M_Product_UOM_ID IS NOT NULL THEN
+              ELSIF Cur_ResLine.C_AUM IS NULL AND Cur_ResLine.M_Product_UOM_ID IS NOT NULL THEN
                 SELECT c_uom_id
                 INTO v_UOM_ID
                 FROM m_product_uom
@@ -574,7 +574,7 @@
               v_QtySO:=-Cur_ResLine.QtyReserved;
               IF (Cur_ResLine.QtyReserved=Cur_ResLine.Qty) THEN
                 v_QtyOrderSO := -Cur_ResLine.QuantityOrder;
-              ELSIF Cur_ResLine.M_Product_UOM_ID IS NOT NULL THEN
+              ELSIF Cur_ResLine.C_AUM IS NULL AND Cur_ResLine.M_Product_UOM_ID IS NOT NULL THEN
                 SELECT c_uom_id
                 INTO v_UOM_ID
                 FROM m_product_uom
@@ -697,6 +697,7 @@
 	      M_Warehouse_ID,
 	      M_AttributeSetInstance_ID,
 	      C_UOM_ID,
+             C_AUM,
 	      M_PRODUCT_UOM_ID,
           C_Currency_ID
 	      FROM C_ORDERLINE
@@ -716,9 +717,9 @@
               INTO v_ProductUOM
               FROM M_PRODUCT_UOM UOM 
               WHERE UOM.M_PRODUCT_UOM_ID=Cur_Inventory.M_PRODUCT_UOM_ID;
-              v_QuantityOrder := CASE WHEN Cur_Inventory.M_PRODUCT_UOM_ID IS NULL THEN Cur_Inventory.QuantityOrder
-                                ELSE (c_uom_convert((CASE WHEN (Cur_Inventory.QtyDelivered < 0) THEN LEAST(Cur_Inventory.QtyDelivered, Cur_Inventory.QtyInvoiced) ELSE GREATEST(Cur_Inventory.QtyDelivered, Cur_Inventory.QtyInvoiced) END),
-                    Cur_Inventory.C_UOM_ID, v_ProductUOM,'Y')) END;
+              v_QuantityOrder := CASE WHEN Cur_Inventory.C_AUM IS NOT NULL OR (Cur_Inventory.C_AUM IS NULL AND Cur_Inventory.M_PRODUCT_UOM_ID IS NULL) THEN Cur_Inventory.QuantityOrder
+                                 ELSE (c_uom_convert((CASE WHEN (Cur_Inventory.QtyDelivered < 0) THEN LEAST(Cur_Inventory.QtyDelivered, Cur_Inventory.QtyInvoiced) ELSE GREATEST(Cur_Inventory.QtyDelivered, Cur_Inventory.QtyInvoiced) END), 
+              Cur_Inventory.C_UOM_ID, v_ProductUOM,'Y')) END;
 
               IF (Cur_Inventory.QtyOrdered <> v_QtyOrdered) THEN
                 M_UPDATE_STORAGE_PENDING(v_Client_ID, v_Org_ID, v_UpdatedBy, Cur_Inventory.M_Product_ID, Cur_Inventory.M_Warehouse_ID, Cur_Inventory.M_AttributeSetInstance_ID,
@@ -754,6 +755,7 @@
 	        M_Warehouse_ID,
 	        M_AttributeSetInstance_ID,
 	        C_UOM_ID,
+               C_AUM,
 	        M_PRODUCT_UOM_ID,
 	        C_Currency_ID
               FROM C_ORDERLINE
@@ -776,13 +778,14 @@
               v_QtyOrdered := COALESCE(CASE WHEN (Cur_Inventory.QtyDelivered < 0) THEN LEAST(Cur_Inventory.QtyDelivered, Cur_Inventory.QtyInvoiced) ELSE GREATEST(Cur_Inventory.QtyDelivered, Cur_Inventory.QtyInvoiced) END, 0);
               v_linenetamt := ROUND(COALESCE(v_QtyOrdered, 0) * Cur_Inventory.priceactual, C_GET_CURRENCY_PRECISION(Cur_Inventory.C_Currency_ID, 'A'));
               v_linegrossamt := ROUND(COALESCE(v_QtyOrdered, 0) * Cur_Inventory.gross_unit_price, C_GET_CURRENCY_PRECISION(Cur_Inventory.C_Currency_ID, 'A'));
+
               SELECT MAX(UOM.C_UOM_ID)
               INTO v_ProductUOM
               FROM M_PRODUCT_UOM UOM 
               WHERE UOM.M_PRODUCT_UOM_ID=Cur_Inventory.M_PRODUCT_UOM_ID;
-              v_QuantityOrder := CASE WHEN Cur_Inventory.M_PRODUCT_UOM_ID IS NULL THEN Cur_Inventory.QuantityOrder
-                                ELSE (COALESCE(c_uom_convert((CASE WHEN (Cur_Inventory.QtyDelivered < 0) THEN LEAST(Cur_Inventory.QtyDelivered, Cur_Inventory.QtyInvoiced) ELSE GREATEST(Cur_Inventory.QtyDelivered, Cur_Inventory.QtyInvoiced) END),
-                    Cur_Inventory.C_UOM_ID, v_ProductUOM,'Y'), 0)) END;
+              v_QuantityOrder := CASE WHEN Cur_Inventory.C_AUM IS NOT NULL OR (Cur_Inventory.C_AUM IS NULL AND Cur_Inventory.M_PRODUCT_UOM_ID IS NULL) THEN Cur_Inventory.QuantityOrder
+                                 ELSE (COALESCE(c_uom_convert((CASE WHEN (Cur_Inventory.QtyDelivered < 0) THEN LEAST(Cur_Inventory.QtyDelivered, Cur_Inventory.QtyInvoiced) ELSE GREATEST(Cur_Inventory.QtyDelivered, Cur_Inventory.QtyInvoiced) END),
+              Cur_Inventory.C_UOM_ID, v_ProductUOM,'Y'), 0)) END;
               IF (Cur_Inventory.QtyOrdered <> v_QtyOrdered) THEN
                 M_UPDATE_STORAGE_PENDING(v_Client_ID, v_Org_ID, v_UpdatedBy, Cur_Inventory.M_Product_ID, Cur_Inventory.M_Warehouse_ID, Cur_Inventory.M_AttributeSetInstance_ID,
                 Cur_Inventory.C_UOM_ID, Cur_Inventory.M_PRODUCT_UOM_ID, 0, null, -(Cur_Inventory.QtyOrdered - v_QtyOrdered), -(Cur_Inventory.QuantityOrder - v_QuantityOrder));
@@ -824,7 +827,7 @@
         UPDATE C_ORDERLINE
           SET QtyOrdered=0,
           --MODIFIED BY F.IRIAZABAL
-          QuantityOrder = CASE WHEN M_PRODUCT_UOM_ID IS NULL THEN NULL ELSE 0 END,
+          QuantityOrder = CASE WHEN C_AUM IS NOT NULL OR (C_AUM IS NULL AND M_PRODUCT_UOM_ID IS NULL) THEN NULL ELSE 0 END,
           LineNetAmt=0,
           Updated=now()
         WHERE C_Order_ID=v_Record_ID
@@ -999,7 +1002,7 @@
                   qtyreserved, qtydelivered, qtyinvoiced, m_shipper_id, c_currency_id,
                   pricelist, priceactual, pricelimit, linenetamt, discount, freightamt,
                   c_charge_id, chargeamt, c_tax_id, s_resourceassignment_id, ref_orderline_id,
-                  m_attributesetinstance_id, isdescription, quantityorder, m_product_uom_id,
+                  m_attributesetinstance_id, isdescription, quantityorder, m_product_uom_id, aumqty, c_aum,
                   m_offer_id, pricestd, C_ORDER_DISCOUNT_ID,
                   gross_unit_price, taxbaseamt,line_gross_amount
                 )
@@ -1012,7 +1015,7 @@
                   0, 0, 0, NULL, v_c_currency_id,
                   ROUND(v_Discount,v_precision), ROUND(v_Discount,v_precision), ROUND(v_Discount,v_precision), ROUND(v_Discount,v_precision), 0, 0,
                   NULL, NULL, Cur_TaxDiscount.C_TAX_ID, NULL, NULL,
-                  NULL, 'N', NULL, NULL,
+                  NULL, 'N', NULL, NULL, NULL, NULL,
                   NULL, ROUND(v_Discount,v_precision), NULL,
                   ROUND(v_gross_unit_price, v_precision), ROUND(v_Discount,v_precision),ROUND(v_line_gross_amount, v_precision)
                 );
@@ -1150,7 +1153,7 @@
                 -- Target Level = 0 if DirectShip='Y' or Binding='N'
                 (CASE l.DirectShip WHEN 'Y' THEN 0 ELSE (CASE v_IsBinding WHEN 'N' THEN 0 ELSE l.QtyOrdered END) END)
                  -l.QtyReserved-l.QtyDelivered AS Qty, l.QUANTITYORDER,
-                l.QtyReserved, l.QtyDelivered, l.DatePromised, l.C_UOM_ID,
+                l.QtyReserved, l.QtyDelivered, l.DatePromised, l.C_UOM_ID, l.C_AUM,
                 l.M_PRODUCT_UOM_ID
               FROM C_ORDERLINE l, M_PRODUCT p
               WHERE l.C_Order_ID=v_Record_ID
@@ -1168,7 +1171,7 @@
               v_QtyOrderSO := NULL;
               IF (Cur_ResLine.QtyReserved = 0 AND Cur_ResLine.QtyDelivered = 0) THEN
                 v_QtyOrderSO := Cur_ResLine.QuantityOrder;
-              ELSIF (Cur_ResLine.M_Product_UOM_ID IS NOT NULL) THEN
+              ELSIF (Cur_ResLine.C_AUM IS NULL AND Cur_ResLine.M_Product_UOM_ID IS NOT NULL) THEN
                 SELECT c_uom_id
                 INTO v_UOM_ID
                 FROM m_product_uom
@@ -1184,7 +1187,7 @@
               v_QtyOrderPO := NULL;
               IF (Cur_ResLine.QtyReserved = 0 AND Cur_ResLine.QtyDelivered = 0) THEN
                 v_QtyOrderPO := Cur_ResLine.QuantityOrder;
-              ELSIF (Cur_ResLine.M_Product_UOM_ID IS NOT NULL) THEN
+              ELSIF (Cur_ResLine.C_AUM IS NULL AND Cur_ResLine.M_Product_UOM_ID IS NOT NULL) THEN
                 SELECT c_uom_id
                 INTO v_UOM_ID
                 FROM m_product_uom
--- a/model/src-db/database/model/functions/C_PERIOD_PROCESS.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/functions/C_PERIOD_PROCESS.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -146,6 +146,14 @@
           END LOOP;
         END IF;
         
+        -- Remove entries from the aggregated table when the Period is opened.
+        -- All entries with a date greater or equal must be deleted
+        DELETE FROM m_valued_stock_agg
+        WHERE datefrom >= (SELECT startdate
+                           FROM c_period
+                           WHERE c_period_id = p_C_Period_ID)
+        AND ad_org_id = p_Organization;
+        
         -- Action: Close if not permanently closed
       ELSIF(p_PeriodAction='C') THEN
         IF (p_IsRecursive='Y') THEN
--- a/model/src-db/database/model/functions/M_COPY_PRODUCT_TEMPLATE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/functions/M_COPY_PRODUCT_TEMPLATE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -49,6 +49,10 @@
     v_Issotrx CHAR;
     v_NoOfLines NUMBER:=0;
     v_projectID varchar2(32);
+    v_doctypeID C_ORDER.C_DOCTYPE_ID%TYPE;
+    v_aum C_ORDERLINE.C_AUM%TYPE;
+    v_aumQty NUMBER:=0;
+    v_rate NUMBER:=1;
     -- Copy
     Cur_ProductTemplate RECORD;
   BEGIN
@@ -78,10 +82,10 @@
     v_ResultStr:='ReadingOrder';
     SELECT AD_CLIENT_ID, AD_ORG_ID, CREATEDBY, DATEORDERED,
       C_BPARTNER_ID, BILLTO_ID, C_BPARTNER_LOCATION_ID, C_CURRENCY_ID,
-      M_WAREHOUSE_ID, M_PRICELIST_ID, C_PROJECT_ID, ISSOTRX
+      M_WAREHOUSE_ID, M_PRICELIST_ID, C_PROJECT_ID, ISSOTRX, C_DOCTYPE_ID
     INTO v_client, v_org, v_Createdby, v_Dateordered,
       v_Bpartner, v_BillTo, v_BpartnerLocation, v_Currency,
-      v_Warehouse, v_Mpricelist, v_projectID, v_Issotrx
+      v_Warehouse, v_Mpricelist, v_projectID, v_Issotrx, v_doctypeID
     FROM C_ORDER
     WHERE C_Order_ID=v_Record_ID;
     SELECT COALESCE(MAX(C_ORDERLINE.line), 10)
@@ -126,6 +130,23 @@
       INTO v_tax
       FROM DUAL;
       v_Discount:=(v_Pricelist - v_Pricestd) /v_Pricelist;
+      
+      --Get Default AUM
+      v_aum := M_GET_DEFAULT_AUM_FOR_DOCUMENT(Cur_ProductTemplate.M_PRODUCT_ID, v_DocTypeID);
+
+      --Calculate the aumqty if the AUM is different than the BUM
+      IF(v_aum = Cur_ProductTemplate.C_UOM_ID) THEN
+        v_aumQty:= Cur_ProductTemplate.QTY;
+      ELSE
+        --Find the AUM conversion rate and use it to calcule the aumQty
+        SELECT CONVERSIONRATE
+          INTO v_rate
+        FROM m_product_aum
+        WHERE m_product_aum_id = v_aum;
+
+        v_aumQty:= Cur_ProductTemplate.QTY / v_rate;
+      END IF;
+
       -- Get next no
       Ad_Sequence_Next('C_OrderLine', v_client, v_CorderId) ;
       -- Insert
@@ -143,7 +164,7 @@
           FREIGHTAMT, C_CHARGE_ID, CHARGEAMT, C_TAX_ID,
           S_RESOURCEASSIGNMENT_ID, REF_ORDERLINE_ID,
           M_ATTRIBUTESETINSTANCE_ID, ISDESCRIPTION, QUANTITYORDER, M_PRODUCT_UOM_ID,
-          PriceStd
+          PriceStd, c_aum, aumqty
         )
         VALUES
         (
@@ -158,9 +179,8 @@
           0, NULL, 0, v_tax,
           NULL, NULL,
           NULL, 'N', NULL, NULL,
-          v_Pricestd
-        )
-        ;
+          v_Pricestd, v_aum, v_aumQty
+        );
       -- update translation
       --
       v_SeqNo:=v_SeqNo + 10;
--- a/model/src-db/database/model/functions/M_EXPLODEBOMNOTSTOCK.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/functions/M_EXPLODEBOMNOTSTOCK.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -19,7 +19,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2013-2015 Openbravo SLU
+* All portions are Copyright (C) 2013-2016 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -48,6 +48,10 @@
   v_istaxincluded CHAR(1);
   v_BaseAmount  VARCHAR2(32);
   v_orderline_ID  VARCHAR2(32);
+  v_aum C_ORDERLINE.C_AUM%TYPE;
+  v_aumqty NUMBER;
+  v_count NUMBER;
+  v_uom_preference AD_PREFERENCE.VALUE%TYPE;
   
   BEGIN
   IF (p_PInstance_ID IS NOT NULL) THEN
@@ -104,10 +108,21 @@
       v_IsTaxIncluded:=Cur_MPriceListVersion.IsTaxIncluded;
       EXIT;
     END LOOP;
+
+    -- Get AUM
+    v_uom_preference := 'N';      
+    BEGIN
+      v_uom_preference := AD_GET_PREFERENCE_VALUE('UomManagement', 'Y', NULL, NULL, NULL, NULL, NULL);
+    EXCEPTION
+      WHEN OTHERS THEN
+      -- Nothing to do, v_uom_preference = 'N'
+      DBMS_OUTPUT.PUT_LINE('The preference UomManagement was not found') ;
+    END;
+
     -- Replace Lines
     v_ResultStr:='Inserting lines';
     For Cur_Bom_Line In
-      (SELECT l.*,o.M_Warehouse_ID as ord_m_warehouse_id,o.C_BPartner_Location_ID as ord_C_BPartner_Location_ID,o.issotrx
+      (SELECT l.*,o.M_Warehouse_ID as ord_m_warehouse_id,o.C_BPartner_Location_ID as ord_C_BPartner_Location_ID,o.issotrx, o.c_doctypetarget_id as ord_c_doctype_id
        FROM C_ORDERLINE l,c_order o
        WHERE l.C_Orderline_ID=v_Record_ID
          AND l.c_order_id=o.c_order_id
@@ -152,8 +167,15 @@
 					v_gross_price_list:=0;
 					v_price_actual:=M_Get_Offers_Price(CUR_BOM_Line.DateOrdered, v_CBPartner_ID, CUR_BOM.M_ProductBOM_ID, M_BOM_PriceStd(CUR_BOM.M_ProductBOM_ID, v_PriceList_Version_ID), CUR_BOM_Line.QtyInvoiced*CUR_BOM.BOMQty, v_PriceList_ID);
 					v_line_net_amt:=ROUND(CUR_BOM_Line.QtyOrdered*CUR_BOM.BOMQty*v_gross_unit_price, v_Precision);
-				END IF;
-
+				END IF;				
+    
+        v_Aum := NULL;
+        v_AumQty := NULL;
+        IF (v_uom_preference = 'Y') THEN
+          v_aum := M_GET_DEFAULT_AUM_FOR_DOCUMENT(CUR_BOM.M_ProductBOM_ID, CUR_BOM_Line.ord_c_doctype_id);
+          v_aumqty := M_GET_CONVERTED_QTY(CUR_BOM.M_ProductBOM_ID, CUR_BOM_Line.QtyOrdered, v_aum); 
+        END IF;
+      
         v_Line:=v_Line + 1;
         v_orderline_ID:=get_uuid();
         INSERT
@@ -172,7 +194,8 @@
             QuantityOrder, M_Product_Uom_ID, PriceStd,
             c_project_id, a_asset_id, c_costcenter_id,
             user1_id, user2_id, bom_parent_id,
-            gross_unit_price, grosspricelist, line_gross_amount
+            gross_unit_price, grosspricelist, line_gross_amount,
+            c_aum, aumqty
           )
         VALUES
           (
@@ -190,7 +213,7 @@
             CUR_BOM_Line.QuantityOrder, CUR_BOM_Line.M_Product_UOM_ID, M_BOM_PriceStd(CUR_BOM.M_ProductBOM_ID, v_PriceList_Version_ID),
             CUR_BOM_Line.c_project_id, CUR_BOM_Line.a_asset_id, CUR_BOM_Line.c_costcenter_id,
             CUR_BOM_Line.user1_id, CUR_BOM_Line.user2_id, v_Record_ID,
-            v_gross_unit_price, v_gross_price_list, v_line_gross_amount
+            v_gross_unit_price, v_gross_price_list, v_line_gross_amount, v_aum, v_aumqty*CUR_BOM.BOMQty
           );
           SELECT BASEAMOUNT
           INTO v_BaseAmount
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/functions/M_GET_CONVERTED_AUMQTY.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+  <database name="FUNCTION M_GET_CONVERTED_AUMQTY">
+    <function name="M_GET_CONVERTED_AUMQTY" type="NUMERIC">
+      <parameter name="p_mproductid" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_qty" type="NUMERIC" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_touom" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <body><![CDATA[/*************************************************************************
+* The contents of this file are subject to the Openbravo  Public  License
+* Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+* Version 1.1  with a permitted attribution clause; you may not  use this
+* file except in compliance with the License. You  may  obtain  a copy of
+* the License at http://www.openbravo.com/legal/license.html
+* Software distributed under the License  is  distributed  on  an "AS IS"
+* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+* License for the specific  language  governing  rights  and  limitations
+* under the License.
+* The Original Code is Openbravo ERP.
+* The Initial Developer of the Original Code is Openbravo SLU
+* All portions are Copyright (C) 2016 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+*
+* This function receives a qty in the unit of measure defined to a 
+* product and returns it transformed in an alternative unit of measure. 
+* 
+*  Parameters:
+*    p_mproductid character varying: The product id 
+*    p_qty numeric: The quantity to convert 
+*    p_touom character varying: The destination unit of measure
+*  Returns:
+*    The quantity converted using the conversion rate between the unit of 
+*    measure of the product and the AUM passed at parameter, or the same 
+*    qty if any conversion can be applied.
+************************************************************************/
+
+  v_rate NUMBER:= NULL;
+  v_result NUMBER:= NULL;
+  v_bum VARCHAR(32);
+  v_precision NUMBER;
+
+BEGIN
+
+  -- Nothing to do
+  IF(p_mProductId IS NULL OR p_toUOM IS NULL OR p_qty IS NULL OR p_qty = 0) THEN
+    RETURN p_qty;
+  END IF;
+
+  SELECT c_uom_id INTO v_bum FROM M_PRODUCT WHERE M_PRODUCT_ID = p_mProductId;
+  IF v_bum = p_toUOM THEN
+    RETURN p_qty;
+  END IF;
+
+  v_result := p_qty;
+
+  -- Get Conversion Rate
+  SELECT conversionrate INTO v_rate
+      FROM m_product_aum
+      WHERE m_product_id = p_mProductId
+      AND c_uom_id = p_toUOM;
+
+  IF(v_rate IS NOT NULL) THEN
+    v_result := p_qty / v_rate;
+  END IF;
+
+  SELECT stdprecision INTO v_precision FROM c_uom WHERE c_uom_id = p_toUOM;
+  v_result := ROUND(v_result, v_precision);
+  
+  RETURN v_result;
+END M_GET_CONVERTED_AUMQTY
+]]></body>
+    </function>
+  </database>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/functions/M_GET_CONVERTED_QTY.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+  <database name="FUNCTION M_GET_CONVERTED_QTY">
+    <function name="M_GET_CONVERTED_QTY" type="NUMERIC">
+      <parameter name="p_mproductid" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_qty" type="NUMERIC" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_touom" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <body><![CDATA[/*************************************************************************
+* The contents of this file are subject to the Openbravo  Public  License
+* Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+* Version 1.1  with a permitted attribution clause; you may not  use this
+* file except in compliance with the License. You  may  obtain  a copy of
+* the License at http://www.openbravo.com/legal/license.html
+* Software distributed under the License  is  distributed  on  an "AS IS"
+* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+* License for the specific  language  governing  rights  and  limitations
+* under the License.
+* The Original Code is Openbravo ERP.
+* The Initial Developer of the Original Code is Openbravo SLU
+* All portions are Copyright (C) 2016 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+*
+* This function receives a qty in the AUM defined to a product and returns
+* it transformed in the BUM of the product.
+*
+*  Parameters:
+*    p_mproductid character varying: The product id
+*    p_qty numeric: The quantity to convert
+*    p_touom character varying: The destination unit of measure
+*  Returns:
+*    The quantity converted using the conversion rate between the
+*    alternative unit of measure of the product and the BUM passed at
+*    parameter, or the same qty if any conversion can be applied.
+************************************************************************/
+
+  v_rate NUMBER:= NULL;
+  v_result NUMBER:= NULL;
+  v_bum VARCHAR(32);
+  v_precision NUMBER;
+
+BEGIN
+
+  -- Nothing to do
+  IF(p_mProductId IS NULL OR p_toUOM IS NULL OR p_qty IS NULL OR p_qty = 0) THEN
+    RETURN p_qty;
+  END IF;
+
+  SELECT c_uom_id INTO v_bum FROM M_PRODUCT WHERE M_PRODUCT_ID = p_mProductId;
+  IF v_bum = p_toUOM THEN
+    RETURN p_qty;
+  END IF;
+  
+  v_result := p_qty;
+
+  -- Get Conversion Rate
+  SELECT conversionrate INTO v_Rate
+      FROM m_product_aum
+      WHERE m_product_id = p_mProductId
+      AND c_uom_id = p_toUOM;
+
+  IF(v_rate IS NOT NULL) THEN
+    v_result := p_qty * v_rate;
+  END IF;
+
+  SELECT stdprecision INTO v_precision FROM c_uom WHERE c_uom_id = p_toUOM;
+  v_result := ROUND(v_result, v_precision);
+
+  RETURN v_result;
+END M_GET_CONVERTED_QTY
+]]></body>
+    </function>
+  </database>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/functions/M_GET_DEFAULT_AUM_FOR_DOCUMENT.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+  <database name="FUNCTION M_GET_DEFAULT_AUM_FOR_DOCUMENT">
+    <function name="M_GET_DEFAULT_AUM_FOR_DOCUMENT" type="VARCHAR">
+      <parameter name="mproductid" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="documenttypeid" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <body><![CDATA[/*************************************************************************
+* The contents of this file are subject to the Openbravo  Public  License
+* Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+* Version 1.1  with a permitted attribution clause; you may not  use this
+* file except in compliance with the License. You  may  obtain  a copy of
+* the License at http://www.openbravo.com/legal/license.html
+* Software distributed under the License  is  distributed  on  an "AS IS"
+* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+* License for the specific  language  governing  rights  and  limitations
+* under the License.
+* The Original Code is Openbravo ERP.
+* The Initial Developer of the Original Code is Openbravo SLU
+* All portions are Copyright (C) 2016 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+*
+* This function returns the default AUM defined for a product and specific
+* document type.
+*
+*  Parameters:
+*    p_mproductid character varying: The product id
+*    documenttypeid character varying: The document type id.
+*  Returns:
+*    The default AUM defined for the product and document type.
+************************************************************************/
+
+  TYPE RECORD IS REF CURSOR;
+  Cur_M_Product_Aum RECORD;
+  v_isSOTRX char(1);
+  v_Default_Aum varchar(32); --OBTG:VARCHAR2--
+BEGIN
+
+  SELECT issotrx INTO v_isSOTRX FROM c_doctype WHERE c_doctype_id = documentTypeId;
+
+  IF(v_isSOTRX = 'Y') THEN
+    BEGIN
+      SELECT c_uom_id
+        INTO v_Default_Aum
+      FROM m_product_aum
+      WHERE m_product_id = mProductId
+      AND sales = 'P';
+    EXCEPTION 
+      WHEN NO_DATA_FOUND THEN
+        v_Default_Aum := NULL;
+    END;
+  ELSE
+    BEGIN
+      SELECT c_uom_id
+        INTO v_Default_Aum
+      FROM m_product_aum
+      WHERE m_product_id = mProductId
+      AND purchase = 'P';
+    EXCEPTION
+      WHEN NO_DATA_FOUND THEN
+        v_Default_Aum := NULL;
+    END;
+  END IF;
+  
+  IF v_Default_Aum IS NULL THEN
+    SELECT c_uom_id
+    INTO v_Default_Aum
+    FROM m_product
+    WHERE m_product_id = mProductId;
+  END IF;
+  
+  RETURN v_Default_Aum;
+END M_GET_DEFAULT_AUM_FOR_DOCUMENT
+]]></body>
+    </function>
+  </database>
--- a/model/src-db/database/model/functions/M_INITIALIZE_STOCK_VALUATION.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/functions/M_INITIALIZE_STOCK_VALUATION.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -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/model/src-db/database/model/functions/M_INOUTEXPLODEBOMNOTSTOCK.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/functions/M_INOUTEXPLODEBOMNOTSTOCK.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -35,6 +35,11 @@
   v_Line NUMBER:=0;
   v_ResultStr VARCHAR2(2000):='';
   v_result NUMBER:= 1;  
+  v_aum C_ORDERLINE.C_AUM%TYPE;
+  v_aumqty NUMBER;
+  v_count NUMBER;
+  v_uom_preference AD_PREFERENCE.VALUE%TYPE;
+  
   BEGIN
   IF (p_PInstance_ID IS NOT NULL) THEN
       --  Update AD_PInstance
@@ -73,14 +78,25 @@
     END IF;
     
     v_ResultStr:='Exploding';
+
+    -- Get AUM
+    v_uom_preference := 'N';      
+    BEGIN
+      v_uom_preference := AD_GET_PREFERENCE_VALUE('UomManagement', 'Y', NULL, NULL, NULL, NULL, NULL);
+    EXCEPTION
+      WHEN OTHERS THEN
+      -- Nothing to do, v_uom_preference = 'N'
+      DBMS_OUTPUT.PUT_LINE('The preference UomManagement was not found') ;
+    END;
  
     -- Replace Lines
     v_ResultStr:='Inserting lines';
     FOR CUR_BOM_Line IN
-      (SELECT *
+      (SELECT l.*, i.c_doctype_id as io_c_doctype_id
        FROM M_INOUTLINE l
+       JOIN M_INOUT i ON (l.m_inout_id = i.m_inout_id)
        WHERE l.m_inoutline_ID=v_Record_ID
-         AND IsActive='Y'
+         AND l.IsActive='Y'
          AND EXISTS
            (SELECT *
             FROM M_PRODUCT p
@@ -102,6 +118,14 @@
          ORDER BY Line
          )
       LOOP
+  
+        v_Aum := NULL;
+        v_AumQty := NULL;
+        IF (v_uom_preference = 'Y') THEN
+          v_aum := M_GET_DEFAULT_AUM_FOR_DOCUMENT(CUR_BOM.M_ProductBOM_ID, CUR_BOM_Line.io_c_doctype_id);
+          v_aumqty := M_GET_CONVERTED_QTY(CUR_BOM.M_ProductBOM_ID, CUR_BOM_Line.movementqty, v_aum); 
+        END IF;      
+
         v_Line:=v_Line + 1;
         INSERT
         INTO M_INOUTLINE
@@ -112,7 +136,8 @@
             C_UOM_ID,MovementQty,
             IsInvoiced, QuantityOrder, M_PRODUCT_UOM_ID,
             A_ASSET_ID, C_PROJECT_ID, C_COSTCENTER_ID,
-            USER1_ID, USER2_ID, C_BPARTNER_ID, bom_parent_id
+            USER1_ID, USER2_ID, C_BPARTNER_ID, bom_parent_id,
+            c_aum, aumqty
           )
         VALUES
           (
@@ -122,7 +147,8 @@
             CUR_BOM.C_UOM_ID, CUR_BOM_Line.MovementQty*CUR_BOM.BOMQty, 
             'N', CUR_BOM_Line.QuantityOrder, CUR_BOM_Line.M_Product_UOM_ID,
             CUR_BOM_Line.a_asset_id, CUR_BOM_Line.c_project_id, CUR_BOM_Line.c_costcenter_id,
-            CUR_BOM_Line.user1_id, CUR_BOM_Line.user2_id, CUR_BOM_Line.C_BPartner_ID, v_Record_ID
+            CUR_BOM_Line.user1_id, CUR_BOM_Line.user2_id, CUR_BOM_Line.C_BPartner_ID, v_Record_ID, 
+            v_aum, v_aumqty*CUR_BOM.BOMQty
           );
       END LOOP; -- Create New Lines
     END LOOP; -- Replace Lines
--- a/model/src-db/database/model/functions/M_INOUT_CREATE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/functions/M_INOUT_CREATE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -85,7 +85,7 @@
       l.M_Product_ID IS NULL)) -- Don't include Direct Ship's
       AND
       DirectShip='N' 
-    ORDER BY l.line, l.M_Product_ID, l.M_Warehouse_id, l.c_uom_id, l.m_attributesetinstance_id, 
+    ORDER BY l.line, l.M_Product_ID, l.M_Warehouse_id, l.c_uom_id, l.c_aum, l.m_attributesetinstance_id, 
       l.m_product_uom_id, qtyordered-qtydelivered;
     ol Cur_OrderLine%ROWTYPE;
     CURSOR Cur_Storage (v_ad_pinstance_id varchar, v_inout_id varchar) IS
@@ -105,7 +105,7 @@
                                          AND iol.m_inout_id = v_inout_id
       WHERE ms.ad_pinstance_id = v_ad_pinstance_id
       GROUP BY sd.m_product_id, sd.m_locator_id, sd.m_attributesetinstance_id, sd.c_uom_id,
-          sd.m_product_uom_id, u.stdprecision, ms.quantity, ms.qtyorder, ms.priority
+          sd.m_product_uom_id, u.stdprecision, ms.quantity, ms.qtyorder, ms.priority, iol.c_aum, iol.aumqty
       HAVING ms.quantity - COALESCE(SUM(iol.movementqty), 0) > 0
       ORDER BY ms.priority;
 
@@ -148,6 +148,9 @@
   v_DeliveryRule CHAR(1);
   v_isreturn C_Doctype.IsReturn%TYPE;
   v_returnbin M_Warehouse.M_ReturnLocator_ID%TYPE;
+  v_uom_preference AD_PREFERENCE.VALUE%TYPE;
+  v_c_aum C_ORDERLINE.C_AUM%TYPE;
+  v_aumqty NUMBER;
 
 BEGIN
   -- Process Parameters
@@ -208,6 +211,13 @@
     AND c_order_id = v_record_id;
   END IF;
 BEGIN --BODY
+
+  -- Get UOMPreference value
+  SELECT COUNT(1) INTO v_count FROM ad_preference WHERE property = 'UomManagement';
+  IF (v_count > 0) THEN
+    v_uom_preference := AD_GET_PREFERENCE_VALUE('UomManagement', 'Y', NULL, v_AD_Org_ID, v_User_ID, NULL, NULL);
+  END IF;
+
   IF(NOT CREATE_FROM_INVOICE) THEN
     -- May be NULL or 0
     IF(v_Record_ID IS NULL) THEN
@@ -454,6 +464,7 @@
             IF (v_Qty=0 AND ol.M_Product_ID IS NOT NULL) THEN
               Next_Line:=true;
             END IF;
+
             IF (NOT Next_Line) THEN
               -- Is it a standard stocked product?
               v_isstocked := 0;
@@ -464,6 +475,7 @@
                   AND IsStocked='Y'
                   AND ProductType='I';
               END IF;
+
               -- Item is stocked - check availability
               IF (v_IsStocked <> 0) THEN
                 -- check every locator availability and if qty available
@@ -524,6 +536,7 @@
                   CLOSE Cur_Storage;
                   Cur_Storage_ISOPEN:=false;
                 END IF;
+
                 IF (NOT NEXT_PRODUCT) THEN
                   v_QtyStorage:=v_storage.QtyOnHand;
                   LOOP
@@ -539,12 +552,23 @@
                     IF (v_storage.M_Product_UOM_ID IS NOT NULL) THEN
                       v_ActualQty:=ROUND(v_storage.QtyOrder*(v_LocatorQty/v_storage.QtyOnHand), v_storage.stdprecision) ;
                     END IF;
+
                     IF (v_LocatorQty <> 0) THEN
                       -- Create InOut Line
                       Ad_Sequence_Next('M_InOutLine', Cur_Order.C_Order_ID, v_NextNo) ;
                       --
                       DBMS_OUTPUT.PUT_LINE('    Line ' || ol.Line || '  Qty=' || v_LocatorQty) ;
                       v_ResultStr:='CreateInOutLine';
+
+                      IF (v_uom_preference = 'Y' AND v_storage.M_Product_UOM_ID IS NULL) THEN
+                        IF (ol.c_aum IS NULL) THEN
+                          v_c_aum := M_GET_DEFAULT_AUM_FOR_DOCUMENT(ol.M_Product_ID, v_DocType_ID);
+                        ELSE
+                          v_c_aum := ol.c_aum;
+                        END IF;
+                        v_aumqty := M_GET_CONVERTED_AUMQTY(ol.M_Product_ID, v_LocatorQty, v_c_aum);
+                      END IF;
+
                       INSERT INTO M_INOUTLINE
                         (M_InOutLine_ID, Line, M_InOut_ID, C_OrderLine_ID,
                         AD_Client_ID, AD_Org_ID, IsActive, Created,
@@ -555,7 +579,9 @@
                         QuantityOrder, M_Product_Uom_ID, M_AttributeSetInstance_ID,
                         C_Project_ID, A_Asset_ID, 
                         C_CostCenter_ID, User1_ID, User2_ID, 
-                        explode, bom_parent_id)
+                        explode,
+                        bom_parent_id,
+                        c_aum, aumqty)
                       VALUES
                         (v_NextNo, v_lines, p_InOut_ID, ol.C_OrderLine_ID,
                         ol.AD_Client_ID, ol.AD_Org_ID, 'Y', now(),
@@ -566,10 +592,13 @@
                         v_ActualQty, v_storage.M_PRODUCT_UOM_ID, v_storage.M_AttributeSetInstance_ID,
                         coalesce(ol.C_Project_ID, Cur_Order.C_Project_ID), coalesce(ol.A_Asset_ID, Cur_Order.A_Asset_ID), 
                         coalesce(ol.C_CostCenter_ID, Cur_Order.C_CostCenter_ID), coalesce(ol.User1_ID, Cur_Order.User1_ID), coalesce(ol.User2_ID, Cur_Order.User2_ID),
-                        ol.explode, (select m_inoutline_id 
-                                     from m_inoutline 
-                                     where m_inout_id = p_InOut_ID
-                                       and c_orderline_id = (SELECT BOM_parent_id from c_orderline WHERE c_orderline_id = ol.C_OrderLine_ID)));
+                        ol.explode,
+                        (select m_inoutline_id 
+                         from m_inoutline 
+                         where m_inout_id = p_InOut_ID
+                           and c_orderline_id = (SELECT BOM_parent_id from c_orderline WHERE c_orderline_id = ol.C_OrderLine_ID)
+                        ),
+                        v_c_aum, v_aumqty);
                       v_lines:=v_lines + 10;
                       v_lines_per_orderline:= v_lines_per_orderline + 10;
                       DBMS_OUTPUT.PUT_LINE('v_lines' || v_lines) ;
@@ -608,6 +637,16 @@
 
                   DBMS_OUTPUT.PUT_LINE('    Line ' || ol.Line || '  Qty=' || v_LocatorQty) ;
                   v_ResultStr:='CreateInOutLine';
+
+                  v_aumqty := ol.aumqty;
+                  v_c_aum := ol.c_aum;
+                  IF (v_uom_preference = 'Y' AND ol.M_PRODUCT_UOM_ID IS NULL) THEN
+                    IF (ol.c_aum IS NULL AND ol.aumqty IS NULL) THEN
+                      v_c_aum := M_GET_DEFAULT_AUM_FOR_DOCUMENT(ol.M_Product_ID, v_DocType_ID);
+                      v_aumqty := M_GET_CONVERTED_AUMQTY(ol.M_Product_ID, v_Qty, v_c_aum);
+                    END IF;
+                  END IF;
+
                   INSERT INTO M_INOUTLINE
                     (M_InOutLine_ID, Line, M_InOut_ID, C_OrderLine_ID,
                     AD_Client_ID, AD_Org_ID, IsActive, Created,
@@ -618,7 +657,9 @@
                     QuantityOrder, M_Product_Uom_ID, M_AttributeSetInstance_ID,
                     C_Project_ID, A_Asset_ID, 
                     C_CostCenter_ID, User1_ID, User2_ID,
-                    explode, bom_parent_id)
+                    explode,
+                    bom_parent_id,
+                    c_aum, aumqty)
                   VALUES
                     (v_NextNo, v_lines, p_InOut_ID, ol.C_OrderLine_ID,
                     ol.AD_Client_ID, ol.AD_Org_ID, 'Y', now(),
@@ -629,10 +670,13 @@
                     v_ActualQty, ol.M_PRODUCT_UOM_ID, ol.M_AttributeSetInstance_ID,
                     coalesce(ol.C_Project_ID, Cur_Order.C_Project_ID), coalesce(ol.A_Asset_ID, Cur_Order.A_Asset_ID), 
                     coalesce(ol.C_CostCenter_ID, Cur_Order.C_CostCenter_ID), coalesce(ol.User1_ID, Cur_Order.User1_ID), coalesce(ol.User2_ID, Cur_Order.User2_ID),
-                    ol.explode, (select m_inoutline_id 
-                                     from m_inoutline 
-                                     where m_inout_id = p_InOut_ID
-                                       and c_orderline_id = (SELECT BOM_parent_id from c_orderline WHERE c_orderline_id = ol.C_OrderLine_ID)));
+                    ol.explode,
+                    (select m_inoutline_id 
+                     from m_inoutline 
+                     where m_inout_id = p_InOut_ID
+                       and c_orderline_id = (SELECT BOM_parent_id from c_orderline WHERE c_orderline_id = ol.C_OrderLine_ID)
+                    ),
+                    v_c_aum, v_aumqty);
                   v_lines:=v_lines + 10;
                 ELSIF (v_qty <> 0) THEN
                   IF (v_DeliveryRule = 'O') THEN
@@ -670,6 +714,16 @@
                 --
                 DBMS_OUTPUT.PUT_LINE('    Line* ' || ol.Line || '  Qty=' || v_Qty) ;
                 v_ResultStr:='CreateInOutLine*2 '||ol.c_order_id||'-'||ol.line||'-'||ol.m_product_id;
+
+                v_aumqty := ol.aumqty;
+                v_c_aum := ol.c_aum;
+                IF (v_uom_preference = 'Y' AND ol.M_PRODUCT_UOM_ID IS NULL) THEN
+                  IF (ol.c_aum IS NULL AND ol.aumqty IS NULL) THEN
+                    v_c_aum := M_GET_DEFAULT_AUM_FOR_DOCUMENT(ol.M_Product_ID, v_DocType_ID);
+                    v_aumqty := M_GET_CONVERTED_AUMQTY(ol.M_Product_ID, v_Qty, v_c_aum);
+                  END IF;
+                END IF;
+
                 INSERT INTO M_INOUTLINE
                   (M_InOutLine_ID, Line, M_InOut_ID, C_OrderLine_ID,
                   AD_Client_ID, AD_Org_ID, IsActive, Created,
@@ -680,7 +734,9 @@
                   QuantityOrder, M_Product_Uom_ID, M_AttributeSetInstance_ID,
                   C_Project_ID, A_Asset_ID, 
                   C_CostCenter_ID, User1_ID, User2_ID, 
-                  explode, bom_parent_id)
+                  explode,
+                  bom_parent_id,
+                  c_aum, aumqty)
                 VALUES
                   (v_NextNo, v_lines, p_InOut_ID, ol.C_OrderLine_ID,
                   ol.AD_Client_ID, ol.AD_Org_ID, 'Y', now(),
@@ -691,10 +747,12 @@
                   v_QtyOrder, ol.M_PRODUCT_UOM_ID, ol.M_ATTRIBUTESETINSTANCE_ID,
                   coalesce(ol.C_Project_ID, Cur_Order.C_Project_ID), coalesce(ol.A_Asset_ID, Cur_Order.A_Asset_ID), 
                   coalesce(ol.C_CostCenter_ID, Cur_Order.C_CostCenter_ID), coalesce(ol.User1_ID, Cur_Order.User1_ID), coalesce(ol.User2_ID, Cur_Order.User2_ID),
-                  ol.explode, (select m_inoutline_id 
-                                     from m_inoutline 
-                                     where m_inout_id = p_InOut_ID
-                                       and c_orderline_id = (SELECT BOM_parent_id from c_orderline WHERE c_orderline_id = ol.C_OrderLine_ID)));
+                  ol.explode,
+                  (select m_inoutline_id 
+                   from m_inoutline 
+                   where m_inout_id = p_InOut_ID
+                     and c_orderline_id = (SELECT BOM_parent_id from c_orderline WHERE c_orderline_id = ol.C_OrderLine_ID)),
+                  v_c_aum, v_aumqty);
                 v_lines:=v_lines + 10;
               END IF;
             END IF;--Next_Line
@@ -888,6 +946,16 @@
           Ad_Sequence_Next('M_InOutLine', Cur_Invoice.C_Invoice_ID, v_NextNo) ;
           DBMS_OUTPUT.PUT_LINE('    Line* ' || Cur_Lines.Line) ;
           v_ResultStr:='CreateInOutLine*3';
+
+           v_aumqty := Cur_Lines.aumqty;
+          v_c_aum := Cur_Lines.c_aum;
+          IF (v_uom_preference = 'Y' AND Cur_Lines.M_Product_Uom_ID IS NULL) THEN
+            IF (Cur_Lines.c_aum IS NULL AND Cur_Lines.aumqty IS NULL) THEN
+              v_c_aum := M_GET_DEFAULT_AUM_FOR_DOCUMENT(Cur_Lines.M_Product_ID, v_DocType_ID);
+              v_aumqty := M_GET_CONVERTED_AUMQTY(Cur_Lines.M_Product_ID, Cur_Lines.QtyInvoiced, v_c_aum);
+            END IF;
+          END IF;
+
           INSERT INTO M_INOUTLINE (
             M_InOutLine_ID, Line, M_InOut_ID, C_OrderLine_ID,
             AD_Client_ID, AD_Org_ID, IsActive, Created,
@@ -898,7 +966,9 @@
             QuantityOrder, M_Product_Uom_ID, M_AttributeSetInstance_ID,
             C_Project_ID, A_Asset_ID, 
             C_CostCenter_ID, User1_ID,
-            User2_ID, explode, bom_parent_id
+            User2_ID, explode,
+            bom_parent_id,
+            c_aum, aumqty
           ) VALUES (
             v_NextNo, Cur_Lines.Line, p_InOut_ID, Cur_Lines.C_OrderLine_ID,
             Cur_Lines.AD_Client_ID, Cur_Lines.AD_Org_ID, 'Y', now(),
@@ -909,10 +979,12 @@
             Cur_Lines.QuantityOrder, Cur_Lines.M_Product_Uom_ID, Cur_Lines.M_ATTRIBUTESETINSTANCE_ID,
             coalesce(Cur_Lines.C_Project_ID, Cur_Invoice.C_Project_ID), coalesce(Cur_Lines.A_Asset_ID, Cur_Invoice.A_Asset_ID), 
             coalesce(Cur_Lines.C_CostCenter_ID, Cur_Invoice.C_CostCenter_ID), coalesce(Cur_Lines.User1_ID, Cur_Invoice.User1_ID),
-            coalesce(Cur_Lines.User2_ID, Cur_Invoice.User2_ID), Cur_Lines.explode, (select m_inoutline_id 
-                                     from c_invoiceline
-                                     where c_invoice_id = Cur_Lines.C_Invoice_ID
-                                       and c_invoiceline_id = Cur_Lines.BOM_parent_id));
+            coalesce(Cur_Lines.User2_ID, Cur_Invoice.User2_ID), Cur_Lines.explode,
+            (select m_inoutline_id 
+             from c_invoiceline
+             where c_invoice_id = Cur_Lines.C_Invoice_ID
+               and c_invoiceline_id = Cur_Lines.BOM_parent_id),
+            v_c_aum, v_aumqty);
           UPDATE C_INVOICELINE
           SET M_INOUTLINE_ID=v_NextNo,
               Updated=now(),
--- a/model/src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -362,7 +362,8 @@
                 gross_unit_price, line_gross_amount,
                 grosspricestd, grosspricelist,
                 isdeferred, defplantype, periodnumber, c_period_id,
-                c_project_id, user1_id, user2_id, c_costcenter_id, a_asset_id
+                c_project_id, user1_id, user2_id, c_costcenter_id, a_asset_id,
+                c_aum, aumqty
               )
               VALUES
               (
@@ -381,7 +382,8 @@
                 coalesce(CUR_ShipmentLines.user1_id, CUR_Shipment.user1_id),
                 coalesce(CUR_ShipmentLines.user2_id, CUR_Shipment.user2_id),
                 coalesce(CUR_ShipmentLines.c_costcenter_id, CUR_Shipment.c_costcenter_id),
-                coalesce(CUR_ShipmentLines.a_asset_id, CUR_Shipment.a_asset_id)
+                coalesce(CUR_ShipmentLines.a_asset_id, CUR_Shipment.a_asset_id),
+                CUR_ShipmentLines.c_aum, CUR_ShipmentLines.aumqty
               )
               ;
             v_TotalNet:=v_TotalNet + v_LineNetAmt;
--- a/model/src-db/database/model/functions/M_INOUT_POST.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/functions/M_INOUT_POST.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -80,8 +80,6 @@
     v_QtyPO NUMBER;
     v_QtySO NUMBER;
     v_QuantityOrder NUMBER;
-    v_QuantityOrderPO NUMBER;
-    v_QuantityOrderSO NUMBER;
     v_RDocumentNo VARCHAR2(40) ;
     v_RInOut_ID VARCHAR2(32);
     v_IsStocked NUMBER;
@@ -530,16 +528,12 @@
               v_Qty:=- Cur_InOutLine.MovementQty;
               v_QuantityOrder:=-Cur_InOutLine.QuantityOrder;
             END IF;
-            IF(Cur_InOut.IsSOTrx='N') THEN
+            IF (Cur_InOut.IsSOTrx='N' AND v_isreturndoctype='N') THEN
               v_QtySO:=0;
               v_QtyPO:=Cur_InOutLine.MovementQty;
-              v_QuantityOrderSO:=0;
-              v_QuantityOrderPO:=Cur_InOutLine.QuantityOrder;
             ELSE
               v_QtySO:=Cur_InOutLine.MovementQty;
               v_QtyPO:=0;
-              v_QuantityOrderSO:=Cur_InOutLine.QuantityOrder;
-              v_QuantityOrderPO:=0;
             END IF;
             -- UOM Conversion
             -- Is it a standard stocked product:3
@@ -747,7 +741,7 @@
             END IF;
             v_ResultStr:='UpdateOrderLine';
             IF(Cur_InOutLine.C_OrderLine_ID IS NOT NULL) THEN
-              if(Cur_InOut.ISSOTRX='Y') THEN
+              IF (Cur_InOut.ISSOTRX='Y' OR (Cur_InOut.ISSOTRX='N' AND v_isreturndoctype='Y')) THEN
                 -- Sets DateDelivered with the recent shipment date
                 -- of the shipment/s done for the orderline.
                 SELECT MAX(M.MOVEMENTDATE) INTO v_DateDelivered
@@ -808,6 +802,48 @@
               END IF;
             END IF;
           END LOOP; -- For all InOut Lines
+
+         -- Update the C_Order.IsDelivered flag only for Sales or RTV flows
+         -- This should be extended for other flows too in the future
+         IF (v_isSoTrx='Y' OR (v_isSoTrx='N' AND v_isreturndoctype='Y')) THEN
+           FOR Cur_Order IN
+           (SELECT o.c_order_id
+            FROM C_Order o
+            WHERE EXISTS (SELECT 1
+                          FROM C_ORDERLINE ol
+                          JOIN M_INOUTLINE iol ON iol.C_ORDERLINE_ID = ol.C_ORDERLINE_ID
+                          WHERE ol.C_Order_ID = o.C_Order_ID
+                          AND iol.m_inout_id = CUR_InOut.m_inout_id
+                          )
+           )
+           LOOP
+             IF (v_IsReversedDoc = 'N') THEN
+               -- Normal Scenario
+               UPDATE C_Order o
+               SET IsDelivered = 'Y'
+               WHERE o.c_order_id = Cur_Order.c_order_id
+               AND o.IsDelivered = 'N'
+               AND EXISTS (SELECT 1
+                           FROM C_ORDERLINE ol
+                           WHERE ol.C_Order_ID = o.C_Order_ID
+                           AND ol.c_order_discount_id IS NULL
+                           GROUP BY ol.C_Order_ID
+                           HAVING SUM(ol.QTYORDERED) = SUM(ol.QTYDELIVERED));
+             ELSIF (v_IsReversedDoc = 'Y') THEN
+               -- Void Scenario
+               UPDATE C_Order o
+               SET IsDelivered = 'N'
+               WHERE o.c_order_id = Cur_Order.c_order_id
+               AND o.IsDelivered = 'Y'
+               AND EXISTS (SELECT 1
+                           FROM C_ORDERLINE ol
+                           WHERE ol.C_Order_ID = o.C_Order_ID
+                           AND ol.c_order_discount_id IS NULL
+                           AND ol.QTYORDERED <> ol.QTYDELIVERED);
+             END IF;
+           END LOOP;
+         END IF;
+
           /*******************
           * PO Matching
           ******************/
@@ -1082,7 +1118,8 @@
                 QuantityOrder, M_Product_UOM_ID, IsDescription,
                 canceled_inoutline_id, A_Asset_ID, C_Project_ID, C_BPartner_ID,
                 User1_ID, User2_ID, C_CostCenter_ID, 
-                explode
+                explode,
+                C_AUM, AUMQTY
               )
               VALUES
               (
@@ -1094,7 +1131,8 @@
                 Cur_InOutLine.QuantityOrder * -1, Cur_InOutLine.M_PRODUCT_UOM_ID, Cur_InOutLine.IsDescription,
                 Cur_InOutLine.M_InOutLine_ID, Cur_InOutLine.A_Asset_ID, Cur_InOutLine.C_Project_ID, Cur_InOutLine.C_BPartner_ID,
                 Cur_InOutLine.User1_ID, Cur_InOutLine.User2_ID, Cur_InOutLine.C_CostCenter_ID, 
-                Cur_InOutLine.explode 
+                Cur_InOutLine.explode ,
+                Cur_InOutLine.C_AUM, Cur_InOutLine.AUMQTY * -1
               )
               ;
 
--- a/model/src-db/database/model/functions/M_MOVEMENT_POST.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/functions/M_MOVEMENT_POST.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -190,8 +190,8 @@
         LOOP
           v_ResultStr:='Transaction for line' || Cur_MoveLine.Line;
 
-          IF (Cur_MoveLine.MovementQty = 0) THEN
-             RAISE_APPLICATION_ERROR(-20000,'@GoodsMovementsWithZeroQty@' || ' @Inline@ ' || Cur_MoveLine.line) ;
+          IF (Cur_MoveLine.MovementQty <= 0) THEN
+            RAISE_APPLICATION_ERROR(-20000,'@GoodsMovementsWithNegativeQty@' || ' @Inline@ ' || Cur_MoveLine.line) ;
           END IF;
           
           IF (cur_moveline.m_reservation_id IS NOT NULL) THEN
--- a/model/src-db/database/model/functions/M_PROMOTION_ADJUSTMENT.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/functions/M_PROMOTION_ADJUSTMENT.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -34,7 +34,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2016 Openbravo SLU
+* All portions are Copyright (C) 2014 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -59,34 +59,29 @@
   v_totalPromotion NUMBER;
   v_ismultiple CHAR(1);
   v_multiple NUMBER;
-  v_issotrx CHAR(1);
 BEGIN
+  select fixed, coalesce(addamt, 0), coalesce(discount, 0),
+         qty_From, qty_To, apply_next, ismultiple, multiple
+    into v_fixed, v_add, v_discount,
+         v_qty_From, v_qty_To, v_apply_next, v_ismultiple, v_multiple
+    from m_offer
+   where m_offer_id = p_rule_id;
 
-  IF (p_type ='O') THEN
-    SELECT ol.gross_unit_price, ol.c_tax_id, ol.qtyordered, ol.priceactual, ol.line_gross_amount, ol.linenetamt, o.issotrx
-    INTO v_unitprice, v_tax, v_qty, v_priceactual, v_origGrossAmt, v_origLineNetAmt, v_issotrx
-    FROM c_order o
-    JOIN c_orderline ol
-    ON o.c_order_id = ol.c_order_id
-    WHERE ol.c_orderline_id = p_line_id;
-  ELSE
-    SELECT il.gross_unit_price, il.c_tax_id, il.qtyinvoiced, il.priceactual, il.line_gross_amount, il.linenetamt, i.issotrx
-    INTO v_unitprice, v_tax, v_qty, v_priceactual, v_origGrossAmt, v_origLineNetAmt, v_issotrx
-    FROM c_invoice i
-    JOIN c_invoiceline il
-    ON i.c_invoice_id = il.c_invoice_id
-    WHERE c_invoiceline_id = p_line_id;
-  END IF;
-
-  -- Discounts and Promotions only work for Sales flow
-  IF (v_issotrx = 'N') THEN
-    RETURN v_apply_next;
-  END IF;
-
-  SELECT fixed, coalesce(addamt, 0), coalesce(discount, 0), qty_From, qty_To, apply_next, ismultiple, multiple
-  INTO v_fixed, v_add, v_discount, v_qty_From, v_qty_To, v_apply_next, v_ismultiple, v_multiple
-  FROM m_offer
-  WHERE m_offer_id = p_rule_id;
+  if (p_type ='O') then
+		select gross_unit_price, c_tax_id, qtyordered, priceactual,
+		       line_gross_amount, linenetamt
+			into v_unitprice, v_tax, v_qty, v_priceactual,
+			     v_origGrossAmt, v_origLineNetAmt
+			from c_orderline
+		 where c_orderline_id = p_line_id;
+  else 
+	 select gross_unit_price, c_tax_id, qtyinvoiced, priceactual,
+	        line_gross_amount, linenetamt
+		 into v_unitprice, v_tax, v_qty, v_priceactual,
+		      v_origGrossAmt, v_origLineNetAmt
+		 from c_invoiceline
+		where c_invoiceline_id = p_line_id;
+  end if;
 
   if (v_qty_From is not null and v_qty < v_qty_From) or (v_qty_To is not null and v_qty > v_qty_To) or (v_ismultiple = 'Y' and ((v_multiple is null) or (MOD(v_qty, v_multiple) <> 0))) then
     return 'Y'; -- rule not applied, apply next one if present
--- a/model/src-db/database/model/functions/M_REQUISITION_CREATEPO.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/functions/M_REQUISITION_CREATEPO.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -54,12 +54,18 @@
   v_stdPre NUMBER;
   v_priPre NUMBER;
   v_Gross NUMBER;
+  v_Description C_OrderLine.Description%TYPE;
 
   p_OrderDate DATE;
   p_Vendor_ID VARCHAR2(32);
   p_PriceList_ID VARCHAR2(32);
   p_Org_ID VARCHAR2(32);
   p_Warehouse_ID VARCHAR2(32);
+
+  v_Aum C_ORDERLINE.C_AUM%TYPE;
+  v_AumQty NUMBER;
+  v_uom_preference AD_PREFERENCE.VALUE%TYPE;
+  v_count NUMBER;
   
   --  Parameter
   TYPE RECORD IS REF CURSOR;
@@ -128,7 +134,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 +213,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 +224,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 +281,28 @@
           v_Discount :=ROUND((v_PriceList-v_PriceActual) / v_PriceList*100, v_stdPre); -- Calculate rounded discount
         END IF;
       END IF;
+
+      -- Get AUM
+      v_uom_preference := 'N';      
+      BEGIN
+        v_uom_preference := AD_GET_PREFERENCE_VALUE('UomManagement', 'Y', NULL, NULL, NULL, NULL, NULL);
+      EXCEPTION
+        WHEN OTHERS THEN
+        -- Nothing to do, v_uom_preference = 'N'
+        DBMS_OUTPUT.PUT_LINE('The preference UomManagement was not found') ;
+      END;
+
+      v_Aum := NULL;
+      v_AumQty := NULL;
+      IF (v_uom_preference = 'Y') THEN
+        v_Aum := Cur_Lines.c_aum;
+        v_AumQty := Cur_Lines.aumqty;
+      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,
@@ -283,17 +313,19 @@
           M_WAREHOUSE_ID, C_UOM_ID, QTYORDERED, C_CURRENCY_ID,
           PRICELIST, PRICEACTUAL, PRICELIMIT,
           PRICESTD, LINENETAMT, DISCOUNT,
-          C_TAX_ID, M_PRODUCT_UOM_ID, QUANTITYORDER, GROSS_UNIT_PRICE, LINE_GROSS_AMOUNT
+          C_TAX_ID, M_PRODUCT_UOM_ID, QUANTITYORDER, GROSS_UNIT_PRICE, LINE_GROSS_AMOUNT,
+          C_AUM, AUMQTY
       ) VALUES (
           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,
           v_PriceStd, v_LineNetAmt,v_Discount,
-          v_Tax_ID, Cur_Lines.M_Product_UOM_ID, Cur_Lines.QuantityOrder, v_gross_unit_price, v_line_gross_amount
+          v_Tax_ID, Cur_Lines.M_Product_UOM_ID, Cur_Lines.QuantityOrder, v_gross_unit_price, v_line_gross_amount,
+          v_Aum, v_AumQty
       );
 
       Ad_Sequence_Next('M_RequisitionOrder', v_User_ID, v_RequisitionOrder_ID);
--- a/model/src-db/database/model/functions/M_UPDATE_STOCK_VALUATION.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/functions/M_UPDATE_STOCK_VALUATION.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -84,7 +84,7 @@
 
   IF (v_stock = 0) THEN
     v_unit_price := 0;
-    IF (p_stock <> 0) THEN
+    IF (p_stock <> 0 OR v_count = 0) THEN
       v_valuation := 0;
     END IF;
   ELSE
--- a/model/src-db/database/model/postscript-DB2.sql	Fri Feb 03 11:59:02 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,324 +0,0 @@
-
-CREATE OR REPLACE function NOW
-RETURN DATE
-AS
-/*************************************************************************
-* 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) 2001-2008 Openbravo SLU
-* All Rights Reserved.
-* Contributor(s):  ______________________________________.
-************************************************************************/
-BEGIN
-  RETURN SYSDATE;
-END NOW;
-/-- END NOW
-
-CREATE OR REPLACE FUNCTION ad_script_execute (param_Message VARCHAR2)
-  RETURN VARCHAR2
-AS
-/*************************************************************************
-* 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) 2001-2008 Openbravo SLU
-* All Rights Reserved.
-* Contributor(s):  ______________________________________.
-************************************************************************/
- v_Message       VARCHAR2(4000) := '';
- v_ResultStr     VARCHAR2(4000) := '';
- --TYPE RECORD IS REF CURSOR;
- Cur_Script SYS_REFCURSOR;
-BEGIN
-    v_Message := param_Message;
-    FOR Cur_Script IN 
-      (SELECT STRSQL, SEQNO FROM AD_SCRIPT_SQL ORDER BY SEQNO)
-    LOOP 
-    BEGIN 
-      EXECUTE IMMEDIATE(Cur_Script.STRSQL) ; 
-    EXCEPTION 
-    WHEN OTHERS THEN 
-      
-      if (coalesce(length(v_Message),0)!=0) then
-        v_Message:=substr(v_Message||'<br><br>',1,2000);
-      end if;
-      v_Message := substr(v_Message||'@SQLScriptError@ '||Cur_Script.SeqNo||'. @Executing@'||Cur_Script.strSQL||'<br>'||SQLERRM,1,2000);
-    END;
-  END LOOP;
-
- IF( LENGTH(v_Message) > 0 ) THEN
-    DBMS_OUTPUT.PUT_LINE('Script errors: ' || v_Message);
- END IF;
- return substr(coalesce(v_ResultStr,'') || coalesce(v_Message,''), 1, 2000);
-END ad_script_execute;
-/-- END
-
-
-CREATE OR REPLACE FUNCTION AD_GET_DOC_LE_BU(p_header_table IN VARCHAR2, p_document_id IN VARCHAR2, p_header_column_id IN VARCHAR2, p_type IN VARCHAR2)
- RETURN VARCHAR
- AS
-/*************************************************************************
-* The contents of this file are subject to the Openbravo  Public  License
-* Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
-* Version 1.1  with a permitted attribution clause; you may not  use this
-* file except in compliance with the License. You  may  obtain  a copy of
-* the License at http://www.openbravo.com/legal/license.html
-* Software distributed under the License  is  distributed  on  an "AS IS"
-* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-* License for the specific  language  governing  rights  and  limitations
-* under the License.
-* The Original Code is Openbravo ERP.
-* The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2009 Openbravo SLU
-* All Rights Reserved.
-* Contributor(s):  ______________________________________.
-************************************************************************/
-   v_org_header_id ad_org.ad_org_id%TYPE;
-   v_isbusinessunit ad_orgtype.isbusinessunit%TYPE;
-   v_islegalentity ad_orgtype.islegalentity%TYPE;
-   
- BEGIN
- 
-   -- Gets the organization and the organization type of the document's header
-   EXECUTE IMMEDIATE 
-     'SELECT ad_org.ad_org_id, ad_orgtype.isbusinessunit, ad_orgtype.islegalentity 
-     FROM '||p_header_table||', ad_org, ad_orgtype
-     WHERE '||p_header_table||'.'||p_header_column_id||' = '''||p_document_id||'''
-     AND ad_org.ad_orgtype_id = ad_orgtype.ad_orgtype_id
-     AND '||p_header_table||'.ad_org_id=ad_org.ad_org_id ' 
-     INTO v_org_header_id, v_isbusinessunit, v_islegalentity; 
- 
-   -- Gets recursively the organization parent until finding a Business Unit or a Legal Entity
-   IF (p_type IS NULL) THEN
-	   WHILE (v_isbusinessunit='N' AND v_islegalentity='N') LOOP
-	     SELECT hh.parent_id, ad_orgtype.isbusinessunit, ad_orgtype.islegalentity
-	     INTO v_org_header_id, v_isbusinessunit, v_islegalentity
-	     FROM ad_org, ad_orgtype, ad_treenode pp, ad_treenode hh
-	     WHERE pp.node_id = hh.parent_id
-	     AND hh.ad_tree_id = pp.ad_tree_id
-	     AND pp.node_id=ad_org.ad_org_id
-	     AND hh.node_id=v_org_header_id
-	     AND ad_org.ad_orgtype_id=ad_orgtype.ad_orgtype_id
-	     AND ad_org.isready='Y'
-	     AND  EXISTS (SELECT 1 FROM ad_tree WHERE ad_tree.treetype='OO' AND hh.ad_tree_id=ad_tree.ad_tree_id AND hh.ad_client_id=ad_tree.ad_client_id);     
-	   END LOOP;
-   -- Gets recursively the organization parent until finding a Legal Entity
-   ELSIF (p_type='LE') THEN
-	   WHILE (v_islegalentity='N') LOOP
-         SELECT hh.parent_id, ad_orgtype.islegalentity
-         INTO v_org_header_id, v_islegalentity
-         FROM ad_org, ad_orgtype, ad_treenode pp, ad_treenode hh
-         WHERE pp.node_id = hh.parent_id
-         AND hh.ad_tree_id = pp.ad_tree_id
-         AND pp.node_id=ad_org.ad_org_id
-         AND hh.node_id=v_org_header_id
-         AND ad_org.ad_orgtype_id=ad_orgtype.ad_orgtype_id
-         AND ad_org.isready='Y'
-         AND  EXISTS (SELECT 1 FROM ad_tree WHERE ad_tree.treetype='OO' AND hh.ad_tree_id=ad_tree.ad_tree_id AND hh.ad_client_id=ad_tree.ad_client_id);     
-       END LOOP;
-   -- Gets recursively the organization parent until finding a Business Unit
-   ELSIF (p_type='BU') THEN
-       WHILE (v_isbusinessunit='N' AND v_org_header_id<>'0') LOOP
-         SELECT hh.parent_id, ad_orgtype.isbusinessunit
-         INTO v_org_header_id, v_isbusinessunit
-         FROM ad_org, ad_orgtype, ad_treenode pp, ad_treenode hh
-         WHERE pp.node_id = hh.parent_id
-         AND hh.ad_tree_id = pp.ad_tree_id
-         AND pp.node_id=ad_org.ad_org_id
-         AND hh.node_id=v_org_header_id
-         AND ad_org.ad_orgtype_id=ad_orgtype.ad_orgtype_id
-         AND ad_org.isready='Y'
-         AND  EXISTS (SELECT 1 FROM ad_tree WHERE ad_tree.treetype='OO' AND hh.ad_tree_id=ad_tree.ad_tree_id AND hh.ad_client_id=ad_tree.ad_client_id);     
-       END LOOP;
-       RETURN NULL;
-   END IF;
-   
-   RETURN v_org_header_id;
-   
-END AD_GET_DOC_LE_BU;
-/-- END
-
-CREATE OR REPLACE FUNCTION AD_ORG_CHK_DOCUMENTS(p_header_table IN VARCHAR2, p_lines_table IN VARCHAR2, p_document_id IN VARCHAR2, p_header_column_id IN VARCHAR2, p_lines_column_id IN VARCHAR2) 
- RETURN NUMBER
- AS
-/*************************************************************************
-* 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) 2008-2009 Openbravo SLU
-* All Rights Reserved.
-* Contributor(s):  ______________________________________.
-************************************************************************/
-   v_org_header_id ad_org.ad_org_id%TYPE;
-   v_isbusinessunit ad_orgtype.isbusinessunit%TYPE;
-   v_islegalentity ad_orgtype.islegalentity%TYPE;
-   v_is_included NUMBER:=0;
-  
-   --TYPE RECORD IS REF CURSOR;
-   cur_doc_lines sys_refcursor;
- 
-   v_line_org VARCHAR2(32);
-   v_org_line_id VARCHAR2(32);
- BEGIN  
-	 
-   -- Gets the Business Unit or Legal Entity of the document
-   SELECT AD_GET_DOC_LE_BU(p_header_table, p_document_id, p_header_column_id, NULL)
-   INTO v_org_header_id
-   FROM DUAL;
- 
-   -- Check the lines belong to the same BU or LE as the header
-   OPEN cur_doc_lines FOR
-   'SELECT DISTINCT('||p_lines_table||'.ad_org_id) AS v_line_org
-    FROM '||p_header_table||', '||p_lines_table||'
-    WHERE '||p_header_table||'.'||p_header_column_id||' = '||p_lines_table||'.'||p_lines_column_id||'
-    AND '||p_lines_table||'.ad_org_id<>'||''''||v_org_header_id||'''
-    AND '||p_lines_table||'.'||p_lines_column_id||'='''||p_document_id||'''';    
-    LOOP
-      FETCH cur_doc_lines INTO v_line_org;
-      EXIT WHEN cur_doc_lines%NOTFOUND;
- 
-      SELECT ad_orgtype.isbusinessunit, ad_orgtype.islegalentity
-      INTO v_isbusinessunit, v_islegalentity
-      FROM AD_Org, AD_OrgType
-      WHERE AD_Org.AD_OrgType_ID=AD_OrgType.AD_OrgType_ID
-      AND AD_Org.AD_Org_ID=v_line_org;
-      
-      v_org_line_id:=v_line_org;
-      -- Gets recursively the organization parent until finding a Business Unit or a Legal Entity
-      WHILE (v_isbusinessunit='N' AND v_islegalentity='N') LOOP
-        SELECT hh.parent_id, ad_orgtype.isbusinessunit, ad_orgtype.islegalentity
-        INTO v_org_line_id, v_isbusinessunit, v_islegalentity
-        FROM ad_org, ad_orgtype, ad_treenode pp, ad_treenode hh
-        WHERE pp.node_id = hh.parent_id
-        AND hh.ad_tree_id = pp.ad_tree_id
-        AND pp.node_id=ad_org.ad_org_id
-        AND hh.node_id=v_org_line_id
-        AND ad_org.ad_orgtype_id=ad_orgtype.ad_orgtype_id
-        AND ad_org.isready='Y'
-        AND  EXISTS (SELECT 1 FROM ad_tree WHERE ad_tree.treetype='OO' AND hh.ad_tree_id=ad_tree.ad_tree_id AND hh.ad_client_id=ad_tree.ad_client_id);     
-      END LOOP;
-      
-     IF (v_org_line_id<>v_org_header_id) THEN
-       v_is_included:=-1;
-     END IF;
-     EXIT WHEN v_is_included=-1;
- 
-    END LOOP; 
-   CLOSE cur_doc_lines;
- 
-  RETURN v_is_included;
- 
-END AD_ORG_CHK_DOCUMENTS;
-/-- END
-
-CREATE OR REPLACE FUNCTION AD_ORG_CHK_DOC_PAYMENTS(p_header_table IN VARCHAR2, p_lines_table IN VARCHAR2, p_document_id IN VARCHAR2, p_header_column_id IN VARCHAR2, p_lines_column_id IN VARCHAR2, p_lines_column_payment_id IN VARCHAR2) 
- RETURN NUMBER
- AS
-/*************************************************************************
-* 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) 2008-2009 Openbravo SLU
-* All Rights Reserved.
-* Contributor(s):  ______________________________________.
-************************************************************************/
-   v_org_header_id ad_org.ad_org_id%TYPE;
-   v_isbusinessunit ad_orgtype.isbusinessunit%TYPE;
-   v_islegalentity ad_orgtype.islegalentity%TYPE;
-   v_is_included NUMBER:=0;
- 
- 
-   --TYPE RECORD IS REF CURSOR;
-   cur_doc_lines_payment sys_refcursor;
- 
-   v_line_org_payment VARCHAR2(32);
-   v_org_payment_line_id VARCHAR2(32);
- BEGIN
- 
-   -- Gets the Business Unit or Legal Entity of the document
-   SELECT AD_GET_DOC_LE_BU(p_header_table, p_document_id, p_header_column_id, NULL)
-   INTO v_org_header_id
-   FROM DUAL;
- 
-   -- Check the payments of the lines belong to the same BU or LE as the document header
-   OPEN cur_doc_lines_payment FOR
-   'SELECT DISTINCT(C_DEBT_PAYMENT.ad_org_id) AS v_line_org_payment
-    FROM '||p_header_table||', '||p_lines_table||', C_DEBT_PAYMENT
-    WHERE '||p_header_table||'.'||p_header_column_id||' = '||p_lines_table||'.'||p_lines_column_id||'
-    AND C_DEBT_PAYMENT.C_DEBT_PAYMENT_ID='||p_lines_table||'.'||p_lines_column_payment_id||'
-    AND '||p_lines_table||'.ad_org_id<>'||''''||v_org_header_id||'''
-    AND '||p_lines_table||'.'||p_lines_column_id||'='''||p_document_id||'''';
- 
- 
-   LOOP
-    FETCH cur_doc_lines_payment INTO v_line_org_payment;
-    EXIT WHEN cur_doc_lines_payment%NOTFOUND;
- 
-
-    SELECT ad_orgtype.isbusinessunit, ad_orgtype.islegalentity
-    INTO v_isbusinessunit, v_islegalentity
-    FROM AD_Org, AD_OrgType
-    WHERE AD_Org.AD_OrgType_ID=AD_OrgType.AD_OrgType_ID
-    AND AD_Org.AD_Org_ID=v_line_org_payment;
-
-    v_org_payment_line_id:=v_line_org_payment;
-    -- Gets recursively the organization parent until finding a Business Unit or a Legal Entity
-    WHILE (v_isbusinessunit='N' AND v_islegalentity='N') LOOP
-      SELECT hh.parent_id, ad_orgtype.isbusinessunit, ad_orgtype.islegalentity
-      INTO v_org_payment_line_id, v_isbusinessunit, v_islegalentity
-      FROM ad_org, ad_orgtype, ad_treenode pp, ad_treenode hh
-      WHERE pp.node_id = hh.parent_id
-      AND hh.ad_tree_id = pp.ad_tree_id
-      AND pp.node_id=ad_org.ad_org_id
-      AND hh.node_id=v_org_payment_line_id
-      AND ad_org.ad_orgtype_id=ad_orgtype.ad_orgtype_id
-      AND ad_org.isready='Y'
-      AND  EXISTS (SELECT 1 FROM ad_tree WHERE ad_tree.treetype='OO' AND hh.ad_tree_id=ad_tree.ad_tree_id AND hh.ad_client_id=ad_tree.ad_client_id);     
-    END LOOP;
-
-    IF (v_org_payment_line_id<>v_org_header_id) THEN
-      v_is_included:=-1;
-    END IF;
-    EXIT WHEN v_is_included=-1;
-
-   END LOOP; 
-   CLOSE cur_doc_lines_payment;
- 
-   RETURN v_is_included;
- 
-END AD_ORG_CHK_DOC_PAYMENTS;
-/-- END
-
--- a/model/src-db/database/model/postscript-Oracle.sql	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/postscript-Oracle.sql	Wed Mar 15 11:15:02 2017 +0000
@@ -580,7 +580,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):  ______________________________________.
 ************************************************************************/
@@ -641,6 +641,7 @@
                        from ad_table
                       where isfullyaudited = 'Y'
                       AND ISVIEW='N'
+                      and dataOriginType = 'Table'
                       order by tablename) loop
     dbms_output.put_line('Creating trigger for table '||cur_tables.tablename);
     triggerName := 'AU_'||SUBSTR(cur_tables.tablename,1,23)||'_TRG';
--- a/model/src-db/database/model/postscript-PostgreSql.sql	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/postscript-PostgreSql.sql	Wed Mar 15 11:15:02 2017 +0000
@@ -375,7 +375,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):  ______________________________________.
 ************************************************************************/
@@ -415,6 +415,7 @@
                        from ad_table
                       where isfullyaudited = 'Y'
                       AND ISVIEW='N'
+                      and dataOriginType = 'Table'
                       order by tablename) loop
     
     triggerName := 'AU_'||SUBSTR(cur_tables.tablename,1,23)||'_TRG';
--- a/model/src-db/database/model/prescript-DB2.sql	Fri Feb 03 11:59:02 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-set current path=CURRENT USER, system path
-/-- END
-
-
-Begin  
-  execute immediate 'Drop table AD_ENABLE_TRIGGERS';
-  Exception when others then null;
-End;
-/-- END
-
- -- create temporary tables
-
-
-
-CREATE OR REPLACE FUNCTION TO_CHAR(CHAR()) returns varchar() source char(varchar())
-/-- END 
-
-CREATE OR REPLACE FUNCTION TO_CHAR(VARCHAR()) returns varchar() source varchar(varchar())
-/-- END
-
-create or replace FUNCTION GET_UUID RETURN VARCHAR2
-AS
-/*************************************************************************
-* 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) 2008 Openbravo SLU
-* All Rights Reserved.
-* Contributor(s):  ______________________________________.
-************************************************************************/
-BEGIN
- return hex(sysibm.generate_unique());
-END GET_UUID;
-/-- END
-
-create or replace FUNCTION AD_DB_MODIFIED(p_Update CHAR) RETURN CHAR
-
-AS
-/*************************************************************************
-* The contents of this file are subject to the Openbravo  Public  License
-* Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
-* Version 1.1  with a permitted attribution clause; you may not  use this
-* file except in compliance with the License. You  may  obtain  a copy of
-* the License at http://www.openbravo.com/legal/license.html
-* Software distributed under the License  is  distributed  on  an "AS IS"
-* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-* License for the specific  language  governing  rights  and  limitations
-* under the License.
-* The Original Code is Openbravo ERP.
-* The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2009 Openbravo SLU
-* All Rights Reserved.
-* Contributor(s):  ______________________________________.
-************************************************************************/
-  v_Modified char(1);
-  --PRAGMA AUTONOMOUS_TRANSACTION; --To allow DML within a function in a select        
-BEGIN
-   SELECT (CASE WHEN COUNT(*)>0 THEN 'Y' ELSE 'N' END)
-    INTO v_Modified
-     FROM AD_SYSTEM_INFO
-     WHERE LAST_DBUPDATE < (SELECT MAX(LAST_DDL_TIME)
-                              FROM USER_OBJECTS);
-                              
-                     
-   BEGIN
-   IF p_Update = 'Y' THEN
-     UPDATE AD_SYSTEM_INFO
-       SET LAST_DBUPDATE = NOW();
-   END IF;
-   END;
-   COMMIT;
-   RETURN v_Modified;
-   EXCEPTION 
-     WHEN OTHERS THEN
-       RETURN 'N';
-END AD_DB_MODIFIED;
-/-- END 
--- a/model/src-db/database/model/tables/AD_FIELD.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/tables/AD_FIELD.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -145,6 +145,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="DISPLAYLOGIC_SERVER" primaryKey="false" required="false" type="NVARCHAR" size="2000" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_COLUMN" name="AD_COLUMN_FIELD">
         <reference local="AD_COLUMN_ID" foreign="AD_COLUMN_ID"/>
       </foreign-key>
--- a/model/src-db/database/model/tables/C_BPARTNER.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/tables/C_BPARTNER.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -377,6 +377,14 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="BIRTHPLACE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="BIRTHDAY" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_LANGUAGE" name="AD_LANGUAGE_C_BUSPARTNER">
         <reference local="AD_LANGUAGE" foreign="AD_LANGUAGE"/>
       </foreign-key>
--- a/model/src-db/database/model/tables/C_INVOICELINE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/tables/C_INVOICELINE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -221,6 +221,14 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="C_AUM" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AUMQTY" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="C_INVOICELINE_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
@@ -233,6 +241,9 @@
       <foreign-key foreignTable="C_INVOICELINE" name="C_INVOICELINE_BOMPARENTID">
         <reference local="BOM_PARENT_ID" foreign="C_INVOICELINE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_UOM" name="C_INVOICELINE_C_AUM">
+        <reference local="C_AUM" foreign="C_UOM_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_BPARTNER" name="C_INVOICELINE_C_BPARTNER">
         <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
       </foreign-key>
--- a/model/src-db/database/model/tables/C_ORDERLINE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/tables/C_ORDERLINE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -285,6 +285,14 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="C_AUM" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AUMQTY" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="A_ASSET" name="C_ORDERLINE_A_ASSET">
         <reference local="A_ASSET_ID" foreign="A_ASSET_ID"/>
       </foreign-key>
@@ -297,6 +305,9 @@
       <foreign-key foreignTable="C_ORDERLINE" name="C_ORDERLINE_BOMPARENTID">
         <reference local="BOM_PARENT_ID" foreign="C_ORDERLINE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_UOM" name="C_ORDERLINE_C_AUM">
+        <reference local="C_AUM" foreign="C_UOM_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_BPARTNER" name="C_ORDERLINE_C_BPARTNER">
         <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
       </foreign-key>
--- a/model/src-db/database/model/tables/M_INOUT.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/tables/M_INOUT.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -257,6 +257,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="ISNETTINGSHIPMENT" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault><![CDATA['N']]></onCreateDefault>
+      </column>
       <foreign-key foreignTable="M_FREIGHTCATEGORY" name="M_FREIGHTCATEGORY_M_INOUT">
         <reference local="M_FREIGHTCATEGORY_ID" foreign="M_FREIGHTCATEGORY_ID"/>
       </foreign-key>
@@ -355,6 +359,7 @@
       <check name="M_INOUT_GENERATETO_CHECK"><![CDATA[GENERATETO IN ('Y', 'N')]]></check>
       <check name="M_INOUT_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="M_INOUT_ISLOGISTIC_CHK"><![CDATA[ISLOGISTIC IN ('N', 'Y')]]></check>
+      <check name="M_INOUT_ISNETTINGSHIPMENT_CHK"><![CDATA[ISNETTINGSHIPMENT IN ('Y', 'N')]]></check>
       <check name="M_INOUT_ISPRINTED_CHECK"><![CDATA[ISPRINTED IN ('Y', 'N')]]></check>
       <check name="M_INOUT_ISSOTRX_CHECK"><![CDATA[ISSOTRX IN ('Y', 'N')]]></check>
       <check name="M_INOUT_PROCESSED_CHECK"><![CDATA[PROCESSED IN ('Y', 'N')]]></check>
--- a/model/src-db/database/model/tables/M_INOUTLINE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/tables/M_INOUTLINE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -129,6 +129,14 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="C_AUM" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AUMQTY" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="M_CONDITION_GOODS" name="M_CONDITION_GOODS">
         <reference local="M_CONDITION_GOODS_ID" foreign="M_CONDITION_GOODS_ID"/>
       </foreign-key>
@@ -144,6 +152,9 @@
       <foreign-key foreignTable="M_INOUTLINE" name="M_INOUTLINE_BOMPARENTID">
         <reference local="BOM_PARENT_ID" foreign="M_INOUTLINE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_UOM" name="M_INOUTLINE_C_AUM">
+        <reference local="C_AUM" foreign="C_UOM_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_BPARTNER" name="M_INOUTLINE_C_BPARTNER">
         <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
       </foreign-key>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/tables/M_PRODUCT_AUM.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+  <database name="TABLE M_PRODUCT_AUM">
+    <table name="M_PRODUCT_AUM" primaryKey="M_PRODUCT_AUM_PK">
+      <column name="M_PRODUCT_AUM_ID" primaryKey="true" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="C_UOM_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="CONVERSIONRATE" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="GTIN" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="SALES" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false">
+        <default><![CDATA[S]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="PURCHASE" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false">
+        <default><![CDATA[S]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="LOGISTICS" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false">
+        <default><![CDATA[S]]></default>
+        <onCreateDefault/>
+      </column>
+      <foreign-key foreignTable="AD_CLIENT" name="M_PRODUCT_AUM_CLIENT_FK">
+        <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_USER" name="M_PRODUCT_AUM_CRE_FK">
+        <reference local="CREATEDBY" foreign="AD_USER_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_UOM" name="M_PRODUCT_AUM_CUM_FK">
+        <reference local="C_UOM_ID" foreign="C_UOM_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="M_PRODUCT_AUM_ORG_FK">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="M_PRODUCT" name="M_PRODUCT_AUM_PRO_FK">
+        <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_USER" name="M_PRODUCT_AUM_UPD_FK">
+        <reference local="UPDATEDBY" foreign="AD_USER_ID"/>
+      </foreign-key>
+      <index name="M_PRODUCT_AUM_PRODUCT_ID" unique="false">
+        <index-column name="M_PRODUCT_ID"/>
+      </index>
+      <unique name="M_PRODUCT_AUM_UNQ">
+        <unique-column name="M_PRODUCT_ID"/>
+        <unique-column name="C_UOM_ID"/>
+      </unique>
+      <check name="M_PRODUCT_AUM_RATE_CHECK"><![CDATA[CONVERSIONRATE > 0]]></check>
+      <check name="M_PRODUCT_UOM_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+    </table>
+  </database>
--- a/model/src-db/database/model/tables/M_REQUISITIONLINE.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/tables/M_REQUISITIONLINE.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -153,6 +153,18 @@
         <default><![CDATA[0]]></default>
         <onCreateDefault/>
       </column>
+      <column name="C_AUM" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AUMQTY" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="LOCKAUMQTY" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="AD_CLIENT_M_REQUISITIONLINE">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
@@ -183,6 +195,9 @@
       <foreign-key foreignTable="M_REQUISITION" name="M_REQUISITION_MREQUISITIONLINE">
         <reference local="M_REQUISITION_ID" foreign="M_REQUISITION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_UOM" name="M_REQUISITIONLINE_C_AUM">
+        <reference local="C_AUM" foreign="C_UOM_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_CURRENCY" name="M_REQUISITIONLINE_C_CURRENCY">
         <reference local="C_CURRENCY_ID" foreign="C_CURRENCY_ID"/>
       </foreign-key>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/tables/M_VALUED_STOCK_AGG.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -0,0 +1,123 @@
+<?xml version="1.0"?>
+  <database name="TABLE M_VALUED_STOCK_AGG">
+    <table name="M_VALUED_STOCK_AGG" primaryKey="M_VALUED_STOCK_AGG_KEY">
+      <column name="M_VALUED_STOCK_AGG_ID" primaryKey="true" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="M_LOCATOR_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="C_UOM_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="C_PERIOD_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="DATEFROM" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="DATETO" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="STOCK" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="VALUATION" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="M_COSTING_RULE_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <foreign-key foreignTable="M_COSTING_RULE" name="M_VAL_STOCK_AGG_COST_RULE" onDelete="cascade">
+        <reference local="M_COSTING_RULE_ID" foreign="M_COSTING_RULE_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_CLIENT" name="M_VALUED_STOCK_AGG_CLIENT">
+        <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_CURRENCY" name="M_VALUED_STOCK_AGG_CURRENCY" onDelete="cascade">
+        <reference local="C_CURRENCY_ID" foreign="C_CURRENCY_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="M_LOCATOR" name="M_VALUED_STOCK_AGG_LOCATOR" onDelete="cascade">
+        <reference local="M_LOCATOR_ID" foreign="M_LOCATOR_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="M_VALUED_STOCK_AGG_ORG">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_PERIOD" name="M_VALUED_STOCK_AGG_PERIOD" onDelete="cascade">
+        <reference local="C_PERIOD_ID" foreign="C_PERIOD_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="M_PRODUCT" name="M_VALUED_STOCK_AGG_PRODUCT" onDelete="cascade">
+        <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_UOM" name="M_VALUED_STOCK_AGG_UOM">
+        <reference local="C_UOM_ID" foreign="C_UOM_ID"/>
+      </foreign-key>
+      <index name="M_VALUED_STOCK_AGG_COSTRULE" unique="false">
+        <index-column name="M_COSTING_RULE_ID"/>
+      </index>
+      <index name="M_VALUED_STOCK_AGG_CURRENCY" unique="false">
+        <index-column name="C_CURRENCY_ID"/>
+      </index>
+      <index name="M_VALUED_STOCK_AGG_DATEFROM" unique="false">
+        <index-column name="DATEFROM"/>
+      </index>
+      <index name="M_VALUED_STOCK_AGG_DATETO" unique="false">
+        <index-column name="DATETO"/>
+      </index>
+      <index name="M_VALUED_STOCK_AGG_LOCATOR" unique="false">
+        <index-column name="M_LOCATOR_ID"/>
+      </index>
+      <index name="M_VALUED_STOCK_AGG_PERIOD" unique="false">
+        <index-column name="C_PERIOD_ID"/>
+      </index>
+      <index name="M_VALUED_STOCK_AGG_PRODUCT" unique="false">
+        <index-column name="M_PRODUCT_ID"/>
+      </index>
+      <check name="M_VALUED_STOCK_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+    </table>
+  </database>
--- a/model/src-db/database/model/triggers/AD_ROLE_ORGACCESS_TRG.xml	Fri Feb 03 11:59:02 2017 +0100
+++ /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/model/src-db/database/model/triggers/C_INVLINE_CHK_RESTRICTIONS_TRG.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/triggers/C_INVLINE_CHK_RESTRICTIONS_TRG.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -18,7 +18,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-2015 Openbravo SLU
+    * All portions are Copyright (C) 2001-2016 Openbravo SLU
     * All Rights Reserved.
     * Contributor(s):  ______________________________________.
     ************************************************************************/
@@ -66,6 +66,8 @@
       OR(COALESCE(:OLD.QUANTITYORDER, 0) <> COALESCE(:NEW.QUANTITYORDER, 0))
       OR(COALESCE(:OLD.C_ORDERLINE_ID, '0') <> COALESCE(:NEW.C_ORDERLINE_ID, '0'))
       OR(COALESCE(:OLD.M_PRODUCT_UOM_ID, '0') <> COALESCE(:NEW.M_PRODUCT_UOM_ID, '0'))
+      OR(COALESCE(:OLD.C_AUM, '0') <> COALESCE(:NEW.C_AUM, '0'))
+      OR(COALESCE(:OLD.AUMQTY, 0) <> COALESCE(:NEW.AUMQTY, 0))	
       OR(COALESCE(:OLD.AD_ORG_ID, '0') <> COALESCE(:NEW.AD_ORG_ID, '0'))
       OR(COALESCE(:OLD.AD_CLIENT_ID, '0') <> COALESCE(:NEW.AD_CLIENT_ID, '0'))
       )) THEN
@@ -127,6 +129,13 @@
       END IF;
     END IF;
   END IF;
+
+  IF (INSERTING OR UPDATING) THEN
+    IF (:NEW.C_AUM IS NOT NULL AND :NEW.AUMQTY IS NOT NULL AND :NEW.M_PRODUCT_UOM_ID IS NOT NULL AND :NEW.QUANTITYORDER IS NOT NULL) THEN
+      RAISE_APPLICATION_ERROR(-20000, '@CannotUseAUMandSecondUOM@');
+    END IF;
+  END IF;
+  
 END C_INVLINE_CHK_RESTRICTIONS_TRG
 ]]></body>
     </trigger>
--- a/model/src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -14,7 +14,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2013 Openbravo SLU
+* All portions are Copyright (C) 2001-2016 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -43,7 +43,7 @@
   END IF;
   IF UPDATING THEN
     IF((COALESCE(:old.LINE, 0) <> COALESCE(:NEW.LINE, 0) OR COALESCE(:old.M_PRODUCT_ID, '0') <> COALESCE(:NEW.M_PRODUCT_ID, '0') OR COALESCE(:old.QTYORDERED, 0) <> COALESCE(:NEW.QTYORDERED, 0) OR COALESCE(:old.PRICELIST, 0) <> COALESCE(:NEW.PRICELIST, 0) OR COALESCE(:old.PRICEACTUAL, 0) <> COALESCE(:NEW.PRICEACTUAL, 0) OR COALESCE(:old.PRICELIMIT, 0) <> COALESCE(:NEW.PRICELIMIT, 0) OR COALESCE(:old.LINENETAMT, 0) <> COALESCE(:NEW.LINENETAMT, 0) OR COALESCE(:old.C_CHARGE_ID, '0') <> COALESCE(:NEW.C_CHARGE_ID, '0') OR COALESCE(:old.CHARGEAMT, 0) <> COALESCE(:NEW.CHARGEAMT, 0) OR COALESCE(:old.C_TAX_ID, '0') <> COALESCE(:NEW.C_TAX_ID, '0')  OR COALESCE(:old.DIRECTSHIP, '.') <> COALESCE(:NEW.DIRECTSHIP, '.') OR COALESCE(:old.M_ATTRIBUTESETINSTANCE_ID, '0') <> COALESCE(:NEW.M_ATTRIBUTESETINSTANCE_ID, '0') OR COALESCE(:old.QUANTITYORDER, 0) <> COALESCE(:NEW.QUANTITYORDER, 0) OR COALESCE(
-      :old.M_PRODUCT_UOM_ID, '0') <> COALESCE(:NEW.M_PRODUCT_UOM_ID, '0')
+      :old.M_PRODUCT_UOM_ID, '0') <> COALESCE(:NEW.M_PRODUCT_UOM_ID, '0') OR COALESCE(:old.C_AUM, '0') <> COALESCE(:NEW.C_AUM, '0') OR COALESCE(:old.aumqty, 0) <> COALESCE(:NEW.aumqty, 0)
       OR COALESCE(:old.QtyInvoiced, 0) <> COALESCE(:NEW.QtyInvoiced, 0))) THEN
       SELECT PROCESSED,
         DOCACTION, DOCSTATUS, DocumentNo, ISSOTRX
@@ -68,6 +68,8 @@
           OR(COALESCE(:OLD.M_ATTRIBUTESETINSTANCE_ID, '0') <> COALESCE(:NEW.M_ATTRIBUTESETINSTANCE_ID, '0'))
           OR(COALESCE(:OLD.QUANTITYORDER, 0) <> COALESCE(:NEW.QUANTITYORDER, 0))
           OR(COALESCE(:OLD.M_PRODUCT_UOM_ID, '0') <> COALESCE(:NEW.M_PRODUCT_UOM_ID, '0'))
+          OR(COALESCE(:OLD.C_AUM, '0') <> COALESCE(:NEW.C_AUM, '0'))
+          OR(COALESCE(:OLD.AUMQTY, 0) <> COALESCE(:NEW.AUMQTY, 0))
           OR(COALESCE(:old.AD_ORG_ID, '0') <> COALESCE(:new.AD_ORG_ID, '0'))
           OR(COALESCE(:old.AD_CLIENT_ID, '0') <> COALESCE(:new.AD_CLIENT_ID, '0'))
         ) THEN
@@ -119,6 +121,9 @@
       IF (v_isgeneric = 'Y') THEN
         RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@');
       END IF;
+      IF (:NEW.C_AUM IS NOT NULL AND :NEW.AUMQTY IS NOT NULL AND :NEW.M_PRODUCT_UOM_ID IS NOT NULL AND :NEW.QUANTITYORDER IS NOT NULL) THEN
+        RAISE_APPLICATION_ERROR(-20000, '@CannotUseAUMandSecondUOM@');
+      END IF;
     END IF;
   END IF;
 END C_ORDLINE_CHK_RESTRICTIONS_TRG
--- a/model/src-db/database/model/triggers/M_INOUTLINE_TRG.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/triggers/M_INOUTLINE_TRG.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -34,7 +34,7 @@
  * 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-2015 Openbravo S.L.U.
+ * Contributions are Copyright (C) 2001-2016 Openbravo S.L.U.
  ******************************************************************************/
      
 BEGIN
@@ -226,6 +226,8 @@
       OR COALESCE(:OLD.M_AttributeSetInstance_ID,'0') <> COALESCE(:NEW.M_AttributeSetInstance_ID,'0')
       OR :OLD.C_UOM_ID <> :NEW.C_UOM_ID
       OR COALESCE(:OLD.M_Product_UOM_ID,'0') <> COALESCE(:NEW.M_Product_UOM_ID,'0')
+      OR COALESCE(:OLD.C_AUM,'0') <> COALESCE(:NEW.C_AUM,'0')
+      OR COALESCE(:OLD.AUMQTY,0) <> COALESCE(:NEW.AUMQTY,0)
       OR :OLD.MOVEMENTQTY <> :NEW.MOVEMENTQTY
       OR COALESCE(:OLD.QUANTITYORDER, 0) <> COALESCE(:NEW.QUANTITYORDER, 0)) THEN
       
@@ -257,6 +259,9 @@
   END IF;
 
   IF (INSERTING OR UPDATING) THEN
+   IF (:NEW.M_PRODUCT_ID IS NOT NULL AND :NEW.C_AUM IS NOT NULL AND :NEW.AUMQTY IS NOT NULL AND :NEW.M_PRODUCT_UOM_ID IS NOT NULL AND :NEW.QUANTITYORDER IS NOT NULL) THEN
+     RAISE_APPLICATION_ERROR(-20000, '@CannotUseAUMandSecondUOM@');
+   END IF;
    --Does not allow to change the attribute set value
    -- for products which attribute set value type is Fixed
    IF (:NEW.M_PRODUCT_ID IS NOT NULL AND COALESCE(:new.M_AttributeSetInstance_ID,'0')!='0') THEN
--- a/model/src-db/database/model/triggers/M_IOLINE_CHK_RESTRICTIONS_TRG.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/triggers/M_IOLINE_CHK_RESTRICTIONS_TRG.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -19,7 +19,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2013 Openbravo SLU
+* All portions are Copyright (C) 2001-2016 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -51,6 +51,8 @@
    OR(COALESCE(:old.M_PRODUCT_UOM_ID, '0') <> COALESCE(:new.M_PRODUCT_UOM_ID, '0'))
    OR(COALESCE(:old.C_ORDERLINE_ID, '0') <> COALESCE(:new.C_ORDERLINE_ID, '0') AND v_DocStatus != 'VO')
    OR(COALESCE(:old.M_LOCATOR_ID, '0') <> COALESCE(:new.M_LOCATOR_ID, '0'))
+   OR(COALESCE(:OLD.C_AUM, '0') <> COALESCE(:NEW.C_AUM, '0'))
+   OR(COALESCE(:OLD.AUMQTY, 0) <> COALESCE(:NEW.AUMQTY, 0))
    OR(COALESCE(:old.AD_ORG_ID, '0') <> COALESCE(:new.AD_ORG_ID, '0'))
    OR(COALESCE(:old.AD_CLIENT_ID, '0') <> COALESCE(:new.AD_CLIENT_ID, '0'))))
   THEN
@@ -80,6 +82,13 @@
       END IF;
     END IF;
   END IF;
+
+  IF (INSERTING OR UPDATING) THEN
+    IF (:NEW.C_AUM IS NOT NULL AND :NEW.AUMQTY IS NOT NULL AND :NEW.M_PRODUCT_UOM_ID IS NOT NULL AND :NEW.QUANTITYORDER IS NOT NULL) THEN
+      RAISE_APPLICATION_ERROR(-20000, '@CannotUseAUMandSecondUOM@');
+    END IF;
+  END IF;
+  
 END M_IOLINE_CHK_RESTRICTIONS_TRG
 ]]></body>
     </trigger>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/triggers/M_PRODUCT_AUM_TRG.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+  <database name="TRIGGER M_PRODUCT_AUM_TRG">
+    <trigger name="M_PRODUCT_AUM_TRG" table="M_PRODUCT_AUM" fires="before" insert="true" update="true" delete="false" foreach="row">
+      <body><![CDATA[
+/*************************************************************************
+* The contents of this file are subject to the Openbravo  Public  License
+* Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+* Version 1.1  with a permitted attribution clause; you may not  use this
+* file except in compliance with the License. You  may  obtain  a copy of
+* the License at http://www.openbravo.com/legal/license.html
+* Software distributed under the License  is  distributed  on  an "AS IS"
+* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+* License for the specific  language  governing  rights  and  limitations
+* under the License.
+* The Original Code is Openbravo ERP.
+* The Initial Developer of the Original Code is Openbravo SLU
+* All portions are Copyright (C) 2016 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+
+v_Count NUMBER;
+v_GTINALLOWEDCHAR VARCHAR(60) := 'QWERTYUIOPASDFGHJKLZXCVBNM0123456789';
+
+BEGIN
+
+  IF AD_isTriggerEnabled()='N' THEN RETURN;
+  END IF;
+
+  SELECT count(*) 
+  INTO v_Count
+  FROM dual
+  WHERE EXISTS ( SELECT 1 
+                   FROM M_Product 
+                   WHERE m_product_id = :new.m_product_id 
+                   AND c_uom_id = :new.c_uom_id);
+  IF (v_Count > 0) THEN
+    RAISE_APPLICATION_ERROR(-20000, '@DuplicateBUM@');
+  END IF;
+
+  IF (:new.gtin IS NOT NULL) THEN
+    FOR I IN 1..length(:new.gtin) LOOP
+      IF (instr(v_GTINALLOWEDCHAR, upper(substr(:new.gtin,I,1))) = 0) THEN
+        RAISE_APPLICATION_ERROR(-20000, '@InvalidGTINFormat@');
+      END IF;
+    END LOOP;
+  END IF;
+
+  END M_PRODUCT_AUM_TRG
+]]></body>
+    </trigger>
+  </database>
--- a/model/src-db/database/model/triggers/M_REQUISITIONLINE_TRG.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/triggers/M_REQUISITIONLINE_TRG.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -14,7 +14,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2008-2014 Openbravo SLU
+* All portions are Copyright (C) 2008-2016 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -29,7 +29,6 @@
     IF AD_isTriggerEnabled()='N' THEN RETURN;
     END IF;
 
-
   IF INSERTING THEN
     SELECT DocStatus, :new.ReqStatus, 0 INTO v_DocStatus, v_ReqStatus, v_OrderedQty
     FROM M_Requisition
@@ -78,6 +77,8 @@
        OR (COALESCE(:old.C_BPartner_ID, '0') <> COALESCE(:new.C_BPartner_ID, '0' ))
        OR (COALESCE(:old.C_UOM_ID, '0') <> COALESCE(:new.C_UOM_ID, '0' ))
        OR (COALESCE(:old.M_Product_UOM_ID, '0') <> COALESCE(:new.M_Product_UOM_ID, '0' ))
+       OR (COALESCE(:OLD.C_AUM, '0') <> COALESCE(:NEW.C_AUM, '0'))
+       OR (COALESCE(:OLD.AUMQTY, 0) <> COALESCE(:NEW.AUMQTY, 0))
        OR (COALESCE(:old.QuantityOrder, -1) <> COALESCE(:new.QuantityOrder, -1 ))
        OR (COALESCE(:old.M_AttributeSetInstance_ID, '-1') <> COALESCE(:new.M_AttributeSetInstance_ID, '-1' ))
        OR (COALESCE(:old.NeedByDate, TO_DATE('01-01-1900', 'DD-MM-YYYY')) <> COALESCE(:new.NeedByDate, TO_DATE('01-01-1900', 'DD-MM-YYYY')))) THEN
@@ -97,6 +98,9 @@
       IF (v_isgeneric = 'Y') THEN
         RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@');
       END IF;
+      IF (:NEW.C_AUM IS NOT NULL AND :NEW.AUMQTY IS NOT NULL AND :NEW.M_PRODUCT_UOM_ID IS NOT NULL AND :NEW.QUANTITYORDER IS NOT NULL) THEN
+        RAISE_APPLICATION_ERROR(-20000, '@CannotUseAUMandSecondUOM@');
+      END IF;
     END IF;
   END IF;
 END M_REQUISITIONLINE_TRG
--- a/model/src-db/database/model/views/AD_AUDIT_TRAIL_V.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/views/AD_AUDIT_TRAIL_V.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
   <database name="VIEW AD_AUDIT_TRAIL_V">
-    <view name="AD_AUDIT_TRAIL_V"><![CDATA[SELECT at.ad_audit_trail_id, at.ad_client_id, at.ad_org_id, at.isactive, at.created, at.createdby, at.updated, at.updatedby, at.ad_table_id, at.record_id, at.record_revision, at.ad_user_id, at.event_time, at.processtype, at.process_id, at.action, at.ad_column_id, at.old_char, at.new_char, at.old_nchar, at.new_nchar, at.old_number, at.new_number, at.old_date, at.new_date, at.old_text, at.new_text, CASE WHEN at.processtype = 'P' THEN (SELECT to_char(p.name) AS to_char FROM ad_process p WHERE p.ad_process_id = at.process_id) WHEN at.processtype = 'W' THEN (SELECT to_char(w.name) AS to_char FROM ad_tab t, ad_window w WHERE t.ad_tab_id = at.process_id AND t.ad_window_id = w.ad_window_id) WHEN at.processtype = 'X' THEN (SELECT to_char(f.name) AS to_char FROM ad_form f WHERE f.ad_form_id = at.process_id) ELSE '' END AS process_desc, COALESCE(at.old_char, to_char(at.old_nchar), to_char(at.old_date), to_char(at.old_number), CASE WHEN ad_get_rdbms() = 'ORACLE' THEN CASE WHEN length(at.old_text) > 3996 THEN (to_char(substr(at.old_text, 1, 3996)) || '...') ELSE to_char(at.old_text) END ELSE to_char(at.old_text) END) AS old_value, COALESCE(at.new_char, to_char(at.new_nchar), to_char(at.new_date), to_char(at.new_number), CASE WHEN ad_get_rdbms() = 'ORACLE' THEN CASE WHEN length(at.new_text) > 3996 THEN (to_char(substr(at.new_text, 1, 3996)) || '...') ELSE to_char(at.new_text) END ELSE to_char(at.new_text) END) AS new_value FROM ad_audit_trail at]]></view>
+    <view name="AD_AUDIT_TRAIL_V"><![CDATA[SELECT at.ad_audit_trail_id, at.ad_client_id, at.ad_org_id, at.isactive, at.created, at.createdby, at.updated, at.updatedby, at.ad_table_id, at.record_id, at.record_revision, at.ad_user_id, at.event_time, at.processtype, at.process_id, at.action, at.ad_column_id, at.old_char, at.new_char, at.old_nchar, at.new_nchar, at.old_number, at.new_number, at.old_date, at.new_date, at.old_text, at.new_text, CASE WHEN at.processtype = 'P' THEN (SELECT to_char(p.name) AS to_char FROM ad_process p WHERE p.ad_process_id = at.process_id) WHEN at.processtype = 'W' THEN (SELECT to_char(w.name) AS to_char FROM ad_tab t, ad_window w WHERE t.ad_tab_id = at.process_id AND t.ad_window_id = w.ad_window_id) WHEN at.processtype = 'X' THEN (SELECT to_char(f.name) AS to_char FROM ad_form f WHERE f.ad_form_id = at.process_id) ELSE COALESCE((SELECT to_char(ad_message.msgtext) AS to_char FROM ad_message WHERE ad_message.value = at.process_id), at.process_id) END AS process_desc, COALESCE(at.old_char, to_char(at.old_nchar), to_char(at.old_date), to_char(at.old_number), CASE WHEN ad_get_rdbms() = 'ORACLE' THEN CASE WHEN length(at.old_text) > 3996 THEN (to_char(substr(at.old_text, 1, 3996)) || '...') ELSE to_char(at.old_text) END ELSE to_char(at.old_text) END) AS old_value, COALESCE(at.new_char, to_char(at.new_nchar), to_char(at.new_date), to_char(at.new_number), CASE WHEN ad_get_rdbms() = 'ORACLE' THEN CASE WHEN length(at.new_text) > 3996 THEN (to_char(substr(at.new_text, 1, 3996)) || '...') ELSE to_char(at.new_text) END ELSE to_char(at.new_text) END) AS new_value FROM ad_audit_trail at]]></view>
   </database>
--- a/model/src-db/database/model/views/C_INVOICE_CANDIDATE_V.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/views/C_INVOICE_CANDIDATE_V.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -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', 'WR')))) 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 IN ('CO', 'CL', 'IP')) AND dt.docbasetype = 'SOO' AND (dt.docsubtypeso NOT IN ('ON', 'OB', 'WR')) AND (o.invoicerule IN ('I', 'O', 'D', 'S')) AND (si.invoicefrequency IS NULL OR (si.invoicefrequency IN ('D', 'W', '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/model/src-db/database/model/views/M_CREATEPOLINES_PE_V.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/views/M_CREATEPOLINES_PE_V.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
   <database name="VIEW M_CREATEPOLINES_PE_V">
-    <view name="M_CREATEPOLINES_PE_V"><![CDATA[SELECT pp.m_productprice_id AS m_createpolines_pe_v_id, pp.ad_client_id, pp.ad_org_id, pp.isactive, pp.created, pp.createdby, pp.updated, pp.updatedby, 'N' AS ob_selected, pp.m_product_id, plv.m_pricelist_id, pp.pricestd, NULL AS qtyordered FROM m_productprice pp JOIN m_product p ON pp.m_product_id = p.m_product_id AND COALESCE(p.isgeneric, 'N') = 'N' JOIN m_pricelist_version plv ON pp.m_pricelist_version_id = plv.m_pricelist_version_id JOIN m_pricelist pl ON pl.m_pricelist_id = plv.m_pricelist_id WHERE p.isactive = 'Y' AND pl.issopricelist = 'N' AND plv.validfrom = ((SELECT max(plv2.validfrom) AS max FROM m_pricelist_version plv2 WHERE plv2.m_pricelist_id = pl.m_pricelist_id AND plv2.validfrom <= now()))]]></view>
+    <view name="M_CREATEPOLINES_PE_V"><![CDATA[SELECT pp.m_productprice_id AS m_createpolines_pe_v_id, pp.ad_client_id, pp.ad_org_id, pp.isactive, pp.created, pp.createdby, pp.updated, pp.updatedby, 'N' AS ob_selected, pp.m_product_id, plv.m_pricelist_id, pp.pricestd, NULL AS qtyordered, NULL AS qtyaum, m_get_default_aum_for_document(p.m_product_id, '24C649C1402B4ABDA4C59046BB45B9FF') AS aum FROM m_productprice pp JOIN m_product p ON pp.m_product_id = p.m_product_id AND COALESCE(p.isgeneric, 'N') = 'N' JOIN m_pricelist_version plv ON pp.m_pricelist_version_id = plv.m_pricelist_version_id JOIN m_pricelist pl ON pl.m_pricelist_id = plv.m_pricelist_id WHERE p.isactive = 'Y' AND pl.issopricelist = 'N' AND plv.validfrom = ((SELECT max(plv2.validfrom) AS max FROM m_pricelist_version plv2 WHERE plv2.m_pricelist_id = pl.m_pricelist_id AND plv2.validfrom <= now()))]]></view>
   </database>
--- a/model/src-db/database/model/views/M_PRODUCT_STOCK_V.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/views/M_PRODUCT_STOCK_V.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
   <database name="VIEW M_PRODUCT_STOCK_V">
-    <view name="M_PRODUCT_STOCK_V"><![CDATA[SELECT p.m_product_id || sd.m_storage_detail_id AS m_product_stock_v_id, l.ad_client_id, l.ad_org_id, l.isactive, sd.created, sd.createdby, sd.updated, sd.updatedby, sd.m_product_id, sd.qtyonhand, sd.qtyorderonhand, sd.preqtyonhand, sd.preqtyorderonhand, sd.c_uom_id, sd.m_product_uom_id, sd.m_attributesetinstance_id, sd.m_locator_id, 'Y' AS stocked FROM m_storage_detail sd JOIN m_locator l ON sd.m_locator_id = l.m_locator_id JOIN m_product p ON sd.m_product_id = p.m_product_id AND p.isactive = 'Y' WHERE sd.qtyonhand <> 0 OR COALESCE(sd.qtyorderonhand, 0) <> 0 UNION ALL SELECT p.m_product_id AS m_product_stock_v_id, p.ad_client_id, p.ad_org_id, p.isactive, p.created, p.createdby, p.updated, p.updatedby, p.m_product_id, 0 AS qtyonhand, NULL AS qtyorderonhand, 0 AS preqtyonhand, NULL AS preqtyorderonhand, p.c_uom_id, NULL AS m_product_uom_id, CASE p.attrsetvaluetype WHEN 'D' THEN p.m_attributesetinstance_id ELSE NULL END AS m_attributesetinstance_id, NULL AS m_locator_id, 'N' AS stocked FROM m_product p WHERE p.isgeneric = 'N']]></view>
+    <view name="M_PRODUCT_STOCK_V"><![CDATA[SELECT p.m_product_id || sd.m_storage_detail_id AS m_product_stock_v_id, l.ad_client_id, l.ad_org_id, l.isactive, sd.created, sd.createdby, sd.updated, sd.updatedby, sd.m_product_id, sd.qtyonhand, sd.qtyorderonhand, sd.preqtyonhand, sd.preqtyorderonhand, sd.c_uom_id, sd.m_product_uom_id, sd.m_attributesetinstance_id, sd.m_locator_id, 'Y' AS stocked, l.m_warehouse_id FROM m_storage_detail sd JOIN m_locator l ON sd.m_locator_id = l.m_locator_id JOIN m_product p ON sd.m_product_id = p.m_product_id AND p.isactive = 'Y' WHERE sd.qtyonhand <> 0 OR COALESCE(sd.qtyorderonhand, 0) <> 0 UNION ALL SELECT p.m_product_id AS m_product_stock_v_id, p.ad_client_id, p.ad_org_id, p.isactive, p.created, p.createdby, p.updated, p.updatedby, p.m_product_id, 0 AS qtyonhand, NULL AS qtyorderonhand, 0 AS preqtyonhand, NULL AS preqtyorderonhand, p.c_uom_id, NULL AS m_product_uom_id, CASE p.attrsetvaluetype WHEN 'D' THEN p.m_attributesetinstance_id ELSE NULL END AS m_attributesetinstance_id, NULL AS m_locator_id, 'N' AS stocked, NULL AS m_warehouse_id FROM m_product p WHERE p.isgeneric = 'N']]></view>
   </database>
--- a/model/src-db/database/model/views/M_RM_RECEIPT_PICK_EDIT.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/views/M_RM_RECEIPT_PICK_EDIT.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
   <database name="VIEW M_RM_RECEIPT_PICK_EDIT">
-    <view name="M_RM_RECEIPT_PICK_EDIT"><![CDATA[SELECT ol.c_orderline_id AS m_rm_receipt_pick_edit_id, ol.ad_client_id, COALESCE(iol.ad_org_id, ol.ad_org_id) AS ad_org_id, ol.isactive, ol.created, ol.createdby, COALESCE(iol.updated, ol.updated) AS updated, ol.updatedby, iol.m_inout_id, CASE WHEN iol.m_inoutline_id IS NOT NULL THEN 'Y' ELSE 'N' END AS ob_selected, ol.c_orderline_id, ol.m_product_id, ol.c_uom_id, ol.m_attributesetinstance_id, (-1) * ol.qtyordered AS returned, (-1) * (ol.qtyordered - ol.qtydelivered) AS pendingqty, (-1) * iol.movementqty AS receivingqty, iol.m_condition_goods_id, iol.m_locator_id, o.documentno AS returnorderno, o.issotrx, ol.line, iol.m_inoutline_id FROM c_orderline ol JOIN c_order o ON o.c_order_id = ol.c_order_id JOIN m_product p ON ol.m_product_id = p.m_product_id JOIN c_doctype dt ON dt.c_doctype_id = o.c_doctypetarget_id AND dt.isreturn = 'Y' LEFT JOIN (SELECT il2.m_inoutline_id, il2.ad_client_id, il2.ad_org_id, il2.isactive, il2.created, il2.createdby, il2.updated, il2.updatedby, il2.line, il2.description, il2.m_inout_id, il2.c_orderline_id, il2.m_locator_id, il2.m_product_id, il2.c_uom_id, il2.movementqty, il2.isinvoiced, il2.m_attributesetinstance_id, il2.isdescription, il2.quantityorder, il2.m_product_uom_id, il2.m_condition_goods_id FROM m_inoutline il2 JOIN m_inout i2 ON il2.m_inout_id = i2.m_inout_id AND i2.processed = 'N') iol ON iol.c_orderline_id = ol.c_orderline_id WHERE (ol.qtyordered - ol.qtydelivered) <> 0 AND o.docstatus = 'CO']]></view>
+    <view name="M_RM_RECEIPT_PICK_EDIT"><![CDATA[SELECT ol.c_orderline_id AS m_rm_receipt_pick_edit_id, ol.ad_client_id, COALESCE(iol.ad_org_id, ol.ad_org_id) AS ad_org_id, ol.isactive, ol.created, ol.createdby, COALESCE(iol.updated, ol.updated) AS updated, ol.updatedby, iol.m_inout_id, CASE WHEN iol.m_inoutline_id IS NOT NULL THEN 'Y' ELSE 'N' END AS ob_selected, ol.c_orderline_id, ol.m_product_id, ol.c_uom_id, ol.m_attributesetinstance_id, (-1) * ol.qtyordered AS returned, (-1) * (ol.qtyordered - ol.qtydelivered) AS pendingqty, (-1) * COALESCE(iol.aumqty, iol.movementqty) AS receivingqty, iol.m_condition_goods_id, iol.m_locator_id, o.documentno AS returnorderno, o.issotrx, ol.line, iol.m_inoutline_id, ol.c_aum, (-1) * ol.aumqty AS aumqty, (-1) * m_get_converted_aumqty(ol.m_product_id, ol.qtyordered - ol.qtydelivered, ol.c_aum) AS pendingaumqty, CASE WHEN iol.m_inoutline_id IS NULL THEN COALESCE(ol.c_aum, ol.c_uom_id) ELSE COALESCE(iol.c_aum, iol.c_uom_id) END AS returneduom FROM c_orderline ol JOIN c_order o ON o.c_order_id = ol.c_order_id JOIN m_product p ON ol.m_product_id = p.m_product_id JOIN c_doctype dt ON dt.c_doctype_id = o.c_doctypetarget_id AND dt.isreturn = 'Y' LEFT JOIN (SELECT il2.m_inoutline_id, il2.ad_client_id, il2.ad_org_id, il2.isactive, il2.created, il2.createdby, il2.updated, il2.updatedby, il2.line, il2.description, il2.m_inout_id, il2.c_orderline_id, il2.m_locator_id, il2.m_product_id, il2.c_uom_id, il2.movementqty, il2.isinvoiced, il2.m_attributesetinstance_id, il2.isdescription, il2.quantityorder, il2.m_product_uom_id, il2.m_condition_goods_id, il2.c_aum, il2.aumqty FROM m_inoutline il2 JOIN m_inout i2 ON il2.m_inout_id = i2.m_inout_id AND i2.processed = 'N') iol ON iol.c_orderline_id = ol.c_orderline_id WHERE (ol.qtyordered - ol.qtydelivered) <> 0 AND o.docstatus = 'CO']]></view>
   </database>
--- a/model/src-db/database/model/views/M_RM_SHIPMENT_PICK_EDIT.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/model/views/M_RM_SHIPMENT_PICK_EDIT.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
   <database name="VIEW M_RM_SHIPMENT_PICK_EDIT">
-    <view name="M_RM_SHIPMENT_PICK_EDIT"><![CDATA[SELECT COALESCE(sd.m_storage_detail_id, '') || ol.c_orderline_id AS m_rm_shipment_pick_edit_id, ol.ad_client_id, COALESCE(iol.ad_org_id, ol.ad_org_id) AS ad_org_id, ol.isactive, ol.createdby, ol.created, ol.updatedby, ol.updated, o.documentno AS returnorderno, ol.m_product_id, ol.m_attributesetinstance_id, ol.c_uom_id, (-1) * ol.qtyordered AS returned, (-1) * iol.movementqty AS movementqty, sd.m_locator_id, CASE WHEN sd.m_locator_id IS NULL THEN (-1) * ol.qtyordered ELSE COALESCE(sd.qtyonhand, 0) END AS availableqty, (-1) * (ol.qtyordered - to_number(COALESCE((SELECT to_char(sum(COALESCE(iol3.movementqty, 0))) AS sum FROM m_inoutline iol3 JOIN m_inout io3 ON iol3.m_inout_id = io3.m_inout_id AND io3.processed = 'Y' WHERE iol3.c_orderline_id = ol.c_orderline_id), '0'))) AS pendingqty, iol.m_inout_id, CASE WHEN iol.m_inout_id IS NOT NULL THEN 'Y' ELSE 'N' END AS ob_selected, ol.c_orderline_id, ol.line, iol.m_inoutline_id, p.isstocked, o.c_bpartner_id FROM c_orderline ol JOIN c_order o ON o.c_order_id = ol.c_order_id AND o.processed = 'Y' AND o.issotrx = 'N' LEFT JOIN m_storage_detail sd ON sd.m_product_id = ol.m_product_id AND COALESCE(sd.m_attributesetinstance_id, '0') = COALESCE(ol.m_attributesetinstance_id, '0') AND sd.qtyonhand > 0 LEFT JOIN m_locator l ON sd.m_locator_id = l.m_locator_id JOIN m_product p ON p.m_product_id = ol.m_product_id JOIN c_doctype dt ON o.c_doctypetarget_id = dt.c_doctype_id AND dt.isreturn = 'Y' LEFT JOIN (SELECT iol2.m_inoutline_id, iol2.m_inout_id, iol2.movementqty, iol2.c_orderline_id, iol2.ad_org_id, iol2.m_locator_id FROM m_inoutline iol2 JOIN m_inout io2 ON iol2.m_inout_id = io2.m_inout_id AND io2.processed = 'N') iol ON iol.c_orderline_id = ol.c_orderline_id AND iol.m_locator_id = sd.m_locator_id WHERE o.docstatus = 'CO']]></view>
+    <view name="M_RM_SHIPMENT_PICK_EDIT"><![CDATA[SELECT COALESCE(sd.m_storage_detail_id, '') || ol.c_orderline_id AS m_rm_shipment_pick_edit_id, ol.ad_client_id, COALESCE(iol.ad_org_id, ol.ad_org_id) AS ad_org_id, ol.isactive, ol.createdby, ol.created, ol.updatedby, ol.updated, o.documentno AS returnorderno, ol.m_product_id, ol.m_attributesetinstance_id, ol.c_uom_id, (-1) * ol.qtyordered AS returned, (-1) * iol.movementqty AS movementqty, sd.m_locator_id, CASE WHEN sd.m_locator_id IS NULL THEN (-1) * ol.qtyordered ELSE COALESCE(sd.qtyonhand, 0) END AS availableqty, (-1) * (ol.qtyordered - ol.qtydelivered) AS pendingqty, iol.m_inout_id, CASE WHEN iol.m_inout_id IS NOT NULL THEN 'Y' ELSE 'N' END AS ob_selected, ol.c_orderline_id, ol.line, iol.m_inoutline_id, p.isstocked, o.c_bpartner_id, l.ad_org_id AS locatororg, ol.c_aum, (-1) * ol.aumqty AS aumqty, ol.c_uom_id AS returneduom, (-1) * m_get_converted_aumqty(ol.m_product_id, ol.qtyordered - to_number(COALESCE((SELECT to_char(sum(COALESCE(iol3.movementqty, 0))) AS sum FROM m_inoutline iol3 JOIN m_inout io3 ON iol3.m_inout_id = io3.m_inout_id AND io3.processed = 'Y' WHERE iol3.c_orderline_id = ol.c_orderline_id), '0')), ol.c_aum) AS pendingaumqty, m_get_converted_aumqty(ol.m_product_id, CASE WHEN sd.m_locator_id IS NULL THEN (-1) * ol.qtyordered ELSE COALESCE(sd.qtyonhand, 0) END, ol.c_aum) AS availableaumqty, m_get_converted_qty(ol.m_product_id, 1, ol.c_aum) AS rate FROM c_orderline ol JOIN c_order o ON o.c_order_id = ol.c_order_id AND o.processed = 'Y' AND o.issotrx = 'N' AND o.isdelivered = 'N' JOIN m_product p ON p.m_product_id = ol.m_product_id LEFT JOIN m_storage_detail sd ON sd.m_product_id = ol.m_product_id AND COALESCE(sd.m_attributesetinstance_id, '0') = COALESCE(ol.m_attributesetinstance_id, '0') AND sd.qtyonhand > 0 JOIN c_doctype dt ON o.c_doctypetarget_id = dt.c_doctype_id AND dt.isreturn = 'Y' LEFT JOIN (SELECT iol2.m_inoutline_id, iol2.m_inout_id, iol2.movementqty, iol2.c_orderline_id, iol2.ad_org_id, iol2.m_locator_id FROM m_inoutline iol2 JOIN m_inout io2 ON iol2.m_inout_id = io2.m_inout_id AND io2.processed = 'N') iol ON iol.c_orderline_id = ol.c_orderline_id AND iol.m_locator_id = sd.m_locator_id LEFT JOIN m_locator l ON sd.m_locator_id = l.m_locator_id WHERE o.docstatus = 'CO' AND ol.qtyordered <> ol.qtydelivered]]></view>
   </database>
--- a/model/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -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>
@@ -3607,6 +3618,17 @@
 <!--BD5BE8557B94430A93CF1C6D56C2C8AB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--BD5BE8557B94430A93CF1C6D56C2C8AB--></AD_AUXILIARINPUT>
 
+<!--BE567769DA894FBFA62D2506D7987468--><AD_AUXILIARINPUT>
+<!--BE567769DA894FBFA62D2506D7987468-->  <AD_AUXILIARINPUT_ID><![CDATA[BE567769DA894FBFA62D2506D7987468]]></AD_AUXILIARINPUT_ID>
+<!--BE567769DA894FBFA62D2506D7987468-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BE567769DA894FBFA62D2506D7987468-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BE567769DA894FBFA62D2506D7987468-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BE567769DA894FBFA62D2506D7987468-->  <AD_TAB_ID><![CDATA[160]]></AD_TAB_ID>
+<!--BE567769DA894FBFA62D2506D7987468-->  <NAME><![CDATA[Parent_AD_Org]]></NAME>
+<!--BE567769DA894FBFA62D2506D7987468-->  <CODE><![CDATA[@AD_Org_ID@]]></CODE>
+<!--BE567769DA894FBFA62D2506D7987468-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--BE567769DA894FBFA62D2506D7987468--></AD_AUXILIARINPUT>
+
 <!--BF57492B668A4730BB32268C7981D281--><AD_AUXILIARINPUT>
 <!--BF57492B668A4730BB32268C7981D281-->  <AD_AUXILIARINPUT_ID><![CDATA[BF57492B668A4730BB32268C7981D281]]></AD_AUXILIARINPUT_ID>
 <!--BF57492B668A4730BB32268C7981D281-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3841,6 +3863,17 @@
 <!--D2EA2614DA604EB5A5B9A435C5BFBEBF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--D2EA2614DA604EB5A5B9A435C5BFBEBF--></AD_AUXILIARINPUT>
 
+<!--D2EE7808955A4C278C82204A8B7C8CDF--><AD_AUXILIARINPUT>
+<!--D2EE7808955A4C278C82204A8B7C8CDF-->  <AD_AUXILIARINPUT_ID><![CDATA[D2EE7808955A4C278C82204A8B7C8CDF]]></AD_AUXILIARINPUT_ID>
+<!--D2EE7808955A4C278C82204A8B7C8CDF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D2EE7808955A4C278C82204A8B7C8CDF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D2EE7808955A4C278C82204A8B7C8CDF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D2EE7808955A4C278C82204A8B7C8CDF-->  <AD_TAB_ID><![CDATA[5A6F0ED7230C462BA4010653BA3F816A]]></AD_TAB_ID>
+<!--D2EE7808955A4C278C82204A8B7C8CDF-->  <NAME><![CDATA[Parent_AD_Org]]></NAME>
+<!--D2EE7808955A4C278C82204A8B7C8CDF-->  <CODE><![CDATA[@#AD_Org_ID@]]></CODE>
+<!--D2EE7808955A4C278C82204A8B7C8CDF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D2EE7808955A4C278C82204A8B7C8CDF--></AD_AUXILIARINPUT>
+
 <!--D33D80B790164397B3023804EBA683C7--><AD_AUXILIARINPUT>
 <!--D33D80B790164397B3023804EBA683C7-->  <AD_AUXILIARINPUT_ID><![CDATA[D33D80B790164397B3023804EBA683C7]]></AD_AUXILIARINPUT_ID>
 <!--D33D80B790164397B3023804EBA683C7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/AD_CALLOUT.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/sourcedata/AD_CALLOUT.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -796,6 +796,15 @@
 <!--16E14A45CD654B78B2C22C1EF5B84A74-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--16E14A45CD654B78B2C22C1EF5B84A74--></AD_CALLOUT>
 
+<!--1AB9BD3356D643A79C058AA3B4EB175E--><AD_CALLOUT>
+<!--1AB9BD3356D643A79C058AA3B4EB175E-->  <AD_CALLOUT_ID><![CDATA[1AB9BD3356D643A79C058AA3B4EB175E]]></AD_CALLOUT_ID>
+<!--1AB9BD3356D643A79C058AA3B4EB175E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1AB9BD3356D643A79C058AA3B4EB175E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1AB9BD3356D643A79C058AA3B4EB175E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1AB9BD3356D643A79C058AA3B4EB175E-->  <NAME><![CDATA[OperativeQuantity_To_BaseQuantity]]></NAME>
+<!--1AB9BD3356D643A79C058AA3B4EB175E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1AB9BD3356D643A79C058AA3B4EB175E--></AD_CALLOUT>
+
 <!--1D72DBC1B228453A9A64443CAC145991--><AD_CALLOUT>
 <!--1D72DBC1B228453A9A64443CAC145991-->  <AD_CALLOUT_ID><![CDATA[1D72DBC1B228453A9A64443CAC145991]]></AD_CALLOUT_ID>
 <!--1D72DBC1B228453A9A64443CAC145991-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1098,6 +1107,16 @@
 <!--896299C6800F496C83FAE276E1F37B6A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--896299C6800F496C83FAE276E1F37B6A--></AD_CALLOUT>
 
+<!--8A5A44A91EBF4081B316572504DD68DA--><AD_CALLOUT>
+<!--8A5A44A91EBF4081B316572504DD68DA-->  <AD_CALLOUT_ID><![CDATA[8A5A44A91EBF4081B316572504DD68DA]]></AD_CALLOUT_ID>
+<!--8A5A44A91EBF4081B316572504DD68DA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8A5A44A91EBF4081B316572504DD68DA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8A5A44A91EBF4081B316572504DD68DA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8A5A44A91EBF4081B316572504DD68DA-->  <NAME><![CDATA[GtinFormat]]></NAME>
+<!--8A5A44A91EBF4081B316572504DD68DA-->  <DESCRIPTION><![CDATA[Validate GTIN Format]]></DESCRIPTION>
+<!--8A5A44A91EBF4081B316572504DD68DA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8A5A44A91EBF4081B316572504DD68DA--></AD_CALLOUT>
+
 <!--8D5A298D3BEF4E14BB9B9C2A7D0CFA18--><AD_CALLOUT>
 <!--8D5A298D3BEF4E14BB9B9C2A7D0CFA18-->  <AD_CALLOUT_ID><![CDATA[8D5A298D3BEF4E14BB9B9C2A7D0CFA18]]></AD_CALLOUT_ID>
 <!--8D5A298D3BEF4E14BB9B9C2A7D0CFA18-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1155,6 +1174,16 @@
 <!--AE1F6503340441ABBF1BC89FD46DEF13-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--AE1F6503340441ABBF1BC89FD46DEF13--></AD_CALLOUT>
 
+<!--B21CED81B17544D09C608BB9EEEC51F6--><AD_CALLOUT>
+<!--B21CED81B17544D09C608BB9EEEC51F6-->  <AD_CALLOUT_ID><![CDATA[B21CED81B17544D09C608BB9EEEC51F6]]></AD_CALLOUT_ID>
+<!--B21CED81B17544D09C608BB9EEEC51F6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B21CED81B17544D09C608BB9EEEC51F6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B21CED81B17544D09C608BB9EEEC51F6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B21CED81B17544D09C608BB9EEEC51F6-->  <NAME><![CDATA[AUM_ConversionRate]]></NAME>
+<!--B21CED81B17544D09C608BB9EEEC51F6-->  <DESCRIPTION><![CDATA[Set the BUM-AUM conversion rate]]></DESCRIPTION>
+<!--B21CED81B17544D09C608BB9EEEC51F6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B21CED81B17544D09C608BB9EEEC51F6--></AD_CALLOUT>
+
 <!--B7913B8983F94C7AA8D871F657D9DD32--><AD_CALLOUT>
 <!--B7913B8983F94C7AA8D871F657D9DD32-->  <AD_CALLOUT_ID><![CDATA[B7913B8983F94C7AA8D871F657D9DD32]]></AD_CALLOUT_ID>
 <!--B7913B8983F94C7AA8D871F657D9DD32-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/AD_COLUMN.xml	Fri Feb 03 11:59:02 2017 +0100
+++ b/model/src-db/database/sourcedata/AD_COLUMN.xml	Wed Mar 15 11:15:02 2017 +0000
@@ -16413,7 +16413,7 @@
 <!--1002-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--1002-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--1002-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
-<!--1002-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--1002-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--1002-->  <SEQNO><![CDATA[1]]></SEQNO>
 <!--1002-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--1002-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -16749,12 +16749,13 @@
 <!--1011-->  <AD_TABLE_ID><![CDATA[175]]></AD_TABLE_ID>
 <!--1011-->  <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
 <!--1011-->  <AD_REFERENCE_VALUE_ID><![CDATA[114]]></AD_REFERENCE_VALUE_ID>
+<!--1011-->  <AD_VAL_RULE_ID><![CDATA[1B7DEBAB23464AE68859B8CA5772D3FC]]></AD_VAL_RULE_ID>
 <!--1011-->  <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH>
 <!--1011-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--1011-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--1011-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--1011-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
-<!--1011-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--1011-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
 <!--1011-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--1011-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--1011-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
@@ -24053,7 +24054,7 @@
 <!--1619-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
 <!--1619-->  <AD_VAL_RULE_ID><![CDATA[425D5A5259F64FDABC82896596D23A25]]></AD_VAL_RULE_ID>
 <!--1619-->  <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH>
-<!--1619-->  <DEFAULTVALUE><![CDATA[@AD_Org_ID@]]></DEFAULTVALUE>
+<!--1619-->  <DEFAULTVALUE><![CDATA[@Parent_AD_Org@]]></DEFAULTVALUE>
 <!--1619-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--1619-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--1619-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
@@ -24067,12 +24068,13 @@
 <!--1619-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
 <!--1619-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--1619-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--1619-->  <AD_CALLOUT_ID><![CDATA[134]]></AD_CALLOUT_ID>
 <!--1619-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--1619-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1619-->  <POSITION><![CDATA[3]]></POSITION>
 <!--1619-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--1619-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--1619-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--1619-->  <VALIDATEONNEW><![CDATA[N]]></VALIDATEONNEW>
 <!--1619-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--1619-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--1619-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
@@ -24473,7 +24475,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>
@@ -24983,7 +24985,7 @@
 <!--1643-->  <AD_TABLE_ID><![CDATA[225]]></AD_TABLE_ID>
 <!--1643-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
 <!--1643-->  <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH>
-<!--1643-->  <DEFAULTVALUE><![CDATA[@AD_Org_ID@]]></DEFAULTVALUE>
+<!--1643-->  <DEFAULTVALUE><![CDATA[@#AD_Org_ID@]]></DEFAULTVALUE>
 <!--1643-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--1643-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--1643-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
@@ -24997,12 +24999,13 @@
 <!--1643-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
 <!--1643-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--1643-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--1643-->  <AD_CALLOUT_ID><![CDATA[134]]></AD_CALLOUT_ID>
 <!--1643-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--1643-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1643-->  <POSITION><![CDATA[3]]></POSITION>
 <!--1643-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--1643-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--1643-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--1643-->  <VALIDATEONNEW><![CDATA[N]]></VALIDATEONNEW>
 <!--1643-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--1643-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--1643-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
@@ -33708,7 +33711,8 @@
 <!--2222-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--2222-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--2222-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--2222-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--2222-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--2222-->  <READONLYLOGIC><![CDATA[@UomManagement@='Y']]></READONLYLOGIC>
 <!--2222-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--2222-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--2222-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -33787,7 +33791,7 @@
 <!--2224-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--2224-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--2224-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--2224-->  <READONLYLOGIC><![CDATA[@Processed@='Y' | (@IsSOTrx@='Y' & @ISLINKEDTOPRODUCT@='Y' & @PRODUCTTYPE@='S')]]></READONLYLOGIC>
+<!--2224-->  <READONLYLOGIC><![CDATA[@Processed@='Y' | (@IsSOTrx@='Y' & @ISLINKEDTOPRODUCT@='Y' & @PRODUCTTYPE@='S') | @UomManagement@='Y']]></READONLYLOGIC>
 <!--2224-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--2224-->  <SEQNO><![CDATA[0]]></SEQNO>
 <!--2224-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -61377,7 +61381,7 @@
 <!--3540-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--3540-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--3540-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--3540-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--3540-->  <READONLYLOGIC><![CDATA[@Processed@='Y' | @UomManagement@='Y']]></READONLYLOGIC>
 <!--3540-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
 <!--3540-->  <SEQNO><![CDATA[4]]></SEQNO>
 <!--3540-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -67334,6 +67338,7 @@
 <!--3812-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--3812-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--3812-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--3812-->  <READONLYLOGIC><![CDATA[@UomManagement@='Y']]></READONLYLOGIC>
 <!--3812-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--3812-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--3812-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -68066,7 +68071,7 @@
 <!--3841-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--3841-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--3841-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--3841-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--3841-->  <READONLYLOGIC><![CDATA[@Processed@='Y' | (@UomManagement@='Y' & @Financial_Invoice_Line@='N')]]></READONLYLOGIC>
 <!--3841-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--3841-->  <SEQNO><![CDATA[0]]></SEQNO>
 <!--3841-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -68303,6 +68308,7 @@
 <!--3847-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--3847-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--3847-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--3847-->  <READONLYLOGIC><![CDATA[@Processed@='Y' | (@UomManagement@='Y' & @Financial_Invoice_Line@='N')]]></READONLYLOGIC>
 <!--3847-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--3847-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--3847-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -206306,7 +206312,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>
@@ -214878,7 +214883,7 @@
 <!--803553-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--803553-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--803553-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--803553-->  <READONLYLOGIC><![CDATA[@DocStatus@='CO'|@DocStatus@='CL']]></READONLYLOGIC>
+<!--803553-->  <READONLYLOGIC><![CDATA[@DocStatus@='CO'|@DocStatus@='CL' | @UomManagement@='Y']]></READONLYLOGIC>
 <!--803553-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
 <!--803553-->  <SEQNO><![CDATA[120]]></SEQNO>
 <!--803553-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -232042,7 +232047,7 @@
 <!--1004400001-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--1004400001-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--1004400001-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--1004400001-->  <READONLYLOGIC><![CDATA[@DocStatus@='CO'|@DocStatus@='CL']]></READONLYLOGIC>
+<!--1004400001-->  <READONLYLOGIC><![CDATA[@DocStatus@='CO'|@DocStatus@='CL' | @UomManagement@='Y']]></READONLYLOGIC>
 <!--1004400001-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--1004400001-->  <SEQNO><![CDATA[190]]></SEQNO>
 <!--1004400001-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -244663,6 +244668,45 @@
 <!--062D7EC34B074DC4BF2BB6A1E973D171-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--062D7EC34B074DC4BF2BB6A1E973D171--></AD_COLUMN>
 
+<!--065407325C0F4FE4B8831900482884DD--><AD_COLUMN>
+<!--065407325C0F4FE4B8831900482884DD-->  <AD_COLUMN_ID><![CDATA[065407325C0F4FE4B8831900482884DD]]></AD_COLUMN_ID>
+<!--065407325C0F4FE4B8831900482884DD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--065407325C0F4FE4B8831900482884DD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--065407325C0F4FE4B8831900482884DD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--065407325C0F4FE4B8831900482884DD-->  <NAME><![CDATA[Organization]]></NAME>
+<!--065407325C0F4FE4B8831900482884DD-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--065407325C0F4FE4B8831900482884DD-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--065407325C0F4FE4B8831900482884DD-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
+<!--065407325C0F4FE4B8831900482884DD-->  <AD_TABLE_ID><![CDATA[339677E1B4854680A6BCCFBE5D6BE6B2]]></AD_TABLE_ID>
+<!--065407325C0F4FE4B8831900482884DD-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--065407325C0F4FE4B8831900482884DD-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--065407325C0F4FE4B8831900482884DD-->  <DEFAULTVALUE><![CDATA[@AD_ORG_ID@]]></DEFAULTVALUE>
+<!--065407325C0F4FE4B8831900482884DD-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--065407325C0F4FE4B8831900482884DD-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--065407325C0F4FE4B8831900482884DD-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--065407325C0F4FE4B8831900482884DD-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--065407325C0F4FE4B8831900482884DD-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--065407325C0F4FE4B8831900482884DD-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--065407325C0F4FE4B8831900482884DD-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--065407325C0F4FE4B8831900482884DD-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--065407325C0F4FE4B8831900482884DD-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--065407325C0F4FE4B8831900482884DD-->  <AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID>
+<!--065407325C0F4FE4B8831900482884DD-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--065407325C0F4FE4B8831900482884DD-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--065407325C0F4FE4B8831900482884DD-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--065407325C0F4FE4B8831900482884DD-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--065407325C0F4FE4B8831900482884DD-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--065407325C0F4FE4B8831900482884DD-->  <POSITION><![CDATA[3]]></POSITION>
+<!--065407325C0F4FE4B8831900482884DD-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--065407325C0F4FE4B8831900482884DD-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--065407325C0F4FE4B8831900482884DD-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--065407325C0F4FE4B8831900482884DD-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--065407325C0F4FE4B8831900482884DD-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--065407325C0F4FE4B8831900482884DD-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--065407325C0F4FE4B8831900482884DD-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--065407325C0F4FE4B8831900482884DD-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--065407325C0F4FE4B8831900482884DD--></AD_COLUMN>
+
 <!--0665AD61112844B18C999D519EDB12A0--><AD_COLUMN>
 <!--0665AD61112844B18C999D519EDB12A0-->  <AD_COLUMN_ID><![CDATA[0665AD61112844B18C999D519EDB12A0]]></AD_COLUMN_ID>
 <!--0665AD61112844B18C999D519EDB12A0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -245615,6 +245659,45 @@
 <!--0A82E8FF49E9440DA521F0EFB4EE1F9E-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--0A82E8FF49E9440DA521F0EFB4EE1F9E--></AD_COLUMN>
 
+<!--0A876947058D449FBA2EC32DB0893517--><AD_COLUMN>
+<!--0A876947058D449FBA2EC32DB0893517-->  <AD_COLUMN_ID><![CDATA[0A876947058D449FBA2EC32DB0893517]]></AD_COLUMN_ID>
+<!--0A876947058D449FBA2EC32DB0893517-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0A876947058D449FBA2EC32DB0893517-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0A876947058D449FBA2EC32DB0893517-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0A876947058D449FBA2EC32DB0893517-->  <NAME><![CDATA[Gtin]]></NAME>
+<!--0A876947058D449FBA2EC32DB0893517-->  <DESCRIPTION><![CDATA[The GTIN is a globally unique 14-digit number used to identify trade items, products, or services]]></DESCRIPTION>
+<!--0A876947058D449FBA2EC32DB0893517-->  <HELP><![CDATA[GTIN describes a family of GS1 (EAN.UCC) global data structures that employ 14 digits and can be encoded into various types of data carriers.]]></HELP>
+<!--0A876947058D449FBA2EC32DB0893517-->  <COLUMNNAME><![CDATA[Gtin]]></COLUMNNAME>
+<!--0A876947058D449FBA2EC32DB0893517-->  <AD_TABLE_ID><![CDATA[339677E1B4854680A6BCCFBE5D6BE6B2]]></AD_TABLE_ID>
+<!--0A876947058D449FBA2EC32DB0893517-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--0A876947058D449FBA2EC32DB0893517-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--0A876947058D449FBA2EC32DB0893517-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--0A876947058D449FBA2EC32DB0893517-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--0A876947058D449FBA2EC32DB0893517-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--0A876947058D449FBA2EC32DB0893517-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--0A876947058D449FBA2EC32DB0893517-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--0A876947058D449FBA2EC32DB0893517-->  <SEQNO><![CDATA[160]]></SEQNO>
+<!--0A876947058D449FBA2EC32DB0893517-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--0A876947058D449FBA2EC32DB0893517-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--0A876947058D449FBA2EC32DB0893517-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--0A876947058D449FBA2EC32DB0893517-->  <AD_ELEMENT_ID><![CDATA[82589E9B19A04B6C8F8E48E192082470]]></AD_ELEMENT_ID>
+<!--0A876947058D449FBA2EC32DB0893517-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--0A876947058D449FBA2EC32DB0893517-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--0A876947058D449FBA2EC32DB0893517-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--0A876947058D449FBA2EC32DB0893517-->  <AD_CALLOUT_ID><![CDATA[8A5A44A91EBF4081B316572504DD68DA]]></AD_CALLOUT_ID>
+<!--0A876947058D449FBA2EC32DB0893517-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--0A876947058D449FBA2EC32DB0893517-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--0A876947058D449FBA2EC32DB0893517-->  <POSITION><![CDATA[12]]></POSITION>
+<!--0A876947058D449FBA2EC32DB0893517-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--0A876947058D449FBA2EC32DB0893517-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--0A876947058D449FBA2EC32DB0893517-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--0A876947058D449FBA2EC32DB0893517-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--0A876947058D449FBA2EC32DB0893517-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--0A876947058D449FBA2EC32DB0893517-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--0A876947058D449FBA2EC32DB0893517-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--0A876947058D449FBA2EC32DB0893517-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--0A876947058D449FBA2EC32DB0893517--></AD_COLUMN>
+
 <!--0A8D83A03411457582C46CF4E4017D90--><AD_COLUMN>
 <!--0A8D83A03411457582C46CF4E4017D90-->  <AD_COLUMN_ID><![CDATA[0A8D83A03411457582C46CF4E4017D90]]></AD_COLUMN_ID>
 <!--0A8D83A03411457582C46CF4E4017D90-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -245962,6 +246045,46 @@
 <!--0BD260C46B9547BDB318DEBBDAB70536-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--0BD260C46B9547BDB318DEBBDAB70536--></AD_COLUMN>
 
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F--><AD_COLUMN>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <AD_COLUMN_ID><![CDATA[0BF27F0F6BEB4C9EA30BE0F4E63D271F]]></AD_COLUMN_ID>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <NAME><![CDATA[Conversion Rate]]></NAME>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <DESCRIPTION><![CDATA[Defines the conversion between Quantity and Process Quantity]]></DESCRIPTION>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <HELP><![CDATA[Defines how many final products each run of a process plan produces. See the following formula to understand the relation between the three elements:
+
+Process Quantity = Quantity  x  Conversion Rate]]></HELP>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <COLUMNNAME><![CDATA[Conversionrate]]></COLUMNNAME>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <AD_TABLE_ID><![CDATA[339677E1B4854680A6BCCFBE5D6BE6B2]]></AD_TABLE_ID>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <AD_REFERENCE_ID><![CDATA[22]]></AD_REFERENCE_ID>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <AD_ELEMENT_ID><![CDATA[800469]]></AD_ELEMENT_ID>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <POSITION><![CDATA[11]]></POSITION>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F--></AD_COLUMN>
+
 <!--0C1DE920F9734332A37F459F72CE5045--><AD_COLUMN>
 <!--0C1DE920F9734332A37F459F72CE5045-->  <AD_COLUMN_ID><![CDATA[0C1DE920F9734332A37F459F72CE5045]]></AD_COLUMN_ID>
 <!--0C1DE920F9734332A37F459F72CE5045-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -246926,6 +247049,44 @@
 <!--0FA23D0D90E34E8790627C9928566EE3-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--0FA23D0D90E34E8790627C9928566EE3--></AD_COLUMN>
 
+<!--1040A945DD4048AD8D43449847A6EB11--><AD_COLUMN>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <AD_COLUMN_ID><![CDATA[1040A945DD4048AD8D43449847A6EB11]]></AD_COLUMN_ID>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <NAME><![CDATA[Birth Day]]></NAME>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <DESCRIPTION><![CDATA[An anniversary of birth for a business partner.]]></DESCRIPTION>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <HELP><![CDATA[Birthday or Anniversary day]]></HELP>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <COLUMNNAME><![CDATA[Birthday]]></COLUMNNAME>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <AD_TABLE_ID><![CDATA[291]]></AD_TABLE_ID>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <AD_REFERENCE_ID><![CDATA[15]]></AD_REFERENCE_ID>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <SEQNO><![CDATA[620]]></SEQNO>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <AD_ELEMENT_ID><![CDATA[1891]]></AD_ELEMENT_ID>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <POSITION><![CDATA[96]]></POSITION>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--1040A945DD4048AD8D43449847A6EB11-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--1040A945DD4048AD8D43449847A6EB11--></AD_COLUMN>
+
 <!--1050C23BA102443A86AB2AF85D8F098D--><AD_COLUMN>
 <!--1050C23BA102443A86AB2AF85D8F098D-->  <AD_COLUMN_ID><![CDATA[1050C23BA102443A86AB2AF85D8F098D]]></AD_COLUMN_ID>
 <!--1050C23BA102443A86AB2AF85D8F098D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -247913,7 +248074,7 @@
 <!--1322478AD1C444D7B9116099CA2B7787-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--1322478AD1C444D7B9116099CA2B7787-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--1322478AD1C444D7B9116099CA2B7787-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1322478AD1C444D7B9116099CA2B7787-->  <POSITION><![CDATA[39]]></POSITION>
+<!--1322478AD1C444D7B9116099CA2B7787-->  <POSITION><![CDATA[38]]></POSITION>
 <!--1322478AD1C444D7B9116099CA2B7787-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--1322478AD1C444D7B9116099CA2B7787-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--1322478AD1C444D7B9116099CA2B7787-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -248352,6 +248513,44 @@
 <!--149DBC9F632549EDB94CE1FE07A37553-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--149DBC9F632549EDB94CE1FE07A37553--></AD_COLUMN>
 
+<!--14B5AC23F467461BB6D7815AC65439C5--><AD_COLUMN>
+<!--14B5AC23F467461BB6D7815AC6543