[UOM Management] Merge with pi.
authorDavid Miguelez <david.miguelez@openbravo.com>
Fri, 02 Dec 2016 12:32:08 +0100
changeset 30926 a57c4aa5d672
parent 30925 8138ee07c1cb (diff)
parent 30802 0fba1fd4f076 (current diff)
child 30927 cde4e226d8de
[UOM Management] Merge with pi.
.project
src-core/.project
src-db/database/model/functions/M_INOUT_POST.xml
src-db/database/model/views/M_RM_SHIPMENT_PICK_EDIT.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_ELEMENT.xml
src-db/database/sourcedata/AD_FIELD.xml
src-db/database/sourcedata/AD_TAB.xml
src-trl/.project
src-wad/.project
--- a/.project	Fri Dec 02 10:33:48 2016 +0100
+++ b/.project	Fri Dec 02 12:32:08 2016 +0100
@@ -15,6 +15,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.sonarlint.eclipse.core.sonarlintBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Fri Dec 02 10:33:48 2016 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -677,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>
@@ -1845,6 +1857,18 @@
 <!--D71BBF4693BD45329F17355A907B9D39-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--D71BBF4693BD45329F17355A907B9D39--></AD_MESSAGE>
 
+<!--D779698DB3A6486B801ED22037369E18--><AD_MESSAGE>
+<!--D779698DB3A6486B801ED22037369E18-->  <AD_MESSAGE_ID><![CDATA[D779698DB3A6486B801ED22037369E18]]></AD_MESSAGE_ID>
+<!--D779698DB3A6486B801ED22037369E18-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D779698DB3A6486B801ED22037369E18-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D779698DB3A6486B801ED22037369E18-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D779698DB3A6486B801ED22037369E18-->  <VALUE><![CDATA[OBUIAPP_RM_TooMuchShippedInUomManagement]]></VALUE>
+<!--D779698DB3A6486B801ED22037369E18-->  <MSGTEXT><![CDATA[The sum of the Ship Qty exceeds the Pending Qty for that particular RM Order No. and Line No.]]></MSGTEXT>
+<!--D779698DB3A6486B801ED22037369E18-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--D779698DB3A6486B801ED22037369E18-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--D779698DB3A6486B801ED22037369E18-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--D779698DB3A6486B801ED22037369E18--></AD_MESSAGE>
+
 <!--DAC8C406FB1D497CAF91619E6B8A5458--><AD_MESSAGE>
 <!--DAC8C406FB1D497CAF91619E6B8A5458-->  <AD_MESSAGE_ID><![CDATA[DAC8C406FB1D497CAF91619E6B8A5458]]></AD_MESSAGE_ID>
 <!--DAC8C406FB1D497CAF91619E6B8A5458-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java	Fri Dec 02 10:33:48 2016 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java	Fri Dec 02 12:32:08 2016 +0100
@@ -317,6 +317,9 @@
     // Good Movement of reserved stock
     globalResources.add(createStaticResource(
         "web/org.openbravo.client.application/js/materialmgmt/ob-reservedGoodMovement.js", false));
+    // Procurement
+    globalResources.add(createStaticResource(
+        "web/org.openbravo.client.application/js/procurement/ob-procurement.js", false));
 
     // Styling
     globalResources.add(createStyleSheetResource(
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/procurement/ob-procurement.js	Fri Dec 02 12:32:08 2016 +0100
@@ -0,0 +1,86 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2016 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+ */
+
+OB.PROC = OB.PROC || {};
+
+/**
+ * Modify base Quantity when the Aum Quantity changes
+ */
+
+OB.PROC.CreateLinesOnChangeQuantityAum = function (item, view, form, grid) {
+  var aumQty = item.getValue();
+  var record = item.grid.getSelectionObject().lastSelectionItem;
+  var aum = item.form.getItems()[item.grid.getColNum('aum')].getValue();
+  if (aumQty !== undefined) {
+    OB.RemoteCallManager.call('org.openbravo.common.actionhandler.GetConvertedQtyActionHandler', {
+      mProductId: record.product,
+      qty: aumQty,
+      toUOM: aum,
+      reverse: false
+    }, {}, function (response, data, request) {
+      if (data.qty) {
+        item.grid.setEditValue(item.grid.getEditRow(), 'orderedQuantity', data.qty);
+      }
+    });
+  }
+};
+
+/**
+ * Modify base Aum Quantity when the base Quantity changes
+ */
+
+OB.PROC.CreateLinesOnChangeQuantity = function (item, view, form, grid) {
+  var qty = item.getValue();
+  var record = grid.getSelectionObject().lastSelectionItem;
+  var aum = item.grid.getEditValues(item.grid.getRecordIndex(item.record)).aum;
+  if (qty !== undefined) {
+    OB.RemoteCallManager.call('org.openbravo.common.actionhandler.GetConvertedQtyActionHandler', {
+      mProductId: record.product,
+      qty: qty,
+      toUOM: aum,
+      reverse: true
+    }, {}, function (response, data, request) {
+      if (data.qty) {
+        item.grid.setEditValue(item.grid.getEditRow(), 'aumQuantity', data.qty);
+      }
+    });
+  }
+};
+
+/**
+ * Modify base Quantity when the Aum selected changes
+ */
+
+OB.PROC.CreateLinesOnChangeAum = function (item, validator, value, record) {
+  var aum = item.pickList.getSelection()[0].id;
+  var changed_record = item.grid.getSelectionObject().lastSelectionItem;
+  var aumQty = item.grid.getEditValues(item.grid.getRecordIndex(item.record)).aumQuantity;
+  if (aumQty !== undefined) {
+    OB.RemoteCallManager.call('org.openbravo.common.actionhandler.GetConvertedQtyActionHandler', {
+      mProductId: changed_record.product,
+      qty: aumQty,
+      toUOM: aum,
+      reverse: false
+    }, {}, function (response, data, request) {
+      if (data.qty) {
+        item.grid.setEditValue(item.grid.getEditRow(), 'orderedQuantity', data.qty);
+      }
+    });
+  }
+};
\ No newline at end of file
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js	Fri Dec 02 10:33:48 2016 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js	Fri Dec 02 12:32:08 2016 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2011-2015 Openbravo SLU
+ * All portions are Copyright (C) 2011-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -22,6 +22,30 @@
 /**
  * Check that entered return quantity is less than original inout qty.
  */
+
+OB.RM.RMReturnedUOMValidate = function (item, validator, value, record) {
+  var movementQty = isc.isA.Number(record.movementQuantity) ? new BigDecimal(String(record.movementQuantity)) : BigDecimal.prototype.ZERO,
+      returnedQty = isc.isA.Number(record.returnQtyOtherRM) ? new BigDecimal(String(record.returnQtyOtherRM)) : BigDecimal.prototype.ZERO,
+      newReturnedQty = isc.isA.Number(record.returned) ? new BigDecimal(String(record.returned)) : BigDecimal.prototype.ZERO;
+
+  var applyUOM = OB.PropertyStore.get('UomManagement') !== null && OB.PropertyStore.get('UomManagement') === 'Y' && record.returnedUOM !== record.uOM;
+
+  if (applyUOM) {
+    newReturnedQty = newReturnedQty.multiply(isc.isA.Number(record.aumConversionRate) ? new BigDecimal(String(record.aumConversionRate)) : BigDecimal.prototype.ONE);
+  }
+  if (newReturnedQty.compareTo(movementQty.subtract(returnedQty)) <= 0 && (record.returned > 0)) {
+    item.grid.view.messageBar.hide(true);
+    return true;
+  } else {
+    if (applyUOM) {
+      item.grid.view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null, OB.I18N.getLabel('OBUIAPP_RM_OutOfRange_AUM', [newReturnedQty.toString(), record.uOM$_identifier, movementQty.subtract(returnedQty).toString()]));
+    } else {
+      item.grid.view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null, OB.I18N.getLabel('OBUIAPP_RM_OutOfRange', [movementQty.subtract(returnedQty).toString()]));
+    }
+    return false;
+  }
+};
+
 OB.RM.RMOrderQtyValidate = function (item, validator, value, record) {
   if (!isc.isA.Number(value)) {
     return false;
@@ -33,10 +57,21 @@
   var movementQty = record.movementQuantity !== null ? new BigDecimal(String(record.movementQuantity)) : BigDecimal.prototype.ZERO,
       returnedQty = record.returnQtyOtherRM !== null ? new BigDecimal(String(record.returnQtyOtherRM)) : BigDecimal.prototype.ZERO,
       newReturnedQty = new BigDecimal(String(value));
+
+  var applyUOM = OB.PropertyStore.get('UomManagement') !== null && OB.PropertyStore.get('UomManagement') === 'Y' && record.returnedUOM !== record.uOM;
+
+  if (applyUOM) {
+    newReturnedQty = newReturnedQty.multiply(new BigDecimal(String(record.aumConversionRate)));
+  }
   if ((value !== null) && (newReturnedQty.compareTo(movementQty.subtract(returnedQty))) <= 0 && (value > 0)) {
+    item.grid.view.messageBar.hide(true);
     return true;
   } else {
-    item.grid.view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null, OB.I18N.getLabel('OBUIAPP_RM_OutOfRange', [movementQty.subtract(returnedQty).toString()]));
+    if (applyUOM) {
+      item.grid.view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null, OB.I18N.getLabel('OBUIAPP_RM_OutOfRange_AUM', [newReturnedQty.toString(), record.uOM$_identifier, movementQty.subtract(returnedQty).toString()]));
+    } else {
+      item.grid.view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null, OB.I18N.getLabel('OBUIAPP_RM_OutOfRange', [movementQty.subtract(returnedQty).toString()]));
+    }
     return false;
   }
 };
@@ -123,17 +158,31 @@
     return false;
   }
   // check shipped total quantity for the order line is below pending qty.
+  var isUomManagementEnabled = OB.PropertyStore.get('UomManagement');
   for (i = 0; i < selectedRecordsLength; i++) {
     editedRecord = isc.addProperties({}, selectedRecords[i], item.grid.getEditedRecord(selectedRecords[i]));
     if (editedRecord.orderLine === orderLine) {
-      pendingQty -= editedRecord.movementQuantity;
+      if (isUomManagementEnabled === 'Y') {
+        if (record.returnedUOM === editedRecord.returnedUOM) {
+          pendingQty -= editedRecord.movementQuantity;
+        } else {
+          var movementQuantity = new BigDecimal(String(editedRecord.movementQuantity));
+          var rate = new BigDecimal(String(editedRecord.rate));
+          pendingQty -= (editedRecord.returnedUOM !== editedRecord.uOM) ? movementQuantity.multiply(
+          rate).toString() : movementQuantity.divide(rate).toString();
+        }
+      }
       if (pendingQty < 0) {
-        item.grid.view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null, OB.I18N.getLabel('OBUIAPP_RM_TooMuchShipped', [record.pending]));
+        if (isUomManagementEnabled === 'Y') {
+          item.grid.view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null, OB.I18N.getLabel('OBUIAPP_RM_TooMuchShippedInUomManagement', []));
+        } else {
+          item.grid.view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null, OB.I18N.getLabel('OBUIAPP_RM_TooMuchShipped', [record.pending]));
+        }
         return false;
       }
     }
   }
-
+  item.grid.view.messageBar.hide();
   return true;
 };
 
@@ -158,10 +207,20 @@
       return false;
     }
     // calculate already shipped qty on grid
+    var isUomManagementEnabled = OB.PropertyStore.get('UomManagement');
     for (i = 0; i < selectedRecords.length; i++) {
       editedRecord = isc.addProperties({}, selectedRecords[i], grid.getEditedRecord(selectedRecords[i]));
       if (editedRecord.orderLine === orderLine && selectedRecords[i].id !== record.id) {
-        shippedQty = shippedQty.add(new BigDecimal(String(editedRecord.movementQuantity)));
+        if (isUomManagementEnabled === 'Y') {
+          if (record.returnedUOM === editedRecord.returnedUOM) {
+            shippedQty = shippedQty.add(new BigDecimal(String(editedRecord.movementQuantity)));
+          } else {
+            var movementQuantity = new BigDecimal(String(editedRecord.movementQuantity));
+            var rate = new BigDecimal(String(editedRecord.rate));
+            shippedQty = (editedRecord.returnedUOM !== editedRecord.uOM) ? shippedQty.add(movementQuantity.multiply(rate)) : shippedQty.add(movementQuantity.divide(rate));
+          }
+        }
+
       }
     }
     pending = pending.subtract(shippedQty);
@@ -171,4 +230,45 @@
       record.movementQuantity = availableQty.toString();
     }
   }
+};
+
+
+/**
+ * Update Pending and Available Qty values
+ */
+OB.RM.RMShipmentQtyValuesChange = function (item, view, form, grid) {
+  var record = grid.getSelectionObject().lastSelectionItem;
+  if (typeof record === 'undefined') {
+    record = grid.getSelectedRecord();
+  }
+  if (item.pickList.getSelection()[0].id !== item.getValue()) {
+    grid.setEditValue(item.grid.getEditRow(), 'movementQuantity', record.pendingQtyInAUM);
+    record.movementQuantity = record.pendingQtyInAUM;
+    var pending = record.pending;
+    grid.setEditValue(item.grid.getEditRow(), 'pending', record.pendingQtyInAUM);
+    record.pending = record.pendingQtyInAUM;
+    record.pendingQtyInAUM = pending;
+    var availableQty = record.availableQty;
+    grid.setEditValue(item.grid.getEditRow(), 'availableQty', record.availableQtyInAUM);
+    record.availableQty = record.availableQtyInAUM;
+    record.availableQtyInAUM = availableQty;
+    grid.setEditValue(item.grid.getEditRow(), 'returnedUOM', record.pendingQtyInAUM);
+    record.returnedUOM = item.pickList.getSelection()[0].id;
+  }
+};
+
+/**
+ * Update Pending value
+ */
+OB.RM.RMReceiptQtyValuesChange = function (item, view, form, grid) {
+  var record = grid.getSelectionObject().lastSelectionItem;
+  if (item.pickList.getSelection()[0].id !== item.getValue()) {
+    grid.setEditValue(item.grid.getEditRow(), 'receiving', record.pendingQtyInAUM);
+    record.receiving = record.pendingQtyInAUM;
+    var pending = record.pending;
+    grid.setEditValue(item.grid.getEditRow(), 'pending', record.pendingQtyInAUM);
+    record.pending = record.pendingQtyInAUM;
+    record.pendingQtyInAUM = pending;
+    record.returnedUOM = item.pickList.getSelection()[0].id;
+  }
 };
\ No newline at end of file
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-onchange-functions.js	Fri Dec 02 10:33:48 2016 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-onchange-functions.js	Fri Dec 02 12:32:08 2016 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2014-2015 Openbravo SLU
+ * All portions are Copyright (C) 2014-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -22,8 +22,7 @@
 OB = window.OB || {};
 OB.OnChange = window.OB.OnChange || {};
 
-
-//** {{{OB.OnChange.organizationCurrency}}} **
+// ** {{{OB.OnChange.organizationCurrency}}} **
 // Used in the 'Organization' window, in the 'Currency' onchange field
 // It shows a warning dialog when currency is changed
 OB.OnChange.organizationCurrency = function (item, view, form, grid) {
@@ -32,10 +31,10 @@
   }
 };
 
-//** {{{OB.OnChange.processDefinitionUIPattern}}} **
-//Used in the 'Process Definition' window, in the 'UI Pattern' field
-//When OBUIAPP_Report is selected and the Action Handler is empty it sets
-//the BaseReportActionHandler as default value.
+// ** {{{OB.OnChange.processDefinitionUIPattern}}} **
+// Used in the 'Process Definition' window, in the 'UI Pattern' field
+// When OBUIAPP_Report is selected and the Action Handler is empty it sets
+// the BaseReportActionHandler as default value.
 OB.OnChange.processDefinitionUIPattern = function (item, view, form, grid) {
   var classNameItem = form.getItem('javaClassName');
   if (item.getValue() === 'OBUIAPP_Report' && !classNameItem.getValue()) {
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Fri Dec 02 10:33:48 2016 +0100
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -1,5 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <data>
+<!--1264AC4A209749BD9709EF88CAB71153--><AD_TEXTINTERFACES>
+<!--1264AC4A209749BD9709EF88CAB71153-->  <AD_TEXTINTERFACES_ID><![CDATA[1264AC4A209749BD9709EF88CAB71153]]></AD_TEXTINTERFACES_ID>
+<!--1264AC4A209749BD9709EF88CAB71153-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1264AC4A209749BD9709EF88CAB71153-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1264AC4A209749BD9709EF88CAB71153-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1264AC4A209749BD9709EF88CAB71153-->  <TEXT><![CDATA[Show quantities in AUM]]></TEXT>
+<!--1264AC4A209749BD9709EF88CAB71153-->  <FILENAME><![CDATA[/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.html]]></FILENAME>
+<!--1264AC4A209749BD9709EF88CAB71153-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--1264AC4A209749BD9709EF88CAB71153-->  <AD_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_MODULE_ID>
+<!--1264AC4A209749BD9709EF88CAB71153--></AD_TEXTINTERFACES>
+
 <!--D217B67C621E11DEBEE4001B388C05F0--><AD_TEXTINTERFACES>
 <!--D217B67C621E11DEBEE4001B388C05F0-->  <AD_TEXTINTERFACES_ID><![CDATA[D217B67C621E11DEBEE4001B388C05F0]]></AD_TEXTINTERFACES_ID>
 <!--D217B67C621E11DEBEE4001B388C05F0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.html	Fri Dec 02 10:33:48 2016 +0100
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.html	Fri Dec 02 12:32:08 2016 +0100
@@ -13,7 +13,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2009-2011 Openbravo SLU
+ * All portions are Copyright (C) 2009-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -314,8 +314,8 @@
                     <select name="inpOrg" id="inpOrg" class="Combo Combo_TwoCells_width">
                       <option value=""> <div id="reportAD_ORGID"></div></option>
                     </select></td>
-		          <td class="TitleCell"></td>
-                  <td class="ContentCell"></td>
+		          <td class="TitleCell"><span id="showInAumLabel" class="LabelText" style="display:xx;">Show quantities in AUM</span></td>
+                  <td class="ContentCell"><input id="showInAumVal" name="inpShowInAumVal" type="checkbox"  style="display:xx;"/></td>
                   <td class="ContentCell"></td>
                 </tr>
                 <tr>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.java	Fri Dec 02 10:33:48 2016 +0100
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.java	Fri Dec 02 12:32:08 2016 +0100
@@ -11,7 +11,7 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2009-2015 Openbravo SLU 
+ * All portions are Copyright (C) 2009-2016 Openbravo SLU 
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -20,6 +20,8 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
 import java.util.HashMap;
 
 import javax.servlet.ServletException;
@@ -36,6 +38,7 @@
 import org.openbravo.erpCommon.utility.OBError;
 import org.openbravo.erpCommon.utility.ToolBar;
 import org.openbravo.erpCommon.utility.Utility;
+import org.openbravo.materialmgmt.UOMUtil;
 import org.openbravo.xmlEngine.XmlDocument;
 
 public class ReportOrderNotShipped extends HttpSecureAppServlet {
@@ -164,6 +167,11 @@
     } catch (Exception ex) {
       throw new ServletException(ex);
     }
+
+    xmlDocument.setParameter("isUomManagementEnabled", "none");
+    if (UOMUtil.isUomManagementEnabled()) {
+      xmlDocument.setParameter("isUomManagementEnabled", "table-cell");
+    }
     response.setContentType("text/html; charset=UTF-8");
     PrintWriter out = response.getWriter();
     out.println(xmlDocument.print());
@@ -188,6 +196,25 @@
     // Launch the report as usual, calling the JRXML file
     String strReportName = "@basedesign@/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.jrxml";
 
+    String strShowInAUM = vars.getRequestGlobalVariable("inpShowInAumVal",
+        "ReportOrderNotShipped|showInAum");
+    if (!strShowInAUM.isEmpty() && strShowInAUM.equalsIgnoreCase("on")) {
+      DecimalFormat df = Utility.getFormat(vars, "priceEdition");
+      for (int i = 0; i < data.length; i++) {
+        data[i].orderedqty = df.format(UOMUtil.getConvertedAumQty(data[i].mProductId,
+            new BigDecimal(data[i].orderedvalue), data[i].aum));
+        data[i].pendingqty = df.format(UOMUtil.getConvertedAumQty(data[i].mProductId,
+            new BigDecimal(data[i].pendingvalue), data[i].aum));
+        try {
+          data[i].qtyinstock = UOMUtil.getConvertedAumQty(data[i].mProductId,
+              new BigDecimal(data[i].stockvalue), data[i].aum).toString();
+        } catch (NumberFormatException nfe) {
+          data[i].qtyinstock = null;
+          data[i].aumsymbol = " ";
+        }
+      }
+    }
+
     if (strOutput.equals("pdf"))
       response.setHeader("Content-disposition", "inline; filename=OrdersAwaitingDelivery.pdf");
 
@@ -197,6 +224,7 @@
 
     HashMap<String, Object> parameters = new HashMap<String, Object>();
     parameters.put("REPORT_SUBTITLE", strSubTitle);
+    parameters.put("showInAUM", !strShowInAUM.isEmpty() && strShowInAUM.equalsIgnoreCase("on"));
     renderJR(vars, response, strReportName, strOutput, parameters, data, null);
   }
 
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.jrxml	Fri Dec 02 10:33:48 2016 +0100
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.jrxml	Fri Dec 02 12:32:08 2016 +0100
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.0.0.final using JasperReports Library version 6.0.0  -->
+<!-- 2016-07-13T22:59:47 -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="ReportOrderNotShipped" pageWidth="842" pageHeight="595" columnWidth="782" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20" uuid="b2108c38-f573-4cc5-8aee-4725a42348b0">
 	<property name="ireport.scriptlethandling" value="0"/>
 	<property name="ireport.encoding" value="UTF-8"/>
@@ -37,7 +39,9 @@
 	<style name="Total_Gray" mode="Opaque" forecolor="#000000" backcolor="#CCCCCC"/>
 	<parameter name="REPORT_TITLE" class="java.lang.String" isForPrompting="false"/>
 	<parameter name="REPORT_SUBTITLE" class="java.lang.String" isForPrompting="false"/>
-	<queryString>
+	<parameter name="NUMBERFORMAT" class="java.text.DecimalFormat" isForPrompting="false"/>
+	<parameter name="showInAUM" class="java.lang.Boolean" isForPrompting="false"/>
+	<queryString language="SQL">
 		<![CDATA[SELECT ORG.NAME AS ORGNAME, BP.NAME AS BPNAME,
 O.DOCUMENTNO, O.POREFERENCE, TO_DATE(O.DATEORDERED) AS DATEORDERED, TO_DATE(O.DATEPROMISED) AS DATEPROMISED,
 REFLISTV.NAME AS DELIVERYRULE, COALESCE(DLOC.NAME, BPADD.NAME) AS DELIVERYLOCATION,
@@ -98,6 +102,9 @@
 	<field name="orderedqty" class="java.lang.String"/>
 	<field name="pendingqty" class="java.lang.String"/>
 	<field name="qtyinstock" class="java.lang.String"/>
+	<field name="aumsymbol" class="java.lang.String">
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
 	<group name="orgname">
 		<groupExpression><![CDATA[$F{orgname}]]></groupExpression>
 		<groupHeader>
@@ -135,7 +142,12 @@
 		<groupFooter>
 			<band height="10" splitType="Stretch">
 				<line>
-					<reportElement key="line-6" x="0" y="9" width="782" height="1" forecolor="#555555" uuid="29106dfd-c1be-45d1-ac29-f830c90b2186"/>
+					<reportElement key="line-6" x="1" y="9" width="780" height="1" forecolor="#555555" uuid="29106dfd-c1be-45d1-ac29-f830c90b2186">
+						<property name="local_mesure_unitx" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
 				</line>
 				<line>
 					<reportElement key="line-17" stretchType="RelativeToBandHeight" x="0" y="0" width="1" height="10" forecolor="#555555" uuid="087d9158-0fe9-4a01-a7c9-e4b1d1037584"/>
@@ -201,7 +213,12 @@
 					<reportElement key="line-19" stretchType="RelativeToBandHeight" x="781" y="0" width="1" height="10" forecolor="#555555" uuid="40b3b316-9823-4dea-9e8d-9154dd8d9020"/>
 				</line>
 				<line>
-					<reportElement key="line-21" x="20" y="9" width="762" height="1" forecolor="#555555" uuid="1d92dfc8-554f-44c4-adad-2ed3d6e7a549"/>
+					<reportElement key="line-21" x="21" y="9" width="760" height="1" forecolor="#555555" uuid="1d92dfc8-554f-44c4-adad-2ed3d6e7a549">
+						<property name="local_mesure_unitx" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
 				</line>
 				<line>
 					<reportElement key="line-23" stretchType="RelativeToBandHeight" x="20" y="0" width="1" height="10" forecolor="#555555" uuid="b36ef598-0de5-4fa6-843b-08a61d37aeab"/>
@@ -213,6 +230,8 @@
 		<groupExpression><![CDATA[$F{documentno}]]></groupExpression>
 		<groupHeader>
 			<band height="60" splitType="Stretch">
+				<property name="local_mesure_unitheight" value="pixel"/>
+				<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				<staticText>
 					<reportElement key="staticText" style="GroupHeader_DarkGray" x="39" y="0" width="159" height="20" forecolor="#FFFFFF" uuid="f6c1bbcd-938d-4d6f-876b-31c117009da7"/>
 					<box>
@@ -349,7 +368,7 @@
 					<text><![CDATA[Delivery Location]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText" style="GroupHeader_DarkGray" x="62" y="40" width="214" height="20" forecolor="#FFFFFF" uuid="8a4b8527-7a8b-4c0b-82a1-7a2a8db30030"/>
+					<reportElement key="staticText" style="GroupHeader_DarkGray" x="61" y="40" width="215" height="20" forecolor="#FFFFFF" uuid="8a4b8527-7a8b-4c0b-82a1-7a2a8db30030"/>
 					<box leftPadding="5">
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -363,7 +382,7 @@
 					<text><![CDATA[Product]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText" style="GroupHeader_DarkGray" x="276" y="40" width="161" height="20" forecolor="#FFFFFF" uuid="12e657ab-c95c-4bb0-a3f0-4ea66c6a5f87"/>
+					<reportElement key="staticText" style="GroupHeader_DarkGray" x="276" y="40" width="144" height="20" forecolor="#FFFFFF" uuid="12e657ab-c95c-4bb0-a3f0-4ea66c6a5f87"/>
 					<box>
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -377,7 +396,7 @@
 					<text><![CDATA[Ordered Quantity]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText" style="GroupHeader_DarkGray" x="437" y="40" width="151" height="20" forecolor="#FFFFFF" uuid="7333cea3-abaf-4a3e-bc5c-c373cf253d70"/>
+					<reportElement key="staticText" style="GroupHeader_DarkGray" x="420" y="40" width="130" height="20" forecolor="#FFFFFF" uuid="7333cea3-abaf-4a3e-bc5c-c373cf253d70"/>
 					<box>
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -391,7 +410,10 @@
 					<text><![CDATA[Pending Quantity]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText" style="GroupHeader_DarkGray" x="588" y="40" width="194" height="20" forecolor="#FFFFFF" uuid="5e1d0a2b-7ec5-4229-87ac-66f99550f6c6"/>
+					<reportElement key="staticText" style="GroupHeader_DarkGray" x="550" y="40" width="170" height="20" forecolor="#FFFFFF" uuid="5e1d0a2b-7ec5-4229-87ac-66f99550f6c6">
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
 					<box>
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -416,10 +438,57 @@
 				<line>
 					<reportElement key="line-13" stretchType="RelativeToBandHeight" x="781" y="20" width="1" height="20" forecolor="#555555" uuid="b96c6afe-79e1-44e5-826a-292c2dcfb286"/>
 				</line>
+				<line>
+					<reportElement key="line-26" stretchType="RelativeToBandHeight" x="781" y="40" width="1" height="20" forecolor="#555555" uuid="a42679da-b29e-4450-a1c5-c9786720dd4d"/>
+				</line>
+				<staticText>
+					<reportElement key="staticText" style="GroupHeader_DarkGray" positionType="FixRelativeToBottom" x="720" y="40" width="61" height="20" forecolor="#FFFFFF" uuid="0efad178-dc21-4bcd-b219-bae0adb342cb">
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<printWhenExpression><![CDATA[$P{showInAUM}==true]]></printWhenExpression>
+					</reportElement>
+					<box>
+						<pen lineWidth="0.0"/>
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<bottomPen lineWidth="0.0" lineColor="#000000"/>
+						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font fontName="Bitstream Vera Sans" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[Unit]]></text>
+				</staticText>
+				<line>
+					<reportElement key="line-8" stretchType="RelativeToBandHeight" x="60" y="40" width="1" height="20" forecolor="#555555" uuid="7ca66ccd-2a54-439f-b8a1-4634046bd4ff"/>
+				</line>
+				<staticText>
+					<reportElement key="staticText" style="GroupHeader_DarkGray" x="550" y="40" width="231" height="20" forecolor="#FFFFFF" uuid="0e18d02c-d9d8-410b-9370-fb2f05e4ff84">
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="local_mesure_unitx" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+						<property name="local_mesure_unity" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.y" value="px"/>
+						<printWhenExpression><![CDATA[$P{showInAUM}==false]]></printWhenExpression>
+					</reportElement>
+					<box>
+						<pen lineWidth="0.0"/>
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<bottomPen lineWidth="0.0" lineColor="#000000"/>
+						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font fontName="Bitstream Vera Sans" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[Quantity in Stock]]></text>
+				</staticText>
 			</band>
 		</groupHeader>
 		<groupFooter>
 			<band height="10" splitType="Stretch">
+				<property name="local_mesure_unitheight" value="pixel"/>
 				<line>
 					<reportElement key="line-15" stretchType="RelativeToBandHeight" x="0" y="0" width="1" height="10" forecolor="#555555" uuid="47ea2eca-d4d8-4a25-8672-f3f1e00cc8e7"/>
 				</line>
@@ -433,10 +502,22 @@
 					<reportElement key="line-24" stretchType="RelativeToBandHeight" x="39" y="0" width="1" height="10" forecolor="#555555" uuid="d8b0e0fb-f55d-4449-bcb5-f76902bb3ff2"/>
 				</line>
 				<line>
-					<reportElement key="line-25" x="39" y="9" width="742" height="1" forecolor="#555555" uuid="73752f52-4456-400a-ab96-8892dec30ce3"/>
+					<reportElement key="line-25" x="40" y="9" width="741" height="1" forecolor="#555555" uuid="73752f52-4456-400a-ab96-8892dec30ce3">
+						<property name="local_mesure_unitx" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
 				</line>
 				<line>
-					<reportElement key="line-27" x="60" y="0" width="722" height="1" forecolor="#555555" uuid="e9d4f804-36a6-47a9-998a-572e739381aa"/>
+					<reportElement key="line-27" x="61" y="0" width="720" height="1" forecolor="#555555" uuid="e9d4f804-36a6-47a9-998a-572e739381aa">
+						<property name="local_mesure_unitx" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="local_mesure_unity" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					</reportElement>
 				</line>
 			</band>
 		</groupFooter>
@@ -486,8 +567,10 @@
 	</columnHeader>
 	<detail>
 		<band height="20" splitType="Stretch">
+			<property name="local_mesure_unitheight" value="pixel"/>
+			<property name="com.jaspersoft.studio.unit.height" value="px"/>
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement key="textField" style="Detail_Task" x="62" y="0" width="214" height="20" forecolor="#000000" uuid="1704bcd6-5519-4584-a72e-559a0c5bda4d"/>
+				<reportElement key="textField" style="Detail_Task" x="61" y="0" width="215" height="20" forecolor="#000000" uuid="1704bcd6-5519-4584-a72e-559a0c5bda4d"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -500,7 +583,7 @@
 				<textFieldExpression><![CDATA[$F{prodname}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement key="textField" style="Detail_Task" x="276" y="0" width="161" height="20" forecolor="#000000" uuid="d5dfd9df-9bef-4534-b7dc-ef4524bf09a1"/>
+				<reportElement key="textField" style="Detail_Task" x="276" y="0" width="144" height="20" forecolor="#000000" uuid="d5dfd9df-9bef-4534-b7dc-ef4524bf09a1"/>
 				<box rightPadding="5">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -513,7 +596,7 @@
 				<textFieldExpression><![CDATA[$F{orderedqty}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement key="textField" style="Detail_Task" x="437" y="0" width="151" height="20" forecolor="#000000" uuid="9fe4f1f8-849b-446f-8aad-a702f97532a4"/>
+				<reportElement key="textField" style="Detail_Task" x="420" y="0" width="130" height="20" forecolor="#000000" uuid="9fe4f1f8-849b-446f-8aad-a702f97532a4"/>
 				<box rightPadding="5">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -526,7 +609,9 @@
 				<textFieldExpression><![CDATA[$F{pendingqty}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement key="textField" style="Detail_Task" x="588" y="0" width="192" height="20" forecolor="#000000" uuid="bc400d8e-f7c9-4a15-a321-b9b3f7a80feb"/>
+				<reportElement key="textField" style="Detail_Task" x="550" y="0" width="170" height="20" forecolor="#000000" uuid="bc400d8e-f7c9-4a15-a321-b9b3f7a80feb">
+					<printWhenExpression><![CDATA[$P{showInAUM}==true]]></printWhenExpression>
+				</reportElement>
 				<box rightPadding="5">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -539,20 +624,66 @@
 				<textFieldExpression><![CDATA[($F{qtyinstock}!=null)?$F{qtyinstock}:new String(" ")]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement key="line-5" stretchType="RelativeToBandHeight" x="0" y="-2" width="1" height="22" forecolor="#555555" uuid="797cfc33-4975-4047-af18-c34c3a551856"/>
+				<reportElement key="line-5" stretchType="RelativeToBandHeight" x="0" y="0" width="1" height="20" forecolor="#555555" uuid="797cfc33-4975-4047-af18-c34c3a551856">
+					<property name="local_mesure_unitheight" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					<property name="local_mesure_unity" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+				</reportElement>
 			</line>
 			<line>
 				<reportElement key="line-8" stretchType="RelativeToBandHeight" x="39" y="0" width="1" height="20" forecolor="#555555" uuid="8c871f52-989e-416f-9a35-20d4ce1c4c1b"/>
 			</line>
 			<line>
-				<reportElement key="line-9" stretchType="RelativeToBandHeight" x="60" y="-20" width="1" height="40" forecolor="#555555" uuid="ebe986df-8d25-4b21-9736-4286979e872b"/>
-			</line>
-			<line>
-				<reportElement key="line-12" stretchType="RelativeToBandHeight" x="20" y="-2" width="1" height="22" forecolor="#555555" uuid="f2bc874f-009b-48fd-bb92-603034693de0"/>
+				<reportElement key="line-12" stretchType="RelativeToBandHeight" x="20" y="0" width="1" height="20" forecolor="#555555" uuid="f2bc874f-009b-48fd-bb92-603034693de0">
+					<property name="local_mesure_unity" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="local_mesure_unitheight" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
 			</line>
 			<line>
 				<reportElement key="line-26" stretchType="RelativeToBandHeight" x="781" y="0" width="1" height="20" forecolor="#555555" uuid="1b0001f6-cbb1-4e30-bd3c-ee69a14713c9"/>
 			</line>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement key="textField" style="Detail_Task" x="720" y="0" width="61" height="20" forecolor="#000000" uuid="affab195-eb89-42f0-b576-d39ea85f4a60">
+					<printWhenExpression><![CDATA[$P{showInAUM}==true]]></printWhenExpression>
+				</reportElement>
+				<box rightPadding="5">
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="Bitstream Vera Sans" size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{aumsymbol}]]></textFieldExpression>
+			</textField>
+			<line>
+				<reportElement key="line-8" stretchType="RelativeToBandHeight" x="60" y="0" width="1" height="20" forecolor="#555555" uuid="55f2d804-357e-49c2-9efe-5c25a802e588"/>
+			</line>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement key="textField" style="Detail_Task" x="550" y="0" width="231" height="20" forecolor="#000000" uuid="dea74cff-1396-482d-b3c5-c9ce80e22013">
+					<property name="local_mesure_unitx" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					<property name="local_mesure_unity" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="local_mesure_unitwidth" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					<printWhenExpression><![CDATA[$P{showInAUM}==false]]></printWhenExpression>
+				</reportElement>
+				<box rightPadding="5">
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="Bitstream Vera Sans" size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[($F{qtyinstock}!=null)?$F{qtyinstock}:new String(" ")]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<columnFooter>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.xml	Fri Dec 02 10:33:48 2016 +0100
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -12,7 +12,7 @@
 * under the License. 
 * The Original Code is Openbravo ERP. 
 * The Initial Developer of the Original Code is Openbravo SLU 
-* All portions are Copyright (C) 2009 Openbravo SLU 
+* All portions are Copyright (C) 20016 Openbravo SLU 
 * All Rights Reserved. 
 * Contributor(s):  ______________________________________.
 ************************************************************************
@@ -50,5 +50,7 @@
   <SUBREPORT id="reportAD_ORGID" name="reportAD_ORGID" report="org/openbravo/erpCommon/reference/List">
     <ARGUMENT name="parameterListSelected" withId="paramAD_ORGID"/>
   </SUBREPORT>
+  <PARAMETER id="showInAumLabel" name="isUomManagementEnabled" attribute="style" replace="xx"/>
+  <PARAMETER id="showInAumVal" name="isUomManagementEnabled" attribute="style" replace="xx"/>
   <DISCARD id="discard"/>
 </REPORT>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped_data.xsql	Fri Dec 02 10:33:48 2016 +0100
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped_data.xsql	Fri Dec 02 12:32:08 2016 +0100
@@ -42,7 +42,25 @@
         WHERE LOC.M_LOCATOR_ID = SD.M_LOCATOR_ID
         AND LOC.M_WAREHOUSE_ID = OL.M_WAREHOUSE_ID
       )
-    ) || ' ' || COALESCE(TO_CHAR(UO.UOMSYMBOL), '') AS QTYINSTOCK
+    ) || ' ' || COALESCE(TO_CHAR(UO.UOMSYMBOL), '') AS QTYINSTOCK,
+    OL.AUMQTY,
+    (CASE WHEN COALESCE(OL.C_AUM,'0') = '0' THEN (SELECT UOMSYMBOL FROM C_UOM WHERE C_UOM_ID = M_GET_DEFAULT_AUM_FOR_DOCUMENT(OL.M_PRODUCT_ID, O.C_DOCTYPE_ID)) ELSE (SELECT UOMSYMBOL FROM C_UOM WHERE C_UOM_ID = OL.C_AUM) END ) AS AUMSYMBOL,
+    (COALESCE (OL.C_AUM, M_GET_DEFAULT_AUM_FOR_DOCUMENT(OL.M_PRODUCT_ID, O.C_DOCTYPE_ID))) AS AUM, 
+    OL.M_PRODUCT_ID, OL.QTYORDERED AS ORDEREDVALUE, (OL.QTYORDERED-OL.QTYDELIVERED) AS PENDINGVALUE,
+    (
+      SELECT SUM(SD.QTYONHAND)
+      FROM M_STORAGE_DETAIL SD
+      WHERE SD.M_PRODUCT_ID = OL.M_PRODUCT_ID
+      AND SD.C_UOM_ID = OL.C_UOM_ID
+      AND COALESCE(SD.M_ATTRIBUTESETINSTANCE_ID, '0') = COALESCE(OL.M_ATTRIBUTESETINSTANCE_ID, SD.M_ATTRIBUTESETINSTANCE_ID, '0')
+      AND COALESCE(SD.M_PRODUCT_UOM_ID,'-1') = COALESCE(OL.M_PRODUCT_UOM_ID, '-1')
+      AND EXISTS (
+        SELECT 1
+        FROM M_LOCATOR LOC
+        WHERE LOC.M_LOCATOR_ID = SD.M_LOCATOR_ID
+        AND LOC.M_WAREHOUSE_ID = OL.M_WAREHOUSE_ID
+      )
+    ) AS STOCKVALUE     
     FROM C_ORDER O
     JOIN AD_ORG ORG ON O.AD_ORG_ID = ORG.AD_ORG_ID
     JOIN C_BPARTNER BP ON O.C_BPARTNER_ID = BP.C_BPARTNER_ID
--- a/src-core/.project	Fri Dec 02 10:33:48 2016 +0100
+++ b/src-core/.project	Fri Dec 02 12:32:08 2016 +0100
@@ -10,6 +10,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.sonarlint.eclipse.core.sonarlintBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
--- a/src-db/database/model/functions/C_INVOICE_CREATE.xml	Fri Dec 02 10:33:48 2016 +0100
+++ b/src-db/database/model/functions/C_INVOICE_CREATE.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -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/src-db/database/model/functions/C_INVOICE_POST.xml	Fri Dec 02 10:33:48 2016 +0100
+++ b/src-db/database/model/functions/C_INVOICE_POST.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -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/src-db/database/model/functions/C_ORDER_POST1.xml	Fri Dec 02 10:33:48 2016 +0100
+++ b/src-db/database/model/functions/C_ORDER_POST1.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -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/src-db/database/model/functions/M_COPY_PRODUCT_TEMPLATE.xml	Fri Dec 02 10:33:48 2016 +0100
+++ b/src-db/database/model/functions/M_COPY_PRODUCT_TEMPLATE.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -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/src-db/database/model/functions/M_EXPLODEBOMNOTSTOCK.xml	Fri Dec 02 10:33:48 2016 +0100
+++ b/src-db/database/model/functions/M_EXPLODEBOMNOTSTOCK.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -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/src-db/database/model/functions/M_GET_CONVERTED_AUMQTY.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -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/src-db/database/model/functions/M_GET_CONVERTED_QTY.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -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/src-db/database/model/functions/M_GET_DEFAULT_AUM_FOR_DOCUMENT.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -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/src-db/database/model/functions/M_INOUTEXPLODEBOMNOTSTOCK.xml	Fri Dec 02 10:33:48 2016 +0100
+++ b/src-db/database/model/functions/M_INOUTEXPLODEBOMNOTSTOCK.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -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/src-db/database/model/functions/M_INOUT_CREATE.xml	Fri Dec 02 10:33:48 2016 +0100
+++ b/src-db/database/model/functions/M_INOUT_CREATE.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -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/src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml	Fri Dec 02 10:33:48 2016 +0100
+++ b/src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -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/src-db/database/model/functions/M_INOUT_POST.xml	Fri Dec 02 10:33:48 2016 +0100
+++ b/src-db/database/model/functions/M_INOUT_POST.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -1118,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
               (
@@ -1130,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/src-db/database/model/functions/M_REQUISITION_CREATEPO.xml	Fri Dec 02 10:33:48 2016 +0100
+++ b/src-db/database/model/functions/M_REQUISITION_CREATEPO.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -61,6 +61,11 @@
   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;
@@ -277,6 +282,23 @@
         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;
@@ -291,7 +313,8 @@
           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,
@@ -301,7 +324,8 @@
           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/src-db/database/model/tables/C_CONVERSION_RATE.xml	Fri Dec 02 10:33:48 2016 +0100
+++ b/src-db/database/model/tables/C_CONVERSION_RATE.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -82,5 +82,6 @@
         <unique-column name="VALIDFROM"/>
       </unique>
       <check name="C_CONVERSION_RA_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+      <check name="C_CONVERSION_RATE_RATE_CHECK"><![CDATA[MULTIPLYRATE > 0 AND DIVIDERATE > 0]]></check>
     </table>
   </database>
--- a/src-db/database/model/tables/C_INVOICELINE.xml	Fri Dec 02 10:33:48 2016 +0100
+++ b/src-db/database/model/tables/C_INVOICELINE.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -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/src-db/database/model/tables/C_ORDERLINE.xml	Fri Dec 02 10:33:48 2016 +0100
+++ b/src-db/database/model/tables/C_ORDERLINE.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -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>
@@ -381,7 +392,7 @@
       <index name="C_ORDERLINE_PRODUCT" unique="false">
         <index-column name="M_PRODUCT_ID"/>
       </index>
-      <check name="C_ORDERLINE_CHECK1"><![CDATA[QUANTITYORDER IS NULL AND M_PRODUCT_UOM_ID IS NULL OR QUANTITYORDER IS NOT NULL AND M_PRODUCT_UOM_ID IS NOT NULL]]></check>
+      <check name="C_ORDERLINE_CHECK1"><![CDATA[(QUANTITYORDER IS NULL OR QUANTITYORDER = 0) AND M_PRODUCT_UOM_ID IS NULL OR QUANTITYORDER IS NOT NULL AND M_PRODUCT_UOM_ID IS NOT NULL]]></check>
       <check name="C_ORDERLINE_CHECK2"><![CDATA[LINENETAMT = 0 OR C_TAX_ID IS NOT NULL]]></check>
       <check name="C_ORDERLINE_DIRECTSHIP_CHECK"><![CDATA[DIRECTSHIP IN ('Y', 'N')]]></check>
       <check name="C_ORDERLINE_EXPLODE_CHECK"><![CDATA[EXPLODE IN ('Y', 'N')]]></check>
--- a/src-db/database/model/tables/M_INOUTLINE.xml	Fri Dec 02 10:33:48 2016 +0100
+++ b/src-db/database/model/tables/M_INOUTLINE.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -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/src-db/database/model/tables/M_PRODUCT_AUM.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -0,0 +1,91 @@
+<?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_UOM_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+    </table>
+  </database>
--- a/src-db/database/model/tables/M_REQUISITIONLINE.xml	Fri Dec 02 10:33:48 2016 +0100
+++ b/src-db/database/model/tables/M_REQUISITIONLINE.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -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>
--- a/src-db/database/model/triggers/C_INVLINE_CHK_RESTRICTIONS_TRG.xml	Fri Dec 02 10:33:48 2016 +0100
+++ b/src-db/database/model/triggers/C_INVLINE_CHK_RESTRICTIONS_TRG.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -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/src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml	Fri Dec 02 10:33:48 2016 +0100
+++ b/src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -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/src-db/database/model/triggers/M_INOUTLINE_TRG.xml	Fri Dec 02 10:33:48 2016 +0100
+++ b/src-db/database/model/triggers/M_INOUTLINE_TRG.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -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/src-db/database/model/triggers/M_IOLINE_CHK_RESTRICTIONS_TRG.xml	Fri Dec 02 10:33:48 2016 +0100
+++ b/src-db/database/model/triggers/M_IOLINE_CHK_RESTRICTIONS_TRG.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -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/src-db/database/model/triggers/M_PRODUCT_AUM_TRG.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -0,0 +1,61 @@
+<?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 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) 2016 Openbravo, S.L.U.
+  *
+  * Specifically, this derivative work is based upon the following Compiere
+  * file and version.
+  *************************************************************************/
+
+v_Count NUMBER;
+v_Match BOOLEAN;
+v_GTINALLOWEDCHAR VARCHAR(60) := 'QWERTYUIOPASDFGHJKLZXCVBNM0123456789';
+
+BEGIN
+
+  IF AD_isTriggerEnabled()='N' THEN RETURN;
+  END IF;
+
+  IF (:new.conversionrate = 0) THEN
+    RAISE_APPLICATION_ERROR(-20000, '@ConversionrateGTZero@');
+  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/src-db/database/model/triggers/M_REQUISITIONLINE_TRG.xml	Fri Dec 02 10:33:48 2016 +0100
+++ b/src-db/database/model/triggers/M_REQUISITIONLINE_TRG.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -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/src-db/database/model/views/M_CREATEPOLINES_PE_V.xml	Fri Dec 02 10:33:48 2016 +0100
+++ b/src-db/database/model/views/M_CREATEPOLINES_PE_V.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -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/src-db/database/model/views/M_RM_RECEIPT_PICK_EDIT.xml	Fri Dec 02 10:33:48 2016 +0100
+++ b/src-db/database/model/views/M_RM_RECEIPT_PICK_EDIT.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -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/src-db/database/model/views/M_RM_SHIPMENT_PICK_EDIT.xml	Fri Dec 02 10:33:48 2016 +0100
+++ b/src-db/database/model/views/M_RM_SHIPMENT_PICK_EDIT.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -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 - 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 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>
+    <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/src-db/database/sourcedata/AD_CALLOUT.xml	Fri Dec 02 10:33:48 2016 +0100
+++ b/src-db/database/sourcedata/AD_CALLOUT.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -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/src-db/database/sourcedata/AD_COLUMN.xml	Fri Dec 02 10:33:48 2016 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -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>
@@ -33710,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>
@@ -33789,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>
@@ -61379,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>
@@ -67336,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>
@@ -68068,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>
@@ -68305,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>
@@ -214879,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>
@@ -232043,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>
@@ -244664,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>
@@ -245616,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>
@@ -245963,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>
@@ -247952,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>
@@ -254427,6 +254549,44 @@
 <!--268D8AD41BE941C6988EB4CA9C16F67D-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--268D8AD41BE941C6988EB4CA9C16F67D--></AD_COLUMN>
 
+<!--26B12F673B704AA5AA021037BA3E8A85--><AD_COLUMN>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <AD_COLUMN_ID><![CDATA[26B12F673B704AA5AA021037BA3E8A85]]></AD_COLUMN_ID>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <NAME><![CDATA[Quantity in Alternative UOM]]></NAME>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <DESCRIPTION><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></DESCRIPTION>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <HELP><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></HELP>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <COLUMNNAME><![CDATA[Aumqty]]></COLUMNNAME>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <AD_TABLE_ID><![CDATA[09C5EA393D0D41CEBB522DEC67534574]]></AD_TABLE_ID>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <AD_REFERENCE_ID><![CDATA[29]]></AD_REFERENCE_ID>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <SEQNO><![CDATA[260]]></SEQNO>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <AD_ELEMENT_ID><![CDATA[9AAC1EE202DB487D89C4A3E75631E6C4]]></AD_ELEMENT_ID>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <POSITION><![CDATA[25]]></POSITION>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--26B12F673B704AA5AA021037BA3E8A85-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--26B12F673B704AA5AA021037BA3E8A85--></AD_COLUMN>
+
 <!--26B6C690FE9643EBB1F3E1D6FC9D9A3B--><AD_COLUMN>
 <!--26B6C690FE9643EBB1F3E1D6FC9D9A3B-->  <AD_COLUMN_ID><![CDATA[26B6C690FE9643EBB1F3E1D6FC9D9A3B]]></AD_COLUMN_ID>
 <!--26B6C690FE9643EBB1F3E1D6FC9D9A3B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -257552,6 +257712,46 @@
 <!--3223FA76476C4E228AB7BD7BA762DF47-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--3223FA76476C4E228AB7BD7BA762DF47--></AD_COLUMN>
 
+<!--3243D34AA7E9477A95A5AFF70824363B--><AD_COLUMN>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <AD_COLUMN_ID><![CDATA[3243D34AA7E9477A95A5AFF70824363B]]></AD_COLUMN_ID>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <NAME><![CDATA[Operative Quantity]]></NAME>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <DESCRIPTION><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></DESCRIPTION>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <HELP><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></HELP>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <COLUMNNAME><![CDATA[Aumqty]]></COLUMNNAME>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <AD_TABLE_ID><![CDATA[333]]></AD_TABLE_ID>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <AD_REFERENCE_ID><![CDATA[29]]></AD_REFERENCE_ID>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <FIELDLENGTH><![CDATA[2]]></FIELDLENGTH>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <SEQNO><![CDATA[213]]></SEQNO>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <AD_ELEMENT_ID><![CDATA[9AAC1EE202DB487D89C4A3E75631E6C4]]></AD_ELEMENT_ID>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <AD_CALLOUT_ID><![CDATA[1AB9BD3356D643A79C058AA3B4EB175E]]></AD_CALLOUT_ID>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <POSITION><![CDATA[58]]></POSITION>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--3243D34AA7E9477A95A5AFF70824363B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--3243D34AA7E9477A95A5AFF70824363B--></AD_COLUMN>
+
 <!--3244FF12369C49EE94E566544632B322--><AD_COLUMN>
 <!--3244FF12369C49EE94E566544632B322-->  <AD_COLUMN_ID><![CDATA[3244FF12369C49EE94E566544632B322]]></AD_COLUMN_ID>
 <!--3244FF12369C49EE94E566544632B322-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -260310,6 +260510,45 @@
 <!--3AC9F8370DD7406F91E48296293FBDA7-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--3AC9F8370DD7406F91E48296293FBDA7--></AD_COLUMN>
 
+<!--3AE052A78717426CBCB4F828CC76A87E--><AD_COLUMN>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <AD_COLUMN_ID><![CDATA[3AE052A78717426CBCB4F828CC76A87E]]></AD_COLUMN_ID>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <NAME><![CDATA[Returned UOM]]></NAME>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <DESCRIPTION><![CDATA[Returned UOM]]></DESCRIPTION>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <HELP><![CDATA[Returned UOM]]></HELP>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <COLUMNNAME><![CDATA[Returneduom]]></COLUMNNAME>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <AD_TABLE_ID><![CDATA[09C5EA393D0D41CEBB522DEC67534574]]></AD_TABLE_ID>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <AD_REFERENCE_VALUE_ID><![CDATA[F418216771C7413CB74DCFBFA548F540]]></AD_REFERENCE_VALUE_ID>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <SEQNO><![CDATA[300]]></SEQNO>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <AD_ELEMENT_ID><![CDATA[C9F2D21FF4DA49C09186CFA4A31E6F3D]]></AD_ELEMENT_ID>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <POSITION><![CDATA[28]]></POSITION>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--3AE052A78717426CBCB4F828CC76A87E--></AD_COLUMN>
+
 <!--3AE62A8262C1481EB0AA36315B026371--><AD_COLUMN>
 <!--3AE62A8262C1481EB0AA36315B026371-->  <AD_COLUMN_ID><![CDATA[3AE62A8262C1481EB0AA36315B026371]]></AD_COLUMN_ID>
 <!--3AE62A8262C1481EB0AA36315B026371-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -265778,6 +266017,44 @@
 <!--4F226108AD734B6EA311D2090E732F8B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--4F226108AD734B6EA311D2090E732F8B--></AD_COLUMN>
 
+<!--4F3F7744BF254DC0889280DB93FF9465--><AD_COLUMN>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <AD_COLUMN_ID><![CDATA[4F3F7744BF254DC0889280DB93FF9465]]></AD_COLUMN_ID>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <NAME><![CDATA[Receiving]]></NAME>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <DESCRIPTION><![CDATA[Receiving quantity]]></DESCRIPTION>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <HELP><![CDATA[Receiving quantity]]></HELP>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <COLUMNNAME><![CDATA[Receivingqty]]></COLUMNNAME>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <AD_TABLE_ID><![CDATA[09C5EA393D0D41CEBB522DEC67534574]]></AD_TABLE_ID>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <AD_REFERENCE_ID><![CDATA[29]]></AD_REFERENCE_ID>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <SEQNO><![CDATA[310]]></SEQNO>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <AD_ELEMENT_ID><![CDATA[B0D45E247BECF1A8E040007F0100514B]]></AD_ELEMENT_ID>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <POSITION><![CDATA[17]]></POSITION>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--4F3F7744BF254DC0889280DB93FF9465-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--4F3F7744BF254DC0889280DB93FF9465--></AD_COLUMN>
+
 <!--4F6FBAF242EE43B98923BAC82AB94165--><AD_COLUMN>
 <!--4F6FBAF242EE43B98923BAC82AB94165-->  <AD_COLUMN_ID><![CDATA[4F6FBAF242EE43B98923BAC82AB94165]]></AD_COLUMN_ID>
 <!--4F6FBAF242EE43B98923BAC82AB94165-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -285207,6 +285484,48 @@
 <!--5DB097286163477A83072E0029B23D88-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--5DB097286163477A83072E0029B23D88--></AD_COLUMN>
 
+<!--5DB325BF62E748F5B4DF85FD0381BD8F--><AD_COLUMN>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <AD_COLUMN_ID><![CDATA[5DB325BF62E748F5B4DF85FD0381BD8F]]></AD_COLUMN_ID>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <NAME><![CDATA[Operative UOM]]></NAME>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <DESCRIPTION><![CDATA[A non monetary unit of measure.]]></DESCRIPTION>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <HELP><![CDATA[The Alternative UOM defines a unique non monetary unit of measure]]></HELP>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <COLUMNNAME><![CDATA[C_Aum]]></COLUMNNAME>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <AD_TABLE_ID><![CDATA[333]]></AD_TABLE_ID>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <AD_REFERENCE_VALUE_ID><![CDATA[D8CABB4103B14B42BE3064A68C600935]]></AD_REFERENCE_VALUE_ID>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <AD_VAL_RULE_ID><![CDATA[5ABEE0829BD24BFB9BA454E607825821]]></AD_VAL_RULE_ID>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <SEQNO><![CDATA[203]]></SEQNO>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <AD_ELEMENT_ID><![CDATA[397A72C953A54C3BA77B8B8F8C11407E]]></AD_ELEMENT_ID>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <AD_CALLOUT_ID><![CDATA[1AB9BD3356D643A79C058AA3B4EB175E]]></AD_CALLOUT_ID>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <POSITION><![CDATA[57]]></POSITION>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--5DB325BF62E748F5B4DF85FD0381BD8F--></AD_COLUMN>
+
 <!--5DD1EBE5977C413E859C67731375ECEF--><AD_COLUMN>
 <!--5DD1EBE5977C413E859C67731375ECEF-->  <AD_COLUMN_ID><![CDATA[5DD1EBE5977C413E859C67731375ECEF]]></AD_COLUMN_ID>
 <!--5DD1EBE5977C413E859C67731375ECEF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -285669,6 +285988,46 @@
 <!--5E7C48B7AB0F46AEB4EDA3EA73871315-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--5E7C48B7AB0F46AEB4EDA3EA73871315--></AD_COLUMN>
 
+<!--5E86C2D5AABE40CB927758F84096BD4F--><AD_COLUMN>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <AD_COLUMN_ID><![CDATA[5E86C2D5AABE40CB927758F84096BD4F]]></AD_COLUMN_ID>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <NAME><![CDATA[UOM]]></NAME>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <DESCRIPTION><![CDATA[A non monetary unit of measure.]]></DESCRIPTION>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <HELP><![CDATA[The UOM defines a unique non monetary unit of measure]]></HELP>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <COLUMNNAME><![CDATA[C_Uom_ID]]></COLUMNNAME>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <AD_TABLE_ID><![CDATA[339677E1B4854680A6BCCFBE5D6BE6B2]]></AD_TABLE_ID>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <AD_REFERENCE_VALUE_ID><![CDATA[4E76A829897D466394409273FBE6D5EE]]></AD_REFERENCE_VALUE_ID>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <SEQNO><![CDATA[100]]></SEQNO>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <AD_ELEMENT_ID><![CDATA[215]]></AD_ELEMENT_ID>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <AD_CALLOUT_ID><![CDATA[B21CED81B17544D09C608BB9EEEC51F6]]></AD_CALLOUT_ID>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <POSITION><![CDATA[10]]></POSITION>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--5E86C2D5AABE40CB927758F84096BD4F-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--5E86C2D5AABE40CB927758F84096BD4F--></AD_COLUMN>
+
 <!--5EA7646DA48B45BDB69509885DBC4D0C--><AD_COLUMN>
 <!--5EA7646DA48B45BDB69509885DBC4D0C-->  <AD_COLUMN_ID><![CDATA[5EA7646DA48B45BDB69509885DBC4D0C]]></AD_COLUMN_ID>
 <!--5EA7646DA48B45BDB69509885DBC4D0C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -287752,6 +288111,46 @@
 <!--62141B190430C9FAE040007F010054B2-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--62141B190430C9FAE040007F010054B2--></AD_COLUMN>
 
+<!--621C67485F47495DB2C32BE9F22656F9--><AD_COLUMN>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <AD_COLUMN_ID><![CDATA[621C67485F47495DB2C32BE9F22656F9]]></AD_COLUMN_ID>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <NAME><![CDATA[Purchase]]></NAME>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <DESCRIPTION><![CDATA[It represents the priority of this AUM to the Purchases flows]]></DESCRIPTION>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <HELP><![CDATA[It represents the priority of this AUM to the Purchases flows]]></HELP>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <COLUMNNAME><![CDATA[Purchase]]></COLUMNNAME>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <AD_TABLE_ID><![CDATA[339677E1B4854680A6BCCFBE5D6BE6B2]]></AD_TABLE_ID>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <AD_REFERENCE_VALUE_ID><![CDATA[B7B8495A15AE4904A88CAD93A2A1FD4B]]></AD_REFERENCE_VALUE_ID>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <DEFAULTVALUE><![CDATA[S]]></DEFAULTVALUE>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <SEQNO><![CDATA[140]]></SEQNO>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <AD_ELEMENT_ID><![CDATA[B9235304E9354DBEB1326D8DE51CF3A5]]></AD_ELEMENT_ID>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <POSITION><![CDATA[14]]></POSITION>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--621C67485F47495DB2C32BE9F22656F9-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--621C67485F47495DB2C32BE9F22656F9--></AD_COLUMN>
+
 <!--6232620C6944460782633F4AC7A27FCF--><AD_COLUMN>
 <!--6232620C6944460782633F4AC7A27FCF-->  <AD_COLUMN_ID><![CDATA[6232620C6944460782633F4AC7A27FCF]]></AD_COLUMN_ID>
 <!--6232620C6944460782633F4AC7A27FCF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -292465,6 +292864,43 @@
 <!--6A3CB5BD5F694BEBB65AA154DDEBD433-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--6A3CB5BD5F694BEBB65AA154DDEBD433--></AD_COLUMN>
 
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4--><AD_COLUMN>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <AD_COLUMN_ID><![CDATA[6A69C6E317E14BFCB8D5408D57CEE0B4]]></AD_COLUMN_ID>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <NAME><![CDATA[aumId]]></NAME>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <DESCRIPTION><![CDATA[Operative AUM]]></DESCRIPTION>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <HELP><![CDATA[Operative AUM]]></HELP>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <COLUMNNAME><![CDATA[aumId]]></COLUMNNAME>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <AD_TABLE_ID><![CDATA[CDB9DC9655F24DF8AB41AA0ADBD04390]]></AD_TABLE_ID>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <SEQNO><![CDATA[230]]></SEQNO>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <AD_ELEMENT_ID><![CDATA[D3E6BAD6A1A746ED9324B9F04501439B]]></AD_ELEMENT_ID>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--6A69C6E317E14BFCB8D5408D57CEE0B4--></AD_COLUMN>
+
 <!--6A98306476CA430B985CE6360354E2CF--><AD_COLUMN>
 <!--6A98306476CA430B985CE6360354E2CF-->  <AD_COLUMN_ID><![CDATA[6A98306476CA430B985CE6360354E2CF]]></AD_COLUMN_ID>
 <!--6A98306476CA430B985CE6360354E2CF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -292541,6 +292977,46 @@
 <!--6AA16843B90C4926A6FDD836A0D55DBC-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--6AA16843B90C4926A6FDD836A0D55DBC--></AD_COLUMN>
 
+<!--6AAC0F670FA14F42A1147F8384483DEB--><AD_COLUMN>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <AD_COLUMN_ID><![CDATA[6AAC0F670FA14F42A1147F8384483DEB]]></AD_COLUMN_ID>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <NAME><![CDATA[Sales]]></NAME>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <DESCRIPTION><![CDATA[It represents the priority of this AUM to the Sales flows]]></DESCRIPTION>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <HELP><![CDATA[It represents the priority of this AUM to the Sales flows]]></HELP>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <COLUMNNAME><![CDATA[Sales]]></COLUMNNAME>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <AD_TABLE_ID><![CDATA[339677E1B4854680A6BCCFBE5D6BE6B2]]></AD_TABLE_ID>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <AD_REFERENCE_VALUE_ID><![CDATA[B7B8495A15AE4904A88CAD93A2A1FD4B]]></AD_REFERENCE_VALUE_ID>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <DEFAULTVALUE><![CDATA[S]]></DEFAULTVALUE>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <SEQNO><![CDATA[130]]></SEQNO>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <AD_ELEMENT_ID><![CDATA[DBBB89F35BE04D1B8037565CF7052C0C]]></AD_ELEMENT_ID>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <POSITION><![CDATA[13]]></POSITION>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--6AAC0F670FA14F42A1147F8384483DEB-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--6AAC0F670FA14F42A1147F8384483DEB--></AD_COLUMN>
+
 <!--6ABF02FADF634959E040007F010125A8--><AD_COLUMN>
 <!--6ABF02FADF634959E040007F010125A8-->  <AD_COLUMN_ID><![CDATA[6ABF02FADF634959E040007F010125A8]]></AD_COLUMN_ID>
 <!--6ABF02FADF634959E040007F010125A8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -293201,6 +293677,43 @@
 <!--6C802FA6ECA048DC9AC6A2EB3E794DCA-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--6C802FA6ECA048DC9AC6A2EB3E794DCA--></AD_COLUMN>
 
+<!--6C8B920A688149BC9E6C9747ABB8D133--><AD_COLUMN>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <AD_COLUMN_ID><![CDATA[6C8B920A688149BC9E6C9747ABB8D133]]></AD_COLUMN_ID>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <NAME><![CDATA[Aum Quantity]]></NAME>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <DESCRIPTION><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></DESCRIPTION>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <HELP><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></HELP>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <COLUMNNAME><![CDATA[QtyAum]]></COLUMNNAME>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <AD_TABLE_ID><![CDATA[4CCE605CBB914CFAB01005FBD0A8C259]]></AD_TABLE_ID>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <AD_REFERENCE_ID><![CDATA[29]]></AD_REFERENCE_ID>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <SEQNO><![CDATA[160]]></SEQNO>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <AD_ELEMENT_ID><![CDATA[336E3CA968AF4707AFED0D8C94BBCE64]]></AD_ELEMENT_ID>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--6C8B920A688149BC9E6C9747ABB8D133-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--6C8B920A688149BC9E6C9747ABB8D133--></AD_COLUMN>
+
 <!--6C8FCF912B654DE9BD3417F682DD282C--><AD_COLUMN>
 <!--6C8FCF912B654DE9BD3417F682DD282C-->  <AD_COLUMN_ID><![CDATA[6C8FCF912B654DE9BD3417F682DD282C]]></AD_COLUMN_ID>
 <!--6C8FCF912B654DE9BD3417F682DD282C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -293660,6 +294173,46 @@
 <!--6DE64258C7E247EA8C0CB5EBBF788026-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--6DE64258C7E247EA8C0CB5EBBF788026--></AD_COLUMN>
 
+<!--6E43F881D1C441F8BC834B98C1B4DBEB--><AD_COLUMN>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <AD_COLUMN_ID><![CDATA[6E43F881D1C441F8BC834B98C1B4DBEB]]></AD_COLUMN_ID>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <NAME><![CDATA[Operative Quantity]]></NAME>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <DESCRIPTION><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></DESCRIPTION>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <HELP><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></HELP>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <COLUMNNAME><![CDATA[Aumqty]]></COLUMNNAME>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <AD_TABLE_ID><![CDATA[320]]></AD_TABLE_ID>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <AD_REFERENCE_ID><![CDATA[29]]></AD_REFERENCE_ID>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <FIELDLENGTH><![CDATA[2]]></FIELDLENGTH>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <SEQNO><![CDATA[124]]></SEQNO>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <AD_ELEMENT_ID><![CDATA[9AAC1EE202DB487D89C4A3E75631E6C4]]></AD_ELEMENT_ID>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <AD_CALLOUT_ID><![CDATA[1AB9BD3356D643A79C058AA3B4EB175E]]></AD_CALLOUT_ID>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <POSITION><![CDATA[34]]></POSITION>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--6E43F881D1C441F8BC834B98C1B4DBEB--></AD_COLUMN>
+
 <!--6E4793C5493C42D5A1C17F2CF8166C3E--><AD_COLUMN>
 <!--6E4793C5493C42D5A1C17F2CF8166C3E-->  <AD_COLUMN_ID><![CDATA[6E4793C5493C42D5A1C17F2CF8166C3E]]></AD_COLUMN_ID>
 <!--6E4793C5493C42D5A1C17F2CF8166C3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -297588,6 +298141,48 @@
 <!--75E2E3D7FDDF4AB68CA7FD2532814FA7-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--75E2E3D7FDDF4AB68CA7FD2532814FA7--></AD_COLUMN>
 
+<!--75E9ED83A89C4CA28416B0F0220431C4--><AD_COLUMN>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <AD_COLUMN_ID><![CDATA[75E9ED83A89C4CA28416B0F0220431C4]]></AD_COLUMN_ID>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <NAME><![CDATA[Operative UOM]]></NAME>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <DESCRIPTION><![CDATA[A non monetary unit of measure.]]></DESCRIPTION>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <HELP><![CDATA[The Alternative UOM defines a unique non monetary unit of measure]]></HELP>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <COLUMNNAME><![CDATA[C_Aum]]></COLUMNNAME>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <AD_TABLE_ID><![CDATA[320]]></AD_TABLE_ID>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <AD_REFERENCE_VALUE_ID><![CDATA[D8CABB4103B14B42BE3064A68C600935]]></AD_REFERENCE_VALUE_ID>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <AD_VAL_RULE_ID><![CDATA[5ABEE0829BD24BFB9BA454E607825821]]></AD_VAL_RULE_ID>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <SEQNO><![CDATA[114]]></SEQNO>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <AD_ELEMENT_ID><![CDATA[397A72C953A54C3BA77B8B8F8C11407E]]></AD_ELEMENT_ID>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <AD_CALLOUT_ID><![CDATA[1AB9BD3356D643A79C058AA3B4EB175E]]></AD_CALLOUT_ID>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <POSITION><![CDATA[33]]></POSITION>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--75E9ED83A89C4CA28416B0F0220431C4-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--75E9ED83A89C4CA28416B0F0220431C4--></AD_COLUMN>
+
 <!--75EA09D9AD6A413EA67B85E0DC1364E6--><AD_COLUMN>
 <!--75EA09D9AD6A413EA67B85E0DC1364E6-->  <AD_COLUMN_ID><![CDATA[75EA09D9AD6A413EA67B85E0DC1364E6]]></AD_COLUMN_ID>
 <!--75EA09D9AD6A413EA67B85E0DC1364E6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -299164,6 +299759,42 @@
 <!--78205B696A7A45A4BAA6E2169000E6BF-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--78205B696A7A45A4BAA6E2169000E6BF--></AD_COLUMN>
 
+<!--783365B75F5447609FC4DD24BC432947--><AD_COLUMN>
+<!--783365B75F5447609FC4DD24BC432947-->  <AD_COLUMN_ID><![CDATA[783365B75F5447609FC4DD24BC432947]]></AD_COLUMN_ID>
+<!--783365B75F5447609FC4DD24BC432947-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--783365B75F5447609FC4DD24BC432947-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--783365B75F5447609FC4DD24BC432947-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--783365B75F5447609FC4DD24BC432947-->  <NAME><![CDATA[M_Product_Aum_ID]]></NAME>
+<!--783365B75F5447609FC4DD24BC432947-->  <COLUMNNAME><![CDATA[M_Product_Aum_ID]]></COLUMNNAME>
+<!--783365B75F5447609FC4DD24BC432947-->  <AD_TABLE_ID><![CDATA[339677E1B4854680A6BCCFBE5D6BE6B2]]></AD_TABLE_ID>
+<!--783365B75F5447609FC4DD24BC432947-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
+<!--783365B75F5447609FC4DD24BC432947-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--783365B75F5447609FC4DD24BC432947-->  <ISKEY><![CDATA[Y]]></ISKEY>
+<!--783365B75F5447609FC4DD24BC432947-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--783365B75F5447609FC4DD24BC432947-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--783365B75F5447609FC4DD24BC432947-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--783365B75F5447609FC4DD24BC432947-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--783365B75F5447609FC4DD24BC432947-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--783365B75F5447609FC4DD24BC432947-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--783365B75F5447609FC4DD24BC432947-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--783365B75F5447609FC4DD24BC432947-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--783365B75F5447609FC4DD24BC432947-->  <AD_ELEMENT_ID><![CDATA[F8EEA669E75E4112BB0D32E1598A4F14]]></AD_ELEMENT_ID>
+<!--783365B75F5447609FC4DD24BC432947-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--783365B75F5447609FC4DD24BC432947-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--783365B75F5447609FC4DD24BC432947-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--783365B75F5447609FC4DD24BC432947-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--783365B75F5447609FC4DD24BC432947-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--783365B75F5447609FC4DD24BC432947-->  <POSITION><![CDATA[1]]></POSITION>
+<!--783365B75F5447609FC4DD24BC432947-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--783365B75F5447609FC4DD24BC432947-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--783365B75F5447609FC4DD24BC432947-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--783365B75F5447609FC4DD24BC432947-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--783365B75F5447609FC4DD24BC432947-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--783365B75F5447609FC4DD24BC432947-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--783365B75F5447609FC4DD24BC432947-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--783365B75F5447609FC4DD24BC432947-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--783365B75F5447609FC4DD24BC432947--></AD_COLUMN>
+
 <!--7834C579BFC14CF88663BBF7633BD21B--><AD_COLUMN>
 <!--7834C579BFC14CF88663BBF7633BD21B-->  <AD_COLUMN_ID><![CDATA[7834C579BFC14CF88663BBF7633BD21B]]></AD_COLUMN_ID>
 <!--7834C579BFC14CF88663BBF7633BD21B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -304203,6 +304834,44 @@
 <!--7C4AEC0BF04F4588A2D26D46E1EE0E7B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--7C4AEC0BF04F4588A2D26D46E1EE0E7B--></AD_COLUMN>
 
+<!--7C5FD290A7BC4A95B76756EA4D55EE52--><AD_COLUMN>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <AD_COLUMN_ID><![CDATA[7C5FD290A7BC4A95B76756EA4D55EE52]]></AD_COLUMN_ID>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <NAME><![CDATA[aum]]></NAME>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <DESCRIPTION><![CDATA[A non monetary unit of measure.]]></DESCRIPTION>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <HELP><![CDATA[The Alternative UOM defines a unique non monetary unit of measure]]></HELP>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <COLUMNNAME><![CDATA[aum]]></COLUMNNAME>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <AD_TABLE_ID><![CDATA[CDB9DC9655F24DF8AB41AA0ADBD04390]]></AD_TABLE_ID>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <SEQNO><![CDATA[200]]></SEQNO>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <AD_ELEMENT_ID><![CDATA[397A72C953A54C3BA77B8B8F8C11407E]]></AD_ELEMENT_ID>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <ENTITY_ALIAS><![CDATA[rmAUM]]></ENTITY_ALIAS>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--7C5FD290A7BC4A95B76756EA4D55EE52--></AD_COLUMN>
+
 <!--7C66B938B9BD4742957C32813AB567CD--><AD_COLUMN>
 <!--7C66B938B9BD4742957C32813AB567CD-->  <AD_COLUMN_ID><![CDATA[7C66B938B9BD4742957C32813AB567CD]]></AD_COLUMN_ID>
 <!--7C66B938B9BD4742957C32813AB567CD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -307352,6 +308021,86 @@
 <!--7E8829EBCFF6143AE040007F010018ED-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--7E8829EBCFF6143AE040007F010018ED--></AD_COLUMN>
 
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90--><AD_COLUMN>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <AD_COLUMN_ID><![CDATA[7E8A04B5A3BE43BAA1B7B1D51A937C90]]></AD_COLUMN_ID>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <NAME><![CDATA[Logistics]]></NAME>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <DESCRIPTION><![CDATA[It represents the priority of this AUM to the Logistics flows]]></DESCRIPTION>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <HELP><![CDATA[It represents the priority of this AUM to the Logistics flows]]></HELP>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <COLUMNNAME><![CDATA[Logistics]]></COLUMNNAME>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <AD_TABLE_ID><![CDATA[339677E1B4854680A6BCCFBE5D6BE6B2]]></AD_TABLE_ID>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <AD_REFERENCE_VALUE_ID><![CDATA[B7B8495A15AE4904A88CAD93A2A1FD4B]]></AD_REFERENCE_VALUE_ID>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <DEFAULTVALUE><![CDATA[S]]></DEFAULTVALUE>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <SEQNO><![CDATA[150]]></SEQNO>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <AD_ELEMENT_ID><![CDATA[CF0F66E7A51F426BA094AB5BB962FE4D]]></AD_ELEMENT_ID>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <POSITION><![CDATA[15]]></POSITION>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--7E8A04B5A3BE43BAA1B7B1D51A937C90--></AD_COLUMN>
+
+<!--7EC2998101444385AE7543A5FFBB3923--><AD_COLUMN>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <AD_COLUMN_ID><![CDATA[7EC2998101444385AE7543A5FFBB3923]]></AD_COLUMN_ID>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <NAME><![CDATA[Alternative UOM]]></NAME>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <DESCRIPTION><![CDATA[A non monetary unit of measure.]]></DESCRIPTION>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <HELP><![CDATA[The Alternative UOM defines a unique non monetary unit of measure]]></HELP>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <COLUMNNAME><![CDATA[C_Aum]]></COLUMNNAME>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <AD_TABLE_ID><![CDATA[347B0AA5C3CD4D18910D2FE4990B790E]]></AD_TABLE_ID>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <AD_REFERENCE_VALUE_ID><![CDATA[D8CABB4103B14B42BE3064A68C600935]]></AD_REFERENCE_VALUE_ID>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <AD_VAL_RULE_ID><![CDATA[5ABEE0829BD24BFB9BA454E607825821]]></AD_VAL_RULE_ID>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <SEQNO><![CDATA[250]]></SEQNO>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <AD_ELEMENT_ID><![CDATA[397A72C953A54C3BA77B8B8F8C11407E]]></AD_ELEMENT_ID>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <POSITION><![CDATA[25]]></POSITION>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--7EC2998101444385AE7543A5FFBB3923-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--7EC2998101444385AE7543A5FFBB3923--></AD_COLUMN>
+
 <!--7EC3B5CF03719057E040007F010110BF--><AD_COLUMN>
 <!--7EC3B5CF03719057E040007F010110BF-->  <AD_COLUMN_ID><![CDATA[7EC3B5CF03719057E040007F010110BF]]></AD_COLUMN_ID>
 <!--7EC3B5CF03719057E040007F010110BF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -307585,6 +308334,47 @@
 <!--7F7D1BBBCFDB4779BBAAFFE6E2109712-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--7F7D1BBBCFDB4779BBAAFFE6E2109712--></AD_COLUMN>
 
+<!--7F830CC599454A1B8512952B87AA27E9--><AD_COLUMN>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <AD_COLUMN_ID><![CDATA[7F830CC599454A1B8512952B87AA27E9]]></AD_COLUMN_ID>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <NAME><![CDATA[Active]]></NAME>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <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>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <COLUMNNAME><![CDATA[Isactive]]></COLUMNNAME>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <AD_TABLE_ID><![CDATA[339677E1B4854680A6BCCFBE5D6BE6B2]]></AD_TABLE_ID>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <AD_ELEMENT_ID><![CDATA[348]]></AD_ELEMENT_ID>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <POSITION><![CDATA[4]]></POSITION>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--7F830CC599454A1B8512952B87AA27E9-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--7F830CC599454A1B8512952B87AA27E9--></AD_COLUMN>
+
 <!--7FCA79F6A6804336A083FEE0C8964D6E--><AD_COLUMN>
 <!--7FCA79F6A6804336A083FEE0C8964D6E-->  <AD_COLUMN_ID><![CDATA[7FCA79F6A6804336A083FEE0C8964D6E]]></AD_COLUMN_ID>
 <!--7FCA79F6A6804336A083FEE0C8964D6E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -318601,6 +319391,44 @@
 <!--869631947AE84D4BB253F16564334492-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--869631947AE84D4BB253F16564334492--></AD_COLUMN>
 
+<!--869A1C0B6082452BA462C8590F4A32BB--><AD_COLUMN>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <AD_COLUMN_ID><![CDATA[869A1C0B6082452BA462C8590F4A32BB]]></AD_COLUMN_ID>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <NAME><![CDATA[Rate]]></NAME>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <DESCRIPTION><![CDATA[The percentage to be multiplied by the source to arrive at the tax or exchange amount.]]></DESCRIPTION>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <HELP><![CDATA[The Rate indicates the percentage to be multiplied by the source to arrive at the tax or exchange amount.]]></HELP>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <COLUMNNAME><![CDATA[Rate]]></COLUMNNAME>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <AD_TABLE_ID><![CDATA[347B0AA5C3CD4D18910D2FE4990B790E]]></AD_TABLE_ID>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <AD_REFERENCE_ID><![CDATA[29]]></AD_REFERENCE_ID>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <SEQNO><![CDATA[300]]></SEQNO>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <AD_ELEMENT_ID><![CDATA[534]]></AD_ELEMENT_ID>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <POSITION><![CDATA[30]]></POSITION>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--869A1C0B6082452BA462C8590F4A32BB-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--869A1C0B6082452BA462C8590F4A32BB--></AD_COLUMN>
+
 <!--86A49F4CBE2C42B7A1508536F031D2D5--><AD_COLUMN>
 <!--86A49F4CBE2C42B7A1508536F031D2D5-->  <AD_COLUMN_ID><![CDATA[86A49F4CBE2C42B7A1508536F031D2D5]]></AD_COLUMN_ID>
 <!--86A49F4CBE2C42B7A1508536F031D2D5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -323341,6 +324169,43 @@
 <!--8A718B77477545B99732A6DEBDD3333B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--8A718B77477545B99732A6DEBDD3333B--></AD_COLUMN>
 
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02--><AD_COLUMN>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <AD_COLUMN_ID><![CDATA[8A7D05EE6B49441CB2EA2B6DC314DE02]]></AD_COLUMN_ID>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <NAME><![CDATA[Aum]]></NAME>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <COLUMNNAME><![CDATA[Aum]]></COLUMNNAME>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <AD_TABLE_ID><![CDATA[4CCE605CBB914CFAB01005FBD0A8C259]]></AD_TABLE_ID>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <AD_REFERENCE_VALUE_ID><![CDATA[C258AE68FAD2494AA02C8EC0E5930C4F]]></AD_REFERENCE_VALUE_ID>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <SEQNO><![CDATA[150]]></SEQNO>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <AD_ELEMENT_ID><![CDATA[BE10747600A0465E90524C460E5AB751]]></AD_ELEMENT_ID>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <POSITION><![CDATA[15]]></POSITION>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--8A7D05EE6B49441CB2EA2B6DC314DE02--></AD_COLUMN>
+
 <!--8A9065C3D71C40098FBF44E1E1FEA9EC--><AD_COLUMN>
 <!--8A9065C3D71C40098FBF44E1E1FEA9EC-->  <AD_COLUMN_ID><![CDATA[8A9065C3D71C40098FBF44E1E1FEA9EC]]></AD_COLUMN_ID>
 <!--8A9065C3D71C40098FBF44E1E1FEA9EC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -325285,6 +326150,45 @@
 <!--8E7CC7A39183B541E040007F01004601-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--8E7CC7A39183B541E040007F01004601--></AD_COLUMN>
 
+<!--8E9F151AC731431FB1183BFA6C2E86D8--><AD_COLUMN>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <AD_COLUMN_ID><![CDATA[8E9F151AC731431FB1183BFA6C2E86D8]]></AD_COLUMN_ID>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <NAME><![CDATA[returnedUOM]]></NAME>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <DESCRIPTION><![CDATA[Returned UOM]]></DESCRIPTION>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <HELP><![CDATA[Returned UOM]]></HELP>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <COLUMNNAME><![CDATA[returnedUOM]]></COLUMNNAME>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <AD_TABLE_ID><![CDATA[CDB9DC9655F24DF8AB41AA0ADBD04390]]></AD_TABLE_ID>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <AD_REFERENCE_VALUE_ID><![CDATA[0CFE6C62BC4141149723A8A2F5CA4135]]></AD_REFERENCE_VALUE_ID>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <SEQNO><![CDATA[220]]></SEQNO>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <AD_ELEMENT_ID><![CDATA[C9F2D21FF4DA49C09186CFA4A31E6F3D]]></AD_ELEMENT_ID>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <ENTITY_ALIAS><![CDATA[rmReturnedUOM]]></ENTITY_ALIAS>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8E9F151AC731431FB1183BFA6C2E86D8-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--8E9F151AC731431FB1183BFA6C2E86D8--></AD_COLUMN>
+
 <!--8ED54FC840C842FA890DF717CE8C3492--><AD_COLUMN>
 <!--8ED54FC840C842FA890DF717CE8C3492-->  <AD_COLUMN_ID><![CDATA[8ED54FC840C842FA890DF717CE8C3492]]></AD_COLUMN_ID>
 <!--8ED54FC840C842FA890DF717CE8C3492-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -330662,6 +331566,44 @@
 <!--96137772B128438F9CA61B1837FC7C45-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--96137772B128438F9CA61B1837FC7C45--></AD_COLUMN>
 
+<!--96831198BABC415E91B381EA2B3FA0D5--><AD_COLUMN>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <AD_COLUMN_ID><![CDATA[96831198BABC415E91B381EA2B3FA0D5]]></AD_COLUMN_ID>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <NAME><![CDATA[Created By]]></NAME>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <DESCRIPTION><![CDATA[User who created this records]]></DESCRIPTION>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <HELP><![CDATA[The Created By field indicates the user who created this record.]]></HELP>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <COLUMNNAME><![CDATA[Createdby]]></COLUMNNAME>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <AD_TABLE_ID><![CDATA[339677E1B4854680A6BCCFBE5D6BE6B2]]></AD_TABLE_ID>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <AD_ELEMENT_ID><![CDATA[246]]></AD_ELEMENT_ID>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <POSITION><![CDATA[8]]></POSITION>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--96831198BABC415E91B381EA2B3FA0D5-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--96831198BABC415E91B381EA2B3FA0D5--></AD_COLUMN>
+
 <!--9688DAC4FDD240E49A70E458AB1B9B3B--><AD_COLUMN>
 <!--9688DAC4FDD240E49A70E458AB1B9B3B-->  <AD_COLUMN_ID><![CDATA[9688DAC4FDD240E49A70E458AB1B9B3B]]></AD_COLUMN_ID>
 <!--9688DAC4FDD240E49A70E458AB1B9B3B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -331044,6 +331986,48 @@
 <!--984876F99CCF4C9CA94FD365FD79F834-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--984876F99CCF4C9CA94FD365FD79F834--></AD_COLUMN>
 
+<!--986686B366B044BD8C1E27B729EF9ABB--><AD_COLUMN>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <AD_COLUMN_ID><![CDATA[986686B366B044BD8C1E27B729EF9ABB]]></AD_COLUMN_ID>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <NAME><![CDATA[Operative UOM]]></NAME>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <DESCRIPTION><![CDATA[A non monetary unit of measure.]]></DESCRIPTION>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <HELP><![CDATA[The Alternative UOM defines a unique non monetary unit of measure]]></HELP>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <COLUMNNAME><![CDATA[C_Aum]]></COLUMNNAME>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <AD_TABLE_ID><![CDATA[260]]></AD_TABLE_ID>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <AD_REFERENCE_VALUE_ID><![CDATA[D8CABB4103B14B42BE3064A68C600935]]></AD_REFERENCE_VALUE_ID>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <AD_VAL_RULE_ID><![CDATA[5ABEE0829BD24BFB9BA454E607825821]]></AD_VAL_RULE_ID>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <SEQNO><![CDATA[254]]></SEQNO>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <AD_ELEMENT_ID><![CDATA[397A72C953A54C3BA77B8B8F8C11407E]]></AD_ELEMENT_ID>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <AD_CALLOUT_ID><![CDATA[1AB9BD3356D643A79C058AA3B4EB175E]]></AD_CALLOUT_ID>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <POSITION><![CDATA[72]]></POSITION>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--986686B366B044BD8C1E27B729EF9ABB-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--986686B366B044BD8C1E27B729EF9ABB--></AD_COLUMN>
+
 <!--986971D7CBB3456FBA02F2302419555D--><AD_COLUMN>
 <!--986971D7CBB3456FBA02F2302419555D-->  <AD_COLUMN_ID><![CDATA[986971D7CBB3456FBA02F2302419555D]]></AD_COLUMN_ID>
 <!--986971D7CBB3456FBA02F2302419555D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -331849,6 +332833,44 @@
 <!--9ACB466C69F848F4AE2DB1393D780160-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--9ACB466C69F848F4AE2DB1393D780160--></AD_COLUMN>
 
+<!--9ACCCB7E8E284CBB8CDF3F8860601107--><AD_COLUMN>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <AD_COLUMN_ID><![CDATA[9ACCCB7E8E284CBB8CDF3F8860601107]]></AD_COLUMN_ID>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <NAME><![CDATA[Quantity in Alternative UOM]]></NAME>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <DESCRIPTION><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></DESCRIPTION>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <HELP><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></HELP>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <COLUMNNAME><![CDATA[Aumqty]]></COLUMNNAME>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <AD_TABLE_ID><![CDATA[347B0AA5C3CD4D18910D2FE4990B790E]]></AD_TABLE_ID>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <AD_REFERENCE_ID><![CDATA[29]]></AD_REFERENCE_ID>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <SEQNO><![CDATA[260]]></SEQNO>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <AD_ELEMENT_ID><![CDATA[9AAC1EE202DB487D89C4A3E75631E6C4]]></AD_ELEMENT_ID>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <POSITION><![CDATA[26]]></POSITION>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--9ACCCB7E8E284CBB8CDF3F8860601107--></AD_COLUMN>
+
 <!--9ACE0E8D88C14DA9BD5280E69116BE76--><AD_COLUMN>
 <!--9ACE0E8D88C14DA9BD5280E69116BE76-->  <AD_COLUMN_ID><![CDATA[9ACE0E8D88C14DA9BD5280E69116BE76]]></AD_COLUMN_ID>
 <!--9ACE0E8D88C14DA9BD5280E69116BE76-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -333750,6 +334772,42 @@
 <!--9D18FD9BDA284EF190AAE3C3F73E3338-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--9D18FD9BDA284EF190AAE3C3F73E3338--></AD_COLUMN>
 
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8--><AD_COLUMN>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <AD_COLUMN_ID><![CDATA[9D4B5003375A48A2A0E299B0B3B3D5E8]]></AD_COLUMN_ID>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <NAME><![CDATA[Pending Qty in AUM]]></NAME>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <COLUMNNAME><![CDATA[Pendingaumqty]]></COLUMNNAME>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <AD_TABLE_ID><![CDATA[09C5EA393D0D41CEBB522DEC67534574]]></AD_TABLE_ID>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <AD_REFERENCE_ID><![CDATA[29]]></AD_REFERENCE_ID>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <SEQNO><![CDATA[270]]></SEQNO>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <AD_ELEMENT_ID><![CDATA[6343BE55E1554B2AAB55E8A76721AFA6]]></AD_ELEMENT_ID>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <POSITION><![CDATA[26]]></POSITION>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--9D4B5003375A48A2A0E299B0B3B3D5E8--></AD_COLUMN>
+
 <!--9D6E31238ECAD811E040007F01004363--><AD_COLUMN>
 <!--9D6E31238ECAD811E040007F01004363-->  <AD_COLUMN_ID><![CDATA[9D6E31238ECAD811E040007F01004363]]></AD_COLUMN_ID>
 <!--9D6E31238ECAD811E040007F01004363-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -335527,6 +336585,46 @@
 <!--A206ADF5D6D649C599F25198030A7473-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A206ADF5D6D649C599F25198030A7473--></AD_COLUMN>
 
+<!--A21157A9F702436D861756568E45521E--><AD_COLUMN>
+<!--A21157A9F702436D861756568E45521E-->  <AD_COLUMN_ID><![CDATA[A21157A9F702436D861756568E45521E]]></AD_COLUMN_ID>
+<!--A21157A9F702436D861756568E45521E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A21157A9F702436D861756568E45521E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A21157A9F702436D861756568E45521E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A21157A9F702436D861756568E45521E-->  <NAME><![CDATA[Product]]></NAME>
+<!--A21157A9F702436D861756568E45521E-->  <DESCRIPTION><![CDATA[An item produced by a process.]]></DESCRIPTION>
+<!--A21157A9F702436D861756568E45521E-->  <HELP><![CDATA[Identifies an item which is either purchased or sold in this organization.]]></HELP>
+<!--A21157A9F702436D861756568E45521E-->  <COLUMNNAME><![CDATA[M_Product_ID]]></COLUMNNAME>
+<!--A21157A9F702436D861756568E45521E-->  <AD_TABLE_ID><![CDATA[339677E1B4854680A6BCCFBE5D6BE6B2]]></AD_TABLE_ID>
+<!--A21157A9F702436D861756568E45521E-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--A21157A9F702436D861756568E45521E-->  <AD_REFERENCE_VALUE_ID><![CDATA[84BD487714B04B838A8D562A30E8792C]]></AD_REFERENCE_VALUE_ID>
+<!--A21157A9F702436D861756568E45521E-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--A21157A9F702436D861756568E45521E-->  <DEFAULTVALUE><![CDATA[@M_Product_ID@]]></DEFAULTVALUE>
+<!--A21157A9F702436D861756568E45521E-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--A21157A9F702436D861756568E45521E-->  <ISPARENT><![CDATA[Y]]></ISPARENT>
+<!--A21157A9F702436D861756568E45521E-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--A21157A9F702436D861756568E45521E-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--A21157A9F702436D861756568E45521E-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--A21157A9F702436D861756568E45521E-->  <SEQNO><![CDATA[90]]></SEQNO>
+<!--A21157A9F702436D861756568E45521E-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--A21157A9F702436D861756568E45521E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A21157A9F702436D861756568E45521E-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--A21157A9F702436D861756568E45521E-->  <AD_ELEMENT_ID><![CDATA[454]]></AD_ELEMENT_ID>
+<!--A21157A9F702436D861756568E45521E-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--A21157A9F702436D861756568E45521E-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--A21157A9F702436D861756568E45521E-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--A21157A9F702436D861756568E45521E-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--A21157A9F702436D861756568E45521E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A21157A9F702436D861756568E45521E-->  <POSITION><![CDATA[9]]></POSITION>
+<!--A21157A9F702436D861756568E45521E-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--A21157A9F702436D861756568E45521E-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--A21157A9F702436D861756568E45521E-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--A21157A9F702436D861756568E45521E-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--A21157A9F702436D861756568E45521E-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--A21157A9F702436D861756568E45521E-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--A21157A9F702436D861756568E45521E-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A21157A9F702436D861756568E45521E-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--A21157A9F702436D861756568E45521E--></AD_COLUMN>
+
 <!--A2310AE5FF26434D81FA816C02AC7F8B--><AD_COLUMN>
 <!--A2310AE5FF26434D81FA816C02AC7F8B-->  <AD_COLUMN_ID><![CDATA[A2310AE5FF26434D81FA816C02AC7F8B]]></AD_COLUMN_ID>
 <!--A2310AE5FF26434D81FA816C02AC7F8B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -337333,6 +338431,42 @@
 <!--A7198696EC9E41D58BC8DA322AB18E96-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A7198696EC9E41D58BC8DA322AB18E96--></AD_COLUMN>
 
+<!--A71A0D2820C043CEADF3CC75B3C1E36C--><AD_COLUMN>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <AD_COLUMN_ID><![CDATA[A71A0D2820C043CEADF3CC75B3C1E36C]]></AD_COLUMN_ID>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <NAME><![CDATA[aumConversionRate]]></NAME>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <COLUMNNAME><![CDATA[aumConversionRate]]></COLUMNNAME>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <AD_TABLE_ID><![CDATA[CDB9DC9655F24DF8AB41AA0ADBD04390]]></AD_TABLE_ID>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <AD_REFERENCE_ID><![CDATA[29]]></AD_REFERENCE_ID>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <SEQNO><![CDATA[240]]></SEQNO>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <AD_ELEMENT_ID><![CDATA[BCCA60D6DD2C4FB78F895E745F9348C0]]></AD_ELEMENT_ID>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <ENTITY_ALIAS><![CDATA[rmAUMConversionRate]]></ENTITY_ALIAS>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--A71A0D2820C043CEADF3CC75B3C1E36C--></AD_COLUMN>
+
 <!--A7354004EBD211DD897A0016D4EE9DB3--><AD_COLUMN>
 <!--A7354004EBD211DD897A0016D4EE9DB3-->  <AD_COLUMN_ID><![CDATA[A7354004EBD211DD897A0016D4EE9DB3]]></AD_COLUMN_ID>
 <!--A7354004EBD211DD897A0016D4EE9DB3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -338931,6 +340065,42 @@
 <!--AB42E56233264B32B435742B45F5B154-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--AB42E56233264B32B435742B45F5B154--></AD_COLUMN>
 
+<!--AB8223F8CD7949938E1ACCD5EED6B33D--><AD_COLUMN>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <AD_COLUMN_ID><![CDATA[AB8223F8CD7949938E1ACCD5EED6B33D]]></AD_COLUMN_ID>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <NAME><![CDATA[Pending Qty in AUM]]></NAME>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <COLUMNNAME><![CDATA[Pendingaumqty]]></COLUMNNAME>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <AD_TABLE_ID><![CDATA[347B0AA5C3CD4D18910D2FE4990B790E]]></AD_TABLE_ID>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <AD_REFERENCE_ID><![CDATA[29]]></AD_REFERENCE_ID>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <SEQNO><![CDATA[280]]></SEQNO>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <AD_ELEMENT_ID><![CDATA[6343BE55E1554B2AAB55E8A76721AFA6]]></AD_ELEMENT_ID>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <POSITION><![CDATA[28]]></POSITION>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--AB8223F8CD7949938E1ACCD5EED6B33D--></AD_COLUMN>
+
 <!--ABEACF5F9B15477883A785D78AB08D85--><AD_COLUMN>
 <!--ABEACF5F9B15477883A785D78AB08D85-->  <AD_COLUMN_ID><![CDATA[ABEACF5F9B15477883A785D78AB08D85]]></AD_COLUMN_ID>
 <!--ABEACF5F9B15477883A785D78AB08D85-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -342254,42 +343424,6 @@
 <!--B0D44F14A9F1533DE040007F01004FD0-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--B0D44F14A9F1533DE040007F01004FD0--></AD_COLUMN>
 
-<!--B0D44F14A9F2533DE040007F01004FD0--><AD_COLUMN>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <AD_COLUMN_ID><![CDATA[B0D44F14A9F2533DE040007F01004FD0]]></AD_COLUMN_ID>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <NAME><![CDATA[Receiving]]></NAME>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <COLUMNNAME><![CDATA[ReceivingQty]]></COLUMNNAME>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <AD_TABLE_ID><![CDATA[09C5EA393D0D41CEBB522DEC67534574]]></AD_TABLE_ID>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <AD_REFERENCE_ID><![CDATA[29]]></AD_REFERENCE_ID>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <SEQNO><![CDATA[150]]></SEQNO>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <AD_ELEMENT_ID><![CDATA[B0D45E247BECF1A8E040007F0100514B]]></AD_ELEMENT_ID>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <POSITION><![CDATA[17]]></POSITION>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
-<!--B0D44F14A9F2533DE040007F01004FD0-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
-<!--B0D44F14A9F2533DE040007F01004FD0--></AD_COLUMN>
-
 <!--B0D44F14A9F4533DE040007F01004FD0--><AD_COLUMN>
 <!--B0D44F14A9F4533DE040007F01004FD0-->  <AD_COLUMN_ID><![CDATA[B0D44F14A9F4533DE040007F01004FD0]]></AD_COLUMN_ID>
 <!--B0D44F14A9F4533DE040007F01004FD0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -343179,7 +344313,7 @@
 <!--B151560F62693082E040007F01002081-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--B151560F62693082E040007F01002081-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--B151560F62693082E040007F01002081-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--B151560F62693082E040007F01002081-->  <READONLYLOGIC><![CDATA[@M_Locator_ID@=null]]></READONLYLOGIC>
+<!--B151560F62693082E040007F01002081-->  <READONLYLOGIC><![CDATA[@M_Locator_ID@=null & @UomManagement@='Y']]></READONLYLOGIC>
 <!--B151560F62693082E040007F01002081-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--B151560F62693082E040007F01002081-->  <SEQNO><![CDATA[140]]></SEQNO>
 <!--B151560F62693082E040007F01002081-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -348285,6 +349419,46 @@
 <!--BA9A4A40CB9340EEAF716CC8C337F4AF-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--BA9A4A40CB9340EEAF716CC8C337F4AF--></AD_COLUMN>
 
+<!--BAA3518A49E842DFB007FC6C2BDDCE64--><AD_COLUMN>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <AD_COLUMN_ID><![CDATA[BAA3518A49E842DFB007FC6C2BDDCE64]]></AD_COLUMN_ID>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <NAME><![CDATA[Operative Quantity]]></NAME>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <DESCRIPTION><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></DESCRIPTION>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <HELP><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></HELP>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <COLUMNNAME><![CDATA[Aumqty]]></COLUMNNAME>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <AD_TABLE_ID><![CDATA[260]]></AD_TABLE_ID>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <AD_REFERENCE_ID><![CDATA[29]]></AD_REFERENCE_ID>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <FIELDLENGTH><![CDATA[2]]></FIELDLENGTH>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <SEQNO><![CDATA[264]]></SEQNO>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <AD_ELEMENT_ID><![CDATA[9AAC1EE202DB487D89C4A3E75631E6C4]]></AD_ELEMENT_ID>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <AD_CALLOUT_ID><![CDATA[1AB9BD3356D643A79C058AA3B4EB175E]]></AD_CALLOUT_ID>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <POSITION><![CDATA[73]]></POSITION>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--BAA3518A49E842DFB007FC6C2BDDCE64--></AD_COLUMN>
+
 <!--BAA6CA23A3634F68944B85B9423DF8A0--><AD_COLUMN>
 <!--BAA6CA23A3634F68944B85B9423DF8A0-->  <AD_COLUMN_ID><![CDATA[BAA6CA23A3634F68944B85B9423DF8A0]]></AD_COLUMN_ID>
 <!--BAA6CA23A3634F68944B85B9423DF8A0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -348321,6 +349495,42 @@
 <!--BAA6CA23A3634F68944B85B9423DF8A0-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--BAA6CA23A3634F68944B85B9423DF8A0--></AD_COLUMN>
 
+<!--BAACF5821C3849C3B4A2C44CE2E04186--><AD_COLUMN>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <AD_COLUMN_ID><![CDATA[BAACF5821C3849C3B4A2C44CE2E04186]]></AD_COLUMN_ID>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <NAME><![CDATA[Lock AumQty]]></NAME>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <COLUMNNAME><![CDATA[Lockaumqty]]></COLUMNNAME>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <AD_TABLE_ID><![CDATA[800214]]></AD_TABLE_ID>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <AD_REFERENCE_ID><![CDATA[29]]></AD_REFERENCE_ID>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <SEQNO><![CDATA[450]]></SEQNO>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <AD_ELEMENT_ID><![CDATA[A7FC44EFCAFC41CB9971C834BB3A09D7]]></AD_ELEMENT_ID>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <POSITION><![CDATA[41]]></POSITION>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--BAACF5821C3849C3B4A2C44CE2E04186-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--BAACF5821C3849C3B4A2C44CE2E04186--></AD_COLUMN>
+
 <!--BACF545D3151DE54E040007F01006998--><AD_COLUMN>
 <!--BACF545D3151DE54E040007F01006998-->  <AD_COLUMN_ID><![CDATA[BACF545D3151DE54E040007F01006998]]></AD_COLUMN_ID>
 <!--BACF545D3151DE54E040007F01006998-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -350206,6 +351416,45 @@
 <!--BD1602011B5E4AD1B5DD85E8E9017B11-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--BD1602011B5E4AD1B5DD85E8E9017B11--></AD_COLUMN>
 
+<!--BD1A5D4B40E84593B3185CC22CFC28A5--><AD_COLUMN>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <AD_COLUMN_ID><![CDATA[BD1A5D4B40E84593B3185CC22CFC28A5]]></AD_COLUMN_ID>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <NAME><![CDATA[Client]]></NAME>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <COLUMNNAME><![CDATA[AD_Client_ID]]></COLUMNNAME>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <AD_TABLE_ID><![CDATA[339677E1B4854680A6BCCFBE5D6BE6B2]]></AD_TABLE_ID>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <DEFAULTVALUE><![CDATA[@AD_CLIENT_ID@]]></DEFAULTVALUE>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <AD_ELEMENT_ID><![CDATA[102]]></AD_ELEMENT_ID>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <POSITION><![CDATA[2]]></POSITION>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--BD1A5D4B40E84593B3185CC22CFC28A5--></AD_COLUMN>
+
 <!--BD29550316AC4DFEA994934546D6CED4--><AD_COLUMN>
 <!--BD29550316AC4DFEA994934546D6CED4-->  <AD_COLUMN_ID><![CDATA[BD29550316AC4DFEA994934546D6CED4]]></AD_COLUMN_ID>
 <!--BD29550316AC4DFEA994934546D6CED4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -351558,6 +352807,45 @@
 <!--C0FF55F981BB47279B6BA18A2D811482-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--C0FF55F981BB47279B6BA18A2D811482--></AD_COLUMN>
 
+<!--C1576A161F184DBFAB10CDF2C3D351B4--><AD_COLUMN>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <AD_COLUMN_ID><![CDATA[C1576A161F184DBFAB10CDF2C3D351B4]]></AD_COLUMN_ID>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <NAME><![CDATA[Creation Date]]></NAME>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <DESCRIPTION><![CDATA[The date that this record is completed.]]></DESCRIPTION>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <HELP><![CDATA[The Created field indicates the date that this record was created.]]></HELP>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <COLUMNNAME><![CDATA[Created]]></COLUMNNAME>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <AD_TABLE_ID><![CDATA[339677E1B4854680A6BCCFBE5D6BE6B2]]></AD_TABLE_ID>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <AD_ELEMENT_ID><![CDATA[245]]></AD_ELEMENT_ID>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <POSITION><![CDATA[7]]></POSITION>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--C1576A161F184DBFAB10CDF2C3D351B4-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--C1576A161F184DBFAB10CDF2C3D351B4--></AD_COLUMN>
+
 <!--C18646B70CE5402DB4033DE2F22CFCB1--><AD_COLUMN>
 <!--C18646B70CE5402DB4033DE2F22CFCB1-->  <AD_COLUMN_ID><![CDATA[C18646B70CE5402DB4033DE2F22CFCB1]]></AD_COLUMN_ID>
 <!--C18646B70CE5402DB4033DE2F22CFCB1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -351598,6 +352886,42 @@
 <!--C18646B70CE5402DB4033DE2F22CFCB1-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--C18646B70CE5402DB4033DE2F22CFCB1--></AD_COLUMN>
 
+<!--C19EF153847648679FD9D3AC4574B839--><AD_COLUMN>
+<!--C19EF153847648679FD9D3AC4574B839-->  <AD_COLUMN_ID><![CDATA[C19EF153847648679FD9D3AC4574B839]]></AD_COLUMN_ID>
+<!--C19EF153847648679FD9D3AC4574B839-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C19EF153847648679FD9D3AC4574B839-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C19EF153847648679FD9D3AC4574B839-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C19EF153847648679FD9D3AC4574B839-->  <NAME><![CDATA[Available Qty in AUM]]></NAME>
+<!--C19EF153847648679FD9D3AC4574B839-->  <COLUMNNAME><![CDATA[Availableaumqty]]></COLUMNNAME>
+<!--C19EF153847648679FD9D3AC4574B839-->  <AD_TABLE_ID><![CDATA[347B0AA5C3CD4D18910D2FE4990B790E]]></AD_TABLE_ID>
+<!--C19EF153847648679FD9D3AC4574B839-->  <AD_REFERENCE_ID><![CDATA[29]]></AD_REFERENCE_ID>
+<!--C19EF153847648679FD9D3AC4574B839-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--C19EF153847648679FD9D3AC4574B839-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--C19EF153847648679FD9D3AC4574B839-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--C19EF153847648679FD9D3AC4574B839-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--C19EF153847648679FD9D3AC4574B839-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--C19EF153847648679FD9D3AC4574B839-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--C19EF153847648679FD9D3AC4574B839-->  <SEQNO><![CDATA[290]]></SEQNO>
+<!--C19EF153847648679FD9D3AC4574B839-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--C19EF153847648679FD9D3AC4574B839-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--C19EF153847648679FD9D3AC4574B839-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--C19EF153847648679FD9D3AC4574B839-->  <AD_ELEMENT_ID><![CDATA[AE2C8F033E3C47EE8A4D900BA3C9603E]]></AD_ELEMENT_ID>
+<!--C19EF153847648679FD9D3AC4574B839-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--C19EF153847648679FD9D3AC4574B839-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--C19EF153847648679FD9D3AC4574B839-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--C19EF153847648679FD9D3AC4574B839-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--C19EF153847648679FD9D3AC4574B839-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C19EF153847648679FD9D3AC4574B839-->  <POSITION><![CDATA[29]]></POSITION>
+<!--C19EF153847648679FD9D3AC4574B839-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--C19EF153847648679FD9D3AC4574B839-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--C19EF153847648679FD9D3AC4574B839-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--C19EF153847648679FD9D3AC4574B839-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--C19EF153847648679FD9D3AC4574B839-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--C19EF153847648679FD9D3AC4574B839-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--C19EF153847648679FD9D3AC4574B839-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--C19EF153847648679FD9D3AC4574B839-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--C19EF153847648679FD9D3AC4574B839--></AD_COLUMN>
+
 <!--C1DE4479A025001AE040007F01000C7E--><AD_COLUMN>
 <!--C1DE4479A025001AE040007F01000C7E-->  <AD_COLUMN_ID><![CDATA[C1DE4479A025001AE040007F01000C7E]]></AD_COLUMN_ID>
 <!--C1DE4479A025001AE040007F01000C7E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -353807,6 +355131,45 @@
 <!--C73593CD83514760916EBC58EEB5EB41-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--C73593CD83514760916EBC58EEB5EB41--></AD_COLUMN>
 
+<!--C73F85E45184488690A8565E1BCD4C10--><AD_COLUMN>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <AD_COLUMN_ID><![CDATA[C73F85E45184488690A8565E1BCD4C10]]></AD_COLUMN_ID>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <NAME><![CDATA[Updated]]></NAME>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <AD_TABLE_ID><![CDATA[339677E1B4854680A6BCCFBE5D6BE6B2]]></AD_TABLE_ID>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <AD_ELEMENT_ID><![CDATA[607]]></AD_ELEMENT_ID>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <POSITION><![CDATA[5]]></POSITION>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--C73F85E45184488690A8565E1BCD4C10-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--C73F85E45184488690A8565E1BCD4C10--></AD_COLUMN>
+
 <!--C756584FC0F1465B84754A6220EF43E3--><AD_COLUMN>
 <!--C756584FC0F1465B84754A6220EF43E3-->  <AD_COLUMN_ID><![CDATA[C756584FC0F1465B84754A6220EF43E3]]></AD_COLUMN_ID>
 <!--C756584FC0F1465B84754A6220EF43E3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -360561,7 +361924,7 @@
 <!--D0886771B2B843478613AAE863552638-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--D0886771B2B843478613AAE863552638-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
 <!--D0886771B2B843478613AAE863552638-->  <AD_ELEMENT_ID><![CDATA[215]]></AD_ELEMENT_ID>
-<!--D0886771B2B843478613AAE863552638-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--D0886771B2B843478613AAE863552638-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
 <!--D0886771B2B843478613AAE863552638-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--D0886771B2B843478613AAE863552638-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--D0886771B2B843478613AAE863552638-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
@@ -362116,6 +363479,46 @@
 <!--D5B00732731F427381C26651F24F2B66-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--D5B00732731F427381C26651F24F2B66--></AD_COLUMN>
 
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6--><AD_COLUMN>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <AD_COLUMN_ID><![CDATA[D5B1BCEEFBA44C5ABE1FB72CED2A9CA6]]></AD_COLUMN_ID>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <NAME><![CDATA[Alternative UOM]]></NAME>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <DESCRIPTION><![CDATA[A non monetary unit of measure.]]></DESCRIPTION>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <HELP><![CDATA[The Alternative UOM defines a unique non monetary unit of measure]]></HELP>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <COLUMNNAME><![CDATA[C_Aum]]></COLUMNNAME>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <AD_TABLE_ID><![CDATA[09C5EA393D0D41CEBB522DEC67534574]]></AD_TABLE_ID>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <AD_REFERENCE_VALUE_ID><![CDATA[D8CABB4103B14B42BE3064A68C600935]]></AD_REFERENCE_VALUE_ID>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <AD_VAL_RULE_ID><![CDATA[5ABEE0829BD24BFB9BA454E607825821]]></AD_VAL_RULE_ID>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <SEQNO><![CDATA[250]]></SEQNO>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <AD_ELEMENT_ID><![CDATA[397A72C953A54C3BA77B8B8F8C11407E]]></AD_ELEMENT_ID>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <POSITION><![CDATA[24]]></POSITION>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--D5B1BCEEFBA44C5ABE1FB72CED2A9CA6--></AD_COLUMN>
+
 <!--D5B23458ED9A4ABA826ADF0D0BEA05A0--><AD_COLUMN>
 <!--D5B23458ED9A4ABA826ADF0D0BEA05A0-->  <AD_COLUMN_ID><![CDATA[D5B23458ED9A4ABA826ADF0D0BEA05A0]]></AD_COLUMN_ID>
 <!--D5B23458ED9A4ABA826ADF0D0BEA05A0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -368001,6 +369404,44 @@
 <!--DDAC9683371241B8B7DF5CF21FE60550-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--DDAC9683371241B8B7DF5CF21FE60550--></AD_COLUMN>
 
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD--><AD_COLUMN>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <AD_COLUMN_ID><![CDATA[DDAD2C8A9CAE42C08854AA8B746A80DD]]></AD_COLUMN_ID>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <NAME><![CDATA[Updated By]]></NAME>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <DESCRIPTION><![CDATA[User who updated this records]]></DESCRIPTION>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <HELP><![CDATA[The Updated By field indicates the user who updated this record.]]></HELP>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <COLUMNNAME><![CDATA[Updatedby]]></COLUMNNAME>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <AD_TABLE_ID><![CDATA[339677E1B4854680A6BCCFBE5D6BE6B2]]></AD_TABLE_ID>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <AD_ELEMENT_ID><![CDATA[608]]></AD_ELEMENT_ID>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <POSITION><![CDATA[6]]></POSITION>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--DDAD2C8A9CAE42C08854AA8B746A80DD--></AD_COLUMN>
+
 <!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD--><AD_COLUMN>
 <!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD-->  <AD_COLUMN_ID><![CDATA[DDD1D5A0F25942B8B2C5D1DDF78AE9CD]]></AD_COLUMN_ID>
 <!--DDD1D5A0F25942B8B2C5D1DDF78AE9CD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -368154,6 +369595,44 @@
 <!--DE684B7F563E49E198807C2E8F5DCA3E-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--DE684B7F563E49E198807C2E8F5DCA3E--></AD_COLUMN>
 
+<!--DED319FDA90C4F78A4017AA064C34340--><AD_COLUMN>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <AD_COLUMN_ID><![CDATA[DED319FDA90C4F78A4017AA064C34340]]></AD_COLUMN_ID>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <NAME><![CDATA[Returned UOM]]></NAME>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <COLUMNNAME><![CDATA[Returneduom]]></COLUMNNAME>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <AD_TABLE_ID><![CDATA[347B0AA5C3CD4D18910D2FE4990B790E]]></AD_TABLE_ID>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <AD_REFERENCE_VALUE_ID><![CDATA[F418216771C7413CB74DCFBFA548F540]]></AD_REFERENCE_VALUE_ID>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <AD_VAL_RULE_ID><![CDATA[3A6DAFE90E0947BEB96148737BA9F187]]></AD_VAL_RULE_ID>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <SEQNO><![CDATA[270]]></SEQNO>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <AD_ELEMENT_ID><![CDATA[C2F946566CEE4973B2ACAA74323FAFBD]]></AD_ELEMENT_ID>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <POSITION><![CDATA[27]]></POSITION>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--DED319FDA90C4F78A4017AA064C34340-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--DED319FDA90C4F78A4017AA064C34340--></AD_COLUMN>
+
 <!--DF0B32318BA24AEFA12ACC583E14E239--><AD_COLUMN>
 <!--DF0B32318BA24AEFA12ACC583E14E239-->  <AD_COLUMN_ID><![CDATA[DF0B32318BA24AEFA12ACC583E14E239]]></AD_COLUMN_ID>
 <!--DF0B32318BA24AEFA12ACC583E14E239-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -369240,6 +370719,7 @@
 <!--E070B14C007ADAA1E040007F010016DD-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--E070B14C007ADAA1E040007F010016DD-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--E070B14C007ADAA1E040007F010016DD-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--E070B14C007ADAA1E040007F010016DD-->  <READONLYLOGIC><![CDATA[OB.PropertyStore.get('UomManagement')='Y']]></READONLYLOGIC>
 <!--E070B14C007ADAA1E040007F010016DD-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--E070B14C007ADAA1E040007F010016DD-->  <SEQNO><![CDATA[130]]></SEQNO>
 <!--E070B14C007ADAA1E040007F010016DD-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -372919,6 +374399,44 @@
 <!--EBFDF830CC6F478B8BE91159347C8A92-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--EBFDF830CC6F478B8BE91159347C8A92--></AD_COLUMN>
 
+<!--EC21DC290761445D96F9EAB6740FF9F7--><AD_COLUMN>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <AD_COLUMN_ID><![CDATA[EC21DC290761445D96F9EAB6740FF9F7]]></AD_COLUMN_ID>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <NAME><![CDATA[aumqty]]></NAME>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <DESCRIPTION><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></DESCRIPTION>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <HELP><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></HELP>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <COLUMNNAME><![CDATA[aumqty]]></COLUMNNAME>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <AD_TABLE_ID><![CDATA[CDB9DC9655F24DF8AB41AA0ADBD04390]]></AD_TABLE_ID>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <AD_REFERENCE_ID><![CDATA[29]]></AD_REFERENCE_ID>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <SEQNO><![CDATA[210]]></SEQNO>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <AD_ELEMENT_ID><![CDATA[9AAC1EE202DB487D89C4A3E75631E6C4]]></AD_ELEMENT_ID>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <ENTITY_ALIAS><![CDATA[rmAUMQty]]></ENTITY_ALIAS>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--EC21DC290761445D96F9EAB6740FF9F7-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--EC21DC290761445D96F9EAB6740FF9F7--></AD_COLUMN>
+
 <!--EC3EE7F7E7224AB18A9D8B5CECE9B323--><AD_COLUMN>
 <!--EC3EE7F7E7224AB18A9D8B5CECE9B323-->  <AD_COLUMN_ID><![CDATA[EC3EE7F7E7224AB18A9D8B5CECE9B323]]></AD_COLUMN_ID>
 <!--EC3EE7F7E7224AB18A9D8B5CECE9B323-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -376623,6 +378141,46 @@
 <!--F8764D20F44B47C1ADDAD5D8C918997C-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--F8764D20F44B47C1ADDAD5D8C918997C--></AD_COLUMN>
 
+<!--F883C44B478641D5961963B69469CCEB--><AD_COLUMN>
+<!--F883C44B478641D5961963B69469CCEB-->  <AD_COLUMN_ID><![CDATA[F883C44B478641D5961963B69469CCEB]]></AD_COLUMN_ID>
+<!--F883C44B478641D5961963B69469CCEB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F883C44B478641D5961963B69469CCEB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F883C44B478641D5961963B69469CCEB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F883C44B478641D5961963B69469CCEB-->  <NAME><![CDATA[Operative Quantity]]></NAME>
+<!--F883C44B478641D5961963B69469CCEB-->  <DESCRIPTION><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></DESCRIPTION>
+<!--F883C44B478641D5961963B69469CCEB-->  <HELP><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></HELP>
+<!--F883C44B478641D5961963B69469CCEB-->  <COLUMNNAME><![CDATA[Aumqty]]></COLUMNNAME>
+<!--F883C44B478641D5961963B69469CCEB-->  <AD_TABLE_ID><![CDATA[800214]]></AD_TABLE_ID>
+<!--F883C44B478641D5961963B69469CCEB-->  <AD_REFERENCE_ID><![CDATA[29]]></AD_REFERENCE_ID>
+<!--F883C44B478641D5961963B69469CCEB-->  <FIELDLENGTH><![CDATA[2]]></FIELDLENGTH>
+<!--F883C44B478641D5961963B69469CCEB-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--F883C44B478641D5961963B69469CCEB-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--F883C44B478641D5961963B69469CCEB-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--F883C44B478641D5961963B69469CCEB-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--F883C44B478641D5961963B69469CCEB-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--F883C44B478641D5961963B69469CCEB-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--F883C44B478641D5961963B69469CCEB-->  <SEQNO><![CDATA[440]]></SEQNO>
+<!--F883C44B478641D5961963B69469CCEB-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--F883C44B478641D5961963B69469CCEB-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--F883C44B478641D5961963B69469CCEB-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--F883C44B478641D5961963B69469CCEB-->  <AD_ELEMENT_ID><![CDATA[9AAC1EE202DB487D89C4A3E75631E6C4]]></AD_ELEMENT_ID>
+<!--F883C44B478641D5961963B69469CCEB-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--F883C44B478641D5961963B69469CCEB-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--F883C44B478641D5961963B69469CCEB-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--F883C44B478641D5961963B69469CCEB-->  <AD_CALLOUT_ID><![CDATA[1AB9BD3356D643A79C058AA3B4EB175E]]></AD_CALLOUT_ID>
+<!--F883C44B478641D5961963B69469CCEB-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--F883C44B478641D5961963B69469CCEB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F883C44B478641D5961963B69469CCEB-->  <POSITION><![CDATA[40]]></POSITION>
+<!--F883C44B478641D5961963B69469CCEB-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--F883C44B478641D5961963B69469CCEB-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--F883C44B478641D5961963B69469CCEB-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--F883C44B478641D5961963B69469CCEB-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--F883C44B478641D5961963B69469CCEB-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--F883C44B478641D5961963B69469CCEB-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--F883C44B478641D5961963B69469CCEB-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--F883C44B478641D5961963B69469CCEB-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--F883C44B478641D5961963B69469CCEB--></AD_COLUMN>
+
 <!--F88552B627E048CCA995BEED4756BC9E--><AD_COLUMN>
 <!--F88552B627E048CCA995BEED4756BC9E-->  <AD_COLUMN_ID><![CDATA[F88552B627E048CCA995BEED4756BC9E]]></AD_COLUMN_ID>
 <!--F88552B627E048CCA995BEED4756BC9E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -378050,6 +379608,48 @@
 <!--FCA68B79DB904650A60CD5BC389A1036-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--FCA68B79DB904650A60CD5BC389A1036--></AD_COLUMN>
 
+<!--FCC18B6E98564CFB97CAF1EF5E983035--><AD_COLUMN>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <AD_COLUMN_ID><![CDATA[FCC18B6E98564CFB97CAF1EF5E983035]]></AD_COLUMN_ID>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <NAME><![CDATA[Operative UOM]]></NAME>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <DESCRIPTION><![CDATA[A non monetary unit of measure.]]></DESCRIPTION>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <HELP><![CDATA[The Alternative UOM defines a unique non monetary unit of measure]]></HELP>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <COLUMNNAME><![CDATA[C_Aum]]></COLUMNNAME>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <AD_TABLE_ID><![CDATA[800214]]></AD_TABLE_ID>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <AD_REFERENCE_VALUE_ID><![CDATA[D8CABB4103B14B42BE3064A68C600935]]></AD_REFERENCE_VALUE_ID>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <AD_VAL_RULE_ID><![CDATA[5ABEE0829BD24BFB9BA454E607825821]]></AD_VAL_RULE_ID>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <SEQNO><![CDATA[430]]></SEQNO>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <AD_ELEMENT_ID><![CDATA[397A72C953A54C3BA77B8B8F8C11407E]]></AD_ELEMENT_ID>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <AD_CALLOUT_ID><![CDATA[1AB9BD3356D643A79C058AA3B4EB175E]]></AD_CALLOUT_ID>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <POSITION><![CDATA[39]]></POSITION>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--FCC18B6E98564CFB97CAF1EF5E983035-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--FCC18B6E98564CFB97CAF1EF5E983035--></AD_COLUMN>
+
 <!--FCE31AB4EF8844FAA2BA89E8AFB36E8B--><AD_COLUMN>
 <!--FCE31AB4EF8844FAA2BA89E8AFB36E8B-->  <AD_COLUMN_ID><![CDATA[FCE31AB4EF8844FAA2BA89E8AFB36E8B]]></AD_COLUMN_ID>
 <!--FCE31AB4EF8844FAA2BA89E8AFB36E8B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_ELEMENT.xml	Fri Dec 02 10:33:48 2016 +0100
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -22397,6 +22397,22 @@
 <!--3269E9900D0C45BB9CDA1BF2975242ED-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--3269E9900D0C45BB9CDA1BF2975242ED--></AD_ELEMENT>
 
+<!--336E3CA968AF4707AFED0D8C94BBCE64--><AD_ELEMENT>
+<!--336E3CA968AF4707AFED0D8C94BBCE64-->  <AD_ELEMENT_ID><![CDATA[336E3CA968AF4707AFED0D8C94BBCE64]]></AD_ELEMENT_ID>
+<!--336E3CA968AF4707AFED0D8C94BBCE64-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--336E3CA968AF4707AFED0D8C94BBCE64-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--336E3CA968AF4707AFED0D8C94BBCE64-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--336E3CA968AF4707AFED0D8C94BBCE64-->  <COLUMNNAME><![CDATA[QtyAum]]></COLUMNNAME>
+<!--336E3CA968AF4707AFED0D8C94BBCE64-->  <NAME><![CDATA[Aum Quantity]]></NAME>
+<!--336E3CA968AF4707AFED0D8C94BBCE64-->  <PRINTNAME><![CDATA[Aum Quantity]]></PRINTNAME>
+<!--336E3CA968AF4707AFED0D8C94BBCE64-->  <DESCRIPTION><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></DESCRIPTION>
+<!--336E3CA968AF4707AFED0D8C94BBCE64-->  <HELP><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></HELP>
+<!--336E3CA968AF4707AFED0D8C94BBCE64-->  <PO_DESCRIPTION><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></PO_DESCRIPTION>
+<!--336E3CA968AF4707AFED0D8C94BBCE64-->  <PO_HELP><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></PO_HELP>
+<!--336E3CA968AF4707AFED0D8C94BBCE64-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--336E3CA968AF4707AFED0D8C94BBCE64-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--336E3CA968AF4707AFED0D8C94BBCE64--></AD_ELEMENT>
+
 <!--33D4F4DEADD74C48A55C08A9DCEB41B2--><AD_ELEMENT>
 <!--33D4F4DEADD74C48A55C08A9DCEB41B2-->  <AD_ELEMENT_ID><![CDATA[33D4F4DEADD74C48A55C08A9DCEB41B2]]></AD_ELEMENT_ID>
 <!--33D4F4DEADD74C48A55C08A9DCEB41B2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -22477,6 +22493,20 @@
 <!--38148AAF2D384F08B493B5484EFFA6E3-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--38148AAF2D384F08B493B5484EFFA6E3--></AD_ELEMENT>
 
+<!--397A72C953A54C3BA77B8B8F8C11407E--><AD_ELEMENT>
+<!--397A72C953A54C3BA77B8B8F8C11407E-->  <AD_ELEMENT_ID><![CDATA[397A72C953A54C3BA77B8B8F8C11407E]]></AD_ELEMENT_ID>
+<!--397A72C953A54C3BA77B8B8F8C11407E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--397A72C953A54C3BA77B8B8F8C11407E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--397A72C953A54C3BA77B8B8F8C11407E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--397A72C953A54C3BA77B8B8F8C11407E-->  <COLUMNNAME><![CDATA[C_Aum]]></COLUMNNAME>
+<!--397A72C953A54C3BA77B8B8F8C11407E-->  <NAME><![CDATA[Alternative UOM]]></NAME>
+<!--397A72C953A54C3BA77B8B8F8C11407E-->  <PRINTNAME><![CDATA[Alternative UOM]]></PRINTNAME>
+<!--397A72C953A54C3BA77B8B8F8C11407E-->  <DESCRIPTION><![CDATA[A non monetary unit of measure.]]></DESCRIPTION>
+<!--397A72C953A54C3BA77B8B8F8C11407E-->  <HELP><![CDATA[The Alternative UOM defines a unique non monetary unit of measure]]></HELP>
+<!--397A72C953A54C3BA77B8B8F8C11407E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--397A72C953A54C3BA77B8B8F8C11407E-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--397A72C953A54C3BA77B8B8F8C11407E--></AD_ELEMENT>
+
 <!--39E07159032E4B9DB5C6C5CEB8CC7F90--><AD_ELEMENT>
 <!--39E07159032E4B9DB5C6C5CEB8CC7F90-->  <AD_ELEMENT_ID><![CDATA[39E07159032E4B9DB5C6C5CEB8CC7F90]]></AD_ELEMENT_ID>
 <!--39E07159032E4B9DB5C6C5CEB8CC7F90-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -26020,6 +26050,18 @@
 <!--6302F6EDDA7C4B6A9A5A4533C28387E2-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--6302F6EDDA7C4B6A9A5A4533C28387E2--></AD_ELEMENT>
 
+<!--6343BE55E1554B2AAB55E8A76721AFA6--><AD_ELEMENT>
+<!--6343BE55E1554B2AAB55E8A76721AFA6-->  <AD_ELEMENT_ID><![CDATA[6343BE55E1554B2AAB55E8A76721AFA6]]></AD_ELEMENT_ID>
+<!--6343BE55E1554B2AAB55E8A76721AFA6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6343BE55E1554B2AAB55E8A76721AFA6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6343BE55E1554B2AAB55E8A76721AFA6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6343BE55E1554B2AAB55E8A76721AFA6-->  <COLUMNNAME><![CDATA[Pendingaumqty]]></COLUMNNAME>
+<!--6343BE55E1554B2AAB55E8A76721AFA6-->  <NAME><![CDATA[Pending Qty in AUM]]></NAME>
+<!--6343BE55E1554B2AAB55E8A76721AFA6-->  <PRINTNAME><![CDATA[Pending Qty in AUM]]></PRINTNAME>
+<!--6343BE55E1554B2AAB55E8A76721AFA6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6343BE55E1554B2AAB55E8A76721AFA6-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--6343BE55E1554B2AAB55E8A76721AFA6--></AD_ELEMENT>
+
 <!--636D464FBE474F4E87F3003F1E009031--><AD_ELEMENT>
 <!--636D464FBE474F4E87F3003F1E009031-->  <AD_ELEMENT_ID><![CDATA[636D464FBE474F4E87F3003F1E009031]]></AD_ELEMENT_ID>
 <!--636D464FBE474F4E87F3003F1E009031-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -28379,6 +28421,22 @@
 <!--8244768045624F28B86A35DB9934ECB5-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--8244768045624F28B86A35DB9934ECB5--></AD_ELEMENT>
 
+<!--82589E9B19A04B6C8F8E48E192082470--><AD_ELEMENT>
+<!--82589E9B19A04B6C8F8E48E192082470-->  <AD_ELEMENT_ID><![CDATA[82589E9B19A04B6C8F8E48E192082470]]></AD_ELEMENT_ID>
+<!--82589E9B19A04B6C8F8E48E192082470-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--82589E9B19A04B6C8F8E48E192082470-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--82589E9B19A04B6C8F8E48E192082470-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--82589E9B19A04B6C8F8E48E192082470-->  <COLUMNNAME><![CDATA[Gtin]]></COLUMNNAME>
+<!--82589E9B19A04B6C8F8E48E192082470-->  <NAME><![CDATA[Gtin]]></NAME>
+<!--82589E9B19A04B6C8F8E48E192082470-->  <PRINTNAME><![CDATA[Gtin]]></PRINTNAME>
+<!--82589E9B19A04B6C8F8E48E192082470-->  <DESCRIPTION><![CDATA[The GTIN is a globally unique 14-digit number used to identify trade items, products, or services]]></DESCRIPTION>
+<!--82589E9B19A04B6C8F8E48E192082470-->  <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>
+<!--82589E9B19A04B6C8F8E48E192082470-->  <PO_DESCRIPTION><![CDATA[The GTIN is a globally unique 14-digit number used to identify trade items, products, or services]]></PO_DESCRIPTION>
+<!--82589E9B19A04B6C8F8E48E192082470-->  <PO_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.]]></PO_HELP>
+<!--82589E9B19A04B6C8F8E48E192082470-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--82589E9B19A04B6C8F8E48E192082470-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--82589E9B19A04B6C8F8E48E192082470--></AD_ELEMENT>
+
 <!--828EE0AE7FE35FA1E040007F010067C7--><AD_ELEMENT>
 <!--828EE0AE7FE35FA1E040007F010067C7-->  <AD_ELEMENT_ID><![CDATA[828EE0AE7FE35FA1E040007F010067C7]]></AD_ELEMENT_ID>
 <!--828EE0AE7FE35FA1E040007F010067C7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -30262,6 +30320,22 @@
 <!--99BD365BE13C2DB2E040A8C0BD065C94-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--99BD365BE13C2DB2E040A8C0BD065C94--></AD_ELEMENT>
 
+<!--9AAC1EE202DB487D89C4A3E75631E6C4--><AD_ELEMENT>
+<!--9AAC1EE202DB487D89C4A3E75631E6C4-->  <AD_ELEMENT_ID><![CDATA[9AAC1EE202DB487D89C4A3E75631E6C4]]></AD_ELEMENT_ID>
+<!--9AAC1EE202DB487D89C4A3E75631E6C4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9AAC1EE202DB487D89C4A3E75631E6C4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9AAC1EE202DB487D89C4A3E75631E6C4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9AAC1EE202DB487D89C4A3E75631E6C4-->  <COLUMNNAME><![CDATA[Aumqty]]></COLUMNNAME>
+<!--9AAC1EE202DB487D89C4A3E75631E6C4-->  <NAME><![CDATA[Operative Quantity]]></NAME>
+<!--9AAC1EE202DB487D89C4A3E75631E6C4-->  <PRINTNAME><![CDATA[Operative Quantity]]></PRINTNAME>
+<!--9AAC1EE202DB487D89C4A3E75631E6C4-->  <DESCRIPTION><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></DESCRIPTION>
+<!--9AAC1EE202DB487D89C4A3E75631E6C4-->  <HELP><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></HELP>
+<!--9AAC1EE202DB487D89C4A3E75631E6C4-->  <PO_DESCRIPTION><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></PO_DESCRIPTION>
+<!--9AAC1EE202DB487D89C4A3E75631E6C4-->  <PO_HELP><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></PO_HELP>
+<!--9AAC1EE202DB487D89C4A3E75631E6C4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9AAC1EE202DB487D89C4A3E75631E6C4-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--9AAC1EE202DB487D89C4A3E75631E6C4--></AD_ELEMENT>
+
 <!--9BAF826C68191754E040007F0100241B--><AD_ELEMENT>
 <!--9BAF826C68191754E040007F0100241B-->  <AD_ELEMENT_ID><![CDATA[9BAF826C68191754E040007F0100241B]]></AD_ELEMENT_ID>
 <!--9BAF826C68191754E040007F0100241B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -30735,6 +30809,18 @@
 <!--A7DFF3B22D044845B4D6BDCD987E7948-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--A7DFF3B22D044845B4D6BDCD987E7948--></AD_ELEMENT>
 
+<!--A7FC44EFCAFC41CB9971C834BB3A09D7--><AD_ELEMENT>
+<!--A7FC44EFCAFC41CB9971C834BB3A09D7-->  <AD_ELEMENT_ID><![CDATA[A7FC44EFCAFC41CB9971C834BB3A09D7]]></AD_ELEMENT_ID>
+<!--A7FC44EFCAFC41CB9971C834BB3A09D7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A7FC44EFCAFC41CB9971C834BB3A09D7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A7FC44EFCAFC41CB9971C834BB3A09D7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A7FC44EFCAFC41CB9971C834BB3A09D7-->  <COLUMNNAME><![CDATA[Lockaumqty]]></COLUMNNAME>
+<!--A7FC44EFCAFC41CB9971C834BB3A09D7-->  <NAME><![CDATA[Lock AumQty]]></NAME>
+<!--A7FC44EFCAFC41CB9971C834BB3A09D7-->  <PRINTNAME><![CDATA[Lock AumQty]]></PRINTNAME>
+<!--A7FC44EFCAFC41CB9971C834BB3A09D7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A7FC44EFCAFC41CB9971C834BB3A09D7-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--A7FC44EFCAFC41CB9971C834BB3A09D7--></AD_ELEMENT>
+
 <!--A92C853AF2C011DD81C5001D09C4A2FE--><AD_ELEMENT>
 <!--A92C853AF2C011DD81C5001D09C4A2FE-->  <AD_ELEMENT_ID><![CDATA[A92C853AF2C011DD81C5001D09C4A2FE]]></AD_ELEMENT_ID>
 <!--A92C853AF2C011DD81C5001D09C4A2FE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -30912,6 +30998,18 @@
 <!--AE1F41CD25C749BEABECD456DA97607F-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--AE1F41CD25C749BEABECD456DA97607F--></AD_ELEMENT>
 
+<!--AE2C8F033E3C47EE8A4D900BA3C9603E--><AD_ELEMENT>
+<!--AE2C8F033E3C47EE8A4D900BA3C9603E-->  <AD_ELEMENT_ID><![CDATA[AE2C8F033E3C47EE8A4D900BA3C9603E]]></AD_ELEMENT_ID>
+<!--AE2C8F033E3C47EE8A4D900BA3C9603E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AE2C8F033E3C47EE8A4D900BA3C9603E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AE2C8F033E3C47EE8A4D900BA3C9603E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AE2C8F033E3C47EE8A4D900BA3C9603E-->  <COLUMNNAME><![CDATA[Availableaumqty]]></COLUMNNAME>
+<!--AE2C8F033E3C47EE8A4D900BA3C9603E-->  <NAME><![CDATA[Available Qty in AUM]]></NAME>
+<!--AE2C8F033E3C47EE8A4D900BA3C9603E-->  <PRINTNAME><![CDATA[Available Qty in AUM]]></PRINTNAME>
+<!--AE2C8F033E3C47EE8A4D900BA3C9603E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--AE2C8F033E3C47EE8A4D900BA3C9603E-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--AE2C8F033E3C47EE8A4D900BA3C9603E--></AD_ELEMENT>
+
 <!--AE5F0D103EEF4E7CB86EB5A9B4801686--><AD_ELEMENT>
 <!--AE5F0D103EEF4E7CB86EB5A9B4801686-->  <AD_ELEMENT_ID><![CDATA[AE5F0D103EEF4E7CB86EB5A9B4801686]]></AD_ELEMENT_ID>
 <!--AE5F0D103EEF4E7CB86EB5A9B4801686-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -31087,6 +31185,10 @@
 <!--B0D45E247BECF1A8E040007F0100514B-->  <COLUMNNAME><![CDATA[ReceivingQty]]></COLUMNNAME>
 <!--B0D45E247BECF1A8E040007F0100514B-->  <NAME><![CDATA[Receiving]]></NAME>
 <!--B0D45E247BECF1A8E040007F0100514B-->  <PRINTNAME><![CDATA[Receiving]]></PRINTNAME>
+<!--B0D45E247BECF1A8E040007F0100514B-->  <DESCRIPTION><![CDATA[Receiving quantity]]></DESCRIPTION>
+<!--B0D45E247BECF1A8E040007F0100514B-->  <HELP><![CDATA[Receiving quantity]]></HELP>
+<!--B0D45E247BECF1A8E040007F0100514B-->  <PO_DESCRIPTION><![CDATA[Receiving quantity]]></PO_DESCRIPTION>
+<!--B0D45E247BECF1A8E040007F0100514B-->  <PO_HELP><![CDATA[Receiving quantity]]></PO_HELP>
 <!--B0D45E247BECF1A8E040007F0100514B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--B0D45E247BECF1A8E040007F0100514B-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--B0D45E247BECF1A8E040007F0100514B--></AD_ELEMENT>
@@ -31552,6 +31654,22 @@
 <!--B8DC6189A12B1226E040007F010036E2-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--B8DC6189A12B1226E040007F010036E2--></AD_ELEMENT>
 
+<!--B9235304E9354DBEB1326D8DE51CF3A5--><AD_ELEMENT>
+<!--B9235304E9354DBEB1326D8DE51CF3A5-->  <AD_ELEMENT_ID><![CDATA[B9235304E9354DBEB1326D8DE51CF3A5]]></AD_ELEMENT_ID>
+<!--B9235304E9354DBEB1326D8DE51CF3A5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B9235304E9354DBEB1326D8DE51CF3A5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B9235304E9354DBEB1326D8DE51CF3A5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B9235304E9354DBEB1326D8DE51CF3A5-->  <COLUMNNAME><![CDATA[Purchase]]></COLUMNNAME>
+<!--B9235304E9354DBEB1326D8DE51CF3A5-->  <NAME><![CDATA[Purchase]]></NAME>
+<!--B9235304E9354DBEB1326D8DE51CF3A5-->  <PRINTNAME><![CDATA[Purchase]]></PRINTNAME>
+<!--B9235304E9354DBEB1326D8DE51CF3A5-->  <DESCRIPTION><![CDATA[It represents the priority of this AUM to the Purchases flows]]></DESCRIPTION>
+<!--B9235304E9354DBEB1326D8DE51CF3A5-->  <HELP><![CDATA[It represents the priority of this AUM to the Purchases flows]]></HELP>
+<!--B9235304E9354DBEB1326D8DE51CF3A5-->  <PO_DESCRIPTION><![CDATA[It represents the priority of this AUM to the Purchases flows]]></PO_DESCRIPTION>
+<!--B9235304E9354DBEB1326D8DE51CF3A5-->  <PO_HELP><![CDATA[It represents the priority of this AUM to the Purchases flows]]></PO_HELP>
+<!--B9235304E9354DBEB1326D8DE51CF3A5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B9235304E9354DBEB1326D8DE51CF3A5-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--B9235304E9354DBEB1326D8DE51CF3A5--></AD_ELEMENT>
+
 <!--B928FFF690830124E040007F01004E03--><AD_ELEMENT>
 <!--B928FFF690830124E040007F01004E03-->  <AD_ELEMENT_ID><![CDATA[B928FFF690830124E040007F01004E03]]></AD_ELEMENT_ID>
 <!--B928FFF690830124E040007F01004E03-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -31846,6 +31964,18 @@
 <!--BC305FD814A14590AADE9C89D138762A-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--BC305FD814A14590AADE9C89D138762A--></AD_ELEMENT>
 
+<!--BCCA60D6DD2C4FB78F895E745F9348C0--><AD_ELEMENT>
+<!--BCCA60D6DD2C4FB78F895E745F9348C0-->  <AD_ELEMENT_ID><![CDATA[BCCA60D6DD2C4FB78F895E745F9348C0]]></AD_ELEMENT_ID>
+<!--BCCA60D6DD2C4FB78F895E745F9348C0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BCCA60D6DD2C4FB78F895E745F9348C0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BCCA60D6DD2C4FB78F895E745F9348C0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BCCA60D6DD2C4FB78F895E745F9348C0-->  <COLUMNNAME><![CDATA[aumConversionRate]]></COLUMNNAME>
+<!--BCCA60D6DD2C4FB78F895E745F9348C0-->  <NAME><![CDATA[aumConversionRate]]></NAME>
+<!--BCCA60D6DD2C4FB78F895E745F9348C0-->  <PRINTNAME><![CDATA[aumConversionRate]]></PRINTNAME>
+<!--BCCA60D6DD2C4FB78F895E745F9348C0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--BCCA60D6DD2C4FB78F895E745F9348C0-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--BCCA60D6DD2C4FB78F895E745F9348C0--></AD_ELEMENT>
+
 <!--BD206BB6091A40A2A4F6AEE47A8266AF--><AD_ELEMENT>
 <!--BD206BB6091A40A2A4F6AEE47A8266AF-->  <AD_ELEMENT_ID><![CDATA[BD206BB6091A40A2A4F6AEE47A8266AF]]></AD_ELEMENT_ID>
 <!--BD206BB6091A40A2A4F6AEE47A8266AF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -31927,6 +32057,18 @@
 <!--BDC51EB4B3284866A2919ED98022A14F-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--BDC51EB4B3284866A2919ED98022A14F--></AD_ELEMENT>
 
+<!--BE10747600A0465E90524C460E5AB751--><AD_ELEMENT>
+<!--BE10747600A0465E90524C460E5AB751-->  <AD_ELEMENT_ID><![CDATA[BE10747600A0465E90524C460E5AB751]]></AD_ELEMENT_ID>
+<!--BE10747600A0465E90524C460E5AB751-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BE10747600A0465E90524C460E5AB751-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BE10747600A0465E90524C460E5AB751-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BE10747600A0465E90524C460E5AB751-->  <COLUMNNAME><![CDATA[Aum]]></COLUMNNAME>
+<!--BE10747600A0465E90524C460E5AB751-->  <NAME><![CDATA[Aum]]></NAME>
+<!--BE10747600A0465E90524C460E5AB751-->  <PRINTNAME><![CDATA[Aum]]></PRINTNAME>
+<!--BE10747600A0465E90524C460E5AB751-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--BE10747600A0465E90524C460E5AB751-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--BE10747600A0465E90524C460E5AB751--></AD_ELEMENT>
+
 <!--BE7014D21A43412CA94D17540B8D4692--><AD_ELEMENT>
 <!--BE7014D21A43412CA94D17540B8D4692-->  <AD_ELEMENT_ID><![CDATA[BE7014D21A43412CA94D17540B8D4692]]></AD_ELEMENT_ID>
 <!--BE7014D21A43412CA94D17540B8D4692-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -32089,6 +32231,18 @@
 <!--C29CB8BD66B54FA3ABAB6216039219C3-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--C29CB8BD66B54FA3ABAB6216039219C3--></AD_ELEMENT>
 
+<!--C2F946566CEE4973B2ACAA74323FAFBD--><AD_ELEMENT>
+<!--C2F946566CEE4973B2ACAA74323FAFBD-->  <AD_ELEMENT_ID><![CDATA[C2F946566CEE4973B2ACAA74323FAFBD]]></AD_ELEMENT_ID>
+<!--C2F946566CEE4973B2ACAA74323FAFBD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C2F946566CEE4973B2ACAA74323FAFBD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C2F946566CEE4973B2ACAA74323FAFBD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C2F946566CEE4973B2ACAA74323FAFBD-->  <COLUMNNAME><![CDATA[Returneduom]]></COLUMNNAME>
+<!--C2F946566CEE4973B2ACAA74323FAFBD-->  <NAME><![CDATA[Returned UOM]]></NAME>
+<!--C2F946566CEE4973B2ACAA74323FAFBD-->  <PRINTNAME><![CDATA[Returned UOM]]></PRINTNAME>
+<!--C2F946566CEE4973B2ACAA74323FAFBD-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C2F946566CEE4973B2ACAA74323FAFBD-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--C2F946566CEE4973B2ACAA74323FAFBD--></AD_ELEMENT>
+
 <!--C2FE8DEF5C13482F8758744125B6251E--><AD_ELEMENT>
 <!--C2FE8DEF5C13482F8758744125B6251E-->  <AD_ELEMENT_ID><![CDATA[C2FE8DEF5C13482F8758744125B6251E]]></AD_ELEMENT_ID>
 <!--C2FE8DEF5C13482F8758744125B6251E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -32384,6 +32538,22 @@
 <!--C9C41FA962E34C52B1BC48C2879371BA-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--C9C41FA962E34C52B1BC48C2879371BA--></AD_ELEMENT>
 
+<!--C9F2D21FF4DA49C09186CFA4A31E6F3D--><AD_ELEMENT>
+<!--C9F2D21FF4DA49C09186CFA4A31E6F3D-->  <AD_ELEMENT_ID><![CDATA[C9F2D21FF4DA49C09186CFA4A31E6F3D]]></AD_ELEMENT_ID>
+<!--C9F2D21FF4DA49C09186CFA4A31E6F3D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C9F2D21FF4DA49C09186CFA4A31E6F3D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C9F2D21FF4DA49C09186CFA4A31E6F3D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C9F2D21FF4DA49C09186CFA4A31E6F3D-->  <COLUMNNAME><![CDATA[returnedUOM]]></COLUMNNAME>
+<!--C9F2D21FF4DA49C09186CFA4A31E6F3D-->  <NAME><![CDATA[Returned UOM]]></NAME>
+<!--C9F2D21FF4DA49C09186CFA4A31E6F3D-->  <PRINTNAME><![CDATA[Returned UOM]]></PRINTNAME>
+<!--C9F2D21FF4DA49C09186CFA4A31E6F3D-->  <DESCRIPTION><![CDATA[Returned UOM]]></DESCRIPTION>
+<!--C9F2D21FF4DA49C09186CFA4A31E6F3D-->  <HELP><![CDATA[Returned UOM]]></HELP>
+<!--C9F2D21FF4DA49C09186CFA4A31E6F3D-->  <PO_DESCRIPTION><![CDATA[Returned UOM]]></PO_DESCRIPTION>
+<!--C9F2D21FF4DA49C09186CFA4A31E6F3D-->  <PO_HELP><![CDATA[Returned UOM]]></PO_HELP>
+<!--C9F2D21FF4DA49C09186CFA4A31E6F3D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C9F2D21FF4DA49C09186CFA4A31E6F3D-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--C9F2D21FF4DA49C09186CFA4A31E6F3D--></AD_ELEMENT>
+
 <!--CA10792A63BB4C1CBD5346A823DFE538--><AD_ELEMENT>
 <!--CA10792A63BB4C1CBD5346A823DFE538-->  <AD_ELEMENT_ID><![CDATA[CA10792A63BB4C1CBD5346A823DFE538]]></AD_ELEMENT_ID>
 <!--CA10792A63BB4C1CBD5346A823DFE538-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -32882,6 +33052,22 @@
 <!--CEFF12045E10490496BA6CE8AC1AD27A-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--CEFF12045E10490496BA6CE8AC1AD27A--></AD_ELEMENT>
 
+<!--CF0F66E7A51F426BA094AB5BB962FE4D--><AD_ELEMENT>
+<!--CF0F66E7A51F426BA094AB5BB962FE4D-->  <AD_ELEMENT_ID><![CDATA[CF0F66E7A51F426BA094AB5BB962FE4D]]></AD_ELEMENT_ID>
+<!--CF0F66E7A51F426BA094AB5BB962FE4D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CF0F66E7A51F426BA094AB5BB962FE4D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CF0F66E7A51F426BA094AB5BB962FE4D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CF0F66E7A51F426BA094AB5BB962FE4D-->  <COLUMNNAME><![CDATA[Logistics]]></COLUMNNAME>
+<!--CF0F66E7A51F426BA094AB5BB962FE4D-->  <NAME><![CDATA[Logistics]]></NAME>
+<!--CF0F66E7A51F426BA094AB5BB962FE4D-->  <PRINTNAME><![CDATA[Logistics]]></PRINTNAME>
+<!--CF0F66E7A51F426BA094AB5BB962FE4D-->  <DESCRIPTION><![CDATA[It represents the priority of this AUM to the Logistics flows]]></DESCRIPTION>
+<!--CF0F66E7A51F426BA094AB5BB962FE4D-->  <HELP><![CDATA[It represents the priority of this AUM to the Logistics flows]]></HELP>
+<!--CF0F66E7A51F426BA094AB5BB962FE4D-->  <PO_DESCRIPTION><![CDATA[It represents the priority of this AUM to the Logistics flows]]></PO_DESCRIPTION>
+<!--CF0F66E7A51F426BA094AB5BB962FE4D-->  <PO_HELP><![CDATA[It represents the priority of this AUM to the Logistics flows]]></PO_HELP>
+<!--CF0F66E7A51F426BA094AB5BB962FE4D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--CF0F66E7A51F426BA094AB5BB962FE4D-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--CF0F66E7A51F426BA094AB5BB962FE4D--></AD_ELEMENT>
+
 <!--CFB5920BA3D24015ACE95B3E42E5806F--><AD_ELEMENT>
 <!--CFB5920BA3D24015ACE95B3E42E5806F-->  <AD_ELEMENT_ID><![CDATA[CFB5920BA3D24015ACE95B3E42E5806F]]></AD_ELEMENT_ID>
 <!--CFB5920BA3D24015ACE95B3E42E5806F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -33016,6 +33202,22 @@
 <!--D3E4B412F90E4D13A290F5EAA0278261-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--D3E4B412F90E4D13A290F5EAA0278261--></AD_ELEMENT>
 
+<!--D3E6BAD6A1A746ED9324B9F04501439B--><AD_ELEMENT>
+<!--D3E6BAD6A1A746ED9324B9F04501439B-->  <AD_ELEMENT_ID><![CDATA[D3E6BAD6A1A746ED9324B9F04501439B]]></AD_ELEMENT_ID>
+<!--D3E6BAD6A1A746ED9324B9F04501439B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D3E6BAD6A1A746ED9324B9F04501439B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D3E6BAD6A1A746ED9324B9F04501439B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D3E6BAD6A1A746ED9324B9F04501439B-->  <COLUMNNAME><![CDATA[aumId]]></COLUMNNAME>
+<!--D3E6BAD6A1A746ED9324B9F04501439B-->  <NAME><![CDATA[aumId]]></NAME>
+<!--D3E6BAD6A1A746ED9324B9F04501439B-->  <PRINTNAME><![CDATA[aumId]]></PRINTNAME>
+<!--D3E6BAD6A1A746ED9324B9F04501439B-->  <DESCRIPTION><![CDATA[Operative AUM]]></DESCRIPTION>
+<!--D3E6BAD6A1A746ED9324B9F04501439B-->  <HELP><![CDATA[Operative AUM]]></HELP>
+<!--D3E6BAD6A1A746ED9324B9F04501439B-->  <PO_DESCRIPTION><![CDATA[Operative AUM]]></PO_DESCRIPTION>
+<!--D3E6BAD6A1A746ED9324B9F04501439B-->  <PO_HELP><![CDATA[Operative AUM]]></PO_HELP>
+<!--D3E6BAD6A1A746ED9324B9F04501439B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D3E6BAD6A1A746ED9324B9F04501439B-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--D3E6BAD6A1A746ED9324B9F04501439B--></AD_ELEMENT>
+
 <!--D3F8A2A80BDA45B68317DAE306AA077E--><AD_ELEMENT>
 <!--D3F8A2A80BDA45B68317DAE306AA077E-->  <AD_ELEMENT_ID><![CDATA[D3F8A2A80BDA45B68317DAE306AA077E]]></AD_ELEMENT_ID>
 <!--D3F8A2A80BDA45B68317DAE306AA077E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -33538,6 +33740,22 @@
 <!--DBB02A64470D4093A2534F0DFC8BF855-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--DBB02A64470D4093A2534F0DFC8BF855--></AD_ELEMENT>
 
+<!--DBBB89F35BE04D1B8037565CF7052C0C--><AD_ELEMENT>
+<!--DBBB89F35BE04D1B8037565CF7052C0C-->  <AD_ELEMENT_ID><![CDATA[DBBB89F35BE04D1B8037565CF7052C0C]]></AD_ELEMENT_ID>
+<!--DBBB89F35BE04D1B8037565CF7052C0C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DBBB89F35BE04D1B8037565CF7052C0C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DBBB89F35BE04D1B8037565CF7052C0C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DBBB89F35BE04D1B8037565CF7052C0C-->  <COLUMNNAME><![CDATA[Sales]]></COLUMNNAME>
+<!--DBBB89F35BE04D1B8037565CF7052C0C-->  <NAME><![CDATA[Sales]]></NAME>
+<!--DBBB89F35BE04D1B8037565CF7052C0C-->  <PRINTNAME><![CDATA[Sales]]></PRINTNAME>
+<!--DBBB89F35BE04D1B8037565CF7052C0C-->  <DESCRIPTION><![CDATA[It represents the priority of this AUM to the Sales flows]]></DESCRIPTION>
+<!--DBBB89F35BE04D1B8037565CF7052C0C-->  <HELP><![CDATA[It represents the priority of this AUM to the Sales flows]]></HELP>
+<!--DBBB89F35BE04D1B8037565CF7052C0C-->  <PO_DESCRIPTION><![CDATA[It represents the priority of this AUM to the Sales flows]]></PO_DESCRIPTION>
+<!--DBBB89F35BE04D1B8037565CF7052C0C-->  <PO_HELP><![CDATA[It represents the priority of this AUM to the Sales flows]]></PO_HELP>
+<!--DBBB89F35BE04D1B8037565CF7052C0C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--DBBB89F35BE04D1B8037565CF7052C0C-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--DBBB89F35BE04D1B8037565CF7052C0C--></AD_ELEMENT>
+
 <!--DC651F42045E4272B7AEB1CCFB1EC6F6--><AD_ELEMENT>
 <!--DC651F42045E4272B7AEB1CCFB1EC6F6-->  <AD_ELEMENT_ID><![CDATA[DC651F42045E4272B7AEB1CCFB1EC6F6]]></AD_ELEMENT_ID>
 <!--DC651F42045E4272B7AEB1CCFB1EC6F6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -34587,6 +34805,18 @@
 <!--F8E28470867840E3BA7CDDEDCF4EEAB9-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--F8E28470867840E3BA7CDDEDCF4EEAB9--></AD_ELEMENT>
 
+<!--F8EEA669E75E4112BB0D32E1598A4F14--><AD_ELEMENT>
+<!--F8EEA669E75E4112BB0D32E1598A4F14-->  <AD_ELEMENT_ID><![CDATA[F8EEA669E75E4112BB0D32E1598A4F14]]></AD_ELEMENT_ID>
+<!--F8EEA669E75E4112BB0D32E1598A4F14-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F8EEA669E75E4112BB0D32E1598A4F14-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F8EEA669E75E4112BB0D32E1598A4F14-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F8EEA669E75E4112BB0D32E1598A4F14-->  <COLUMNNAME><![CDATA[M_Product_Aum_ID]]></COLUMNNAME>
+<!--F8EEA669E75E4112BB0D32E1598A4F14-->  <NAME><![CDATA[M_Product_Aum_ID]]></NAME>
+<!--F8EEA669E75E4112BB0D32E1598A4F14-->  <PRINTNAME><![CDATA[M_Product_Aum_ID]]></PRINTNAME>
+<!--F8EEA669E75E4112BB0D32E1598A4F14-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F8EEA669E75E4112BB0D32E1598A4F14-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--F8EEA669E75E4112BB0D32E1598A4F14--></AD_ELEMENT>
+
 <!--F9666DCCC70646EC811384E23D8FE498--><AD_ELEMENT>
 <!--F9666DCCC70646EC811384E23D8FE498-->  <AD_ELEMENT_ID><![CDATA[F9666DCCC70646EC811384E23D8FE498]]></AD_ELEMENT_ID>
 <!--F9666DCCC70646EC811384E23D8FE498-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Fri Dec 02 10:33:48 2016 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Fri Dec 02 12:32:08 2016 +0100
@@ -15293,14 +15293,14 @@
 <!--1128-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--1128-->  <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
 <!--1128-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--1128-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--1128-->  <SEQNO><![CDATA[40]]></SEQNO>
 <!--1128-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--1128-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1128-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--1128-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--1128-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--1128-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1128-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
+<!--1128-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
 <!--1128-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--1128-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--1128-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -43239,14 +43239,14 @@
 <!--3387-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--3387-->  <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
 <!--3387-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--3387-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--3387-->  <SEQNO><![CDATA[32]]></SEQNO>
 <!--3387-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--3387-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--3387-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--3387-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--3387-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--3387-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--3387-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
+<!--3387-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
 <!--3387-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--3387-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--3387-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -78290,7 +78290,7 @@
 <!--6535-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--6535-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--6535-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--6535-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
+<!--6535-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
 <!--6535-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--6535-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--6535-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -79085,14 +79085,14 @@
 <!--6570-->  <DISPLAYLOGIC><![CDATA[(@ATTRIBUTESET@!''&@ATTRSETVALUETYPE@!'F')|(@M_AttributeSetInstance_ID@!''&@M_AttributeSetInstance_ID@!'0')]]></DISPLAYLOGIC>
 <!--6570-->  <DISPLAYLENGTH><![CDATA[14]]></DISPLAYLENGTH>
 <!--6570-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--6570-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--6570-->  <SEQNO><![CDATA[50]]></SEQNO>
 <!--6570-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--6570-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--6570-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--6570-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--6570-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--6570-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--6570-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
+<!--6570-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
 <!--6570-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--6570-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--6570-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -95411,7 +95411,7 @@
 <!--800001-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--800001-->  <AD_FIELDGROUP_ID><![CDATA[402880E72F1C15A5012F1C7AA98B00E8]]></AD_FIELDGROUP_ID>
 <!--800001-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--800001-->  <DISPLAYLOGIC><![CDATA[@HASSECONDUOM@=1]]></DISPLAYLOGIC>
+<!--800001-->  <DISPLAYLOGIC><![CDATA[(@HASSECONDUOM@=1 & @UomManagement@!'Y')  | (@UomManagement@='Y' & @M_Product_Uom_Id@!'')]]></DISPLAYLOGIC>
 <!--800001-->  <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
 <!--800001-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--800001-->  <SEQNO><![CDATA[170]]></SEQNO>
@@ -95443,7 +95443,7 @@
 <!--800002-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--800002-->  <AD_FIELDGROUP_ID><![CDATA[402880E72F1C15A5012F1C7AA98B00E8]]></AD_FIELDGROUP_ID>
 <!--800002-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--800002-->  <DISPLAYLOGIC><![CDATA[@HASSECONDUOM@=1]]></DISPLAYLOGIC>
+<!--800002-->  <DISPLAYLOGIC><![CDATA[(@HASSECONDUOM@=1 & @UomManagement@!'Y')  | (@UomManagement@='Y' & @M_Product_Uom_Id@!'')]]></DISPLAYLOGIC>
 <!--800002-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--800002-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--800002-->  <SEQNO><![CDATA[180]]></SEQNO>
@@ -95473,7 +95473,7 @@
 <!--800003-->  <AD_COLUMN_ID><![CDATA[800003]]></AD_COLUMN_ID>
 <!--800003-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--800003-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--800003-->  <DISPLAYLOGIC><![CDATA[@HASSECONDUOM@=1]]></DISPLAYLOGIC>
+<!--800003-->  <DISPLAYLOGIC><![CDATA[(@HASSECONDUOM@=1 & @UomManagement@!'Y')  | (@UomManagement@='Y' & @M_Product_Uom_Id@!'')]]></DISPLAYLOGIC>
 <!--800003-->  <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
 <!--800003-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--800003-->  <SEQNO><![CDATA[250]]></SEQNO>
@@ -95503,7 +95503,7 @@
 <!--800004-->  <AD_COLUMN_ID><![CDATA[800004]]></AD_COLUMN_ID>
 <!--800004-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--800004-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--800004-->  <DISPLAYLOGIC><![CDATA[@HASSECONDUOM@=1]]></DISPLAYLOGIC>
+<!--800004-->  <DISPLAYLOGIC><![CDATA[(@HASSECONDUOM@=1 & @UomManagement@!'Y')  | (@UomManagement@='Y' & @M_Product_Uom_Id@!'')]]></DISPLAYLOGIC>
 <!--800004-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--800004-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--800004-->  <SEQNO><![CDATA[260]]></SEQNO>
@@ -95532,7 +95532,7 @@
 <!--800005-->  <AD_COLUMN_ID><![CDATA[800005]]></AD_COLUMN_ID>
 <!--800005-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--800005-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--800005-->  <DISPLAYLOGIC><![CDATA[@HASSECONDUOM@=1]]></DISPLAYLOGIC>
+<!--800005-->  <DISPLAYLOGIC><![CDATA[(@HASSECONDUOM@=1 & @UomManagement@!'Y')  | (@UomManagement@='Y' & @M_Product_Uom_Id@!'')]]></DISPLAYLOGIC>
 <!--800005-->  <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
 <!--800005-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--800005-->  <SEQNO><![CDATA[90]]></SEQNO>
@@ -95562,7 +95562,7 @@
 <!--800006-->  <AD_COLUMN_ID><![CDATA[800006]]></AD_COLUMN_ID>
 <!--800006-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--800006-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--800006-->  <DISPLAYLOGIC><![CDATA[@HASSECONDUOM@=1]]></DISPLAYLOGIC>
+<!--800006-->  <DISPLAYLOGIC><![CDATA[(@HASSECONDUOM@=1 & @UomManagement@!'Y')  | (@UomManagement@='Y' & @M_Product_Uom_Id@!'')]]></DISPLAYLOGIC>
 <!--800006-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--800006-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--800006-->  <SEQNO><![CDATA[100]]></SEQNO>
@@ -96044,7 +96044,7 @@
 <!--800023-->  <AD_COLUMN_ID><![CDATA[800004]]></AD_COLUMN_ID>
 <!--800023-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--800023-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--800023-->  <DISPLAYLOGIC><![CDATA[@HASSECONDUOM@=1]]></DISPLAYLOGIC>
+<!--800023-->  <DISPLAYLOGIC><![CDATA[(@HASSECONDUOM@=1 & @UomManagement@!'Y')  | (@UomManagement@='Y' & @M_Product_Uom_Id@!'')]]></DISPLAYLOGIC>
 <!--800023-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--800023-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--800023-->  <SEQNO><![CDATA[260]]></SEQNO>
@@ -96073,7 +96073,7 @@
 <!--800024-->  <AD_COLUMN_ID><![CDATA[800003]]></AD_COLUMN_ID>
 <!--800024-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--800024-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--800024-->  <DISPLAYLOGIC><![CDATA[@HASSECONDUOM@=1]]></DISPLAYLOGIC>
+<!--800024-->  <DISPLAYLOGIC><![CDATA[(@HASSECONDUOM@=1 & @UomManagement@!'Y')  | (@UomManagement@='Y' & @M_Product_Uom_Id@!'')]]></DISPLAYLOGIC>
 <!--800024-->  <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
 <!--800024-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--800024-->  <SEQNO><![CDATA[270]]></SEQNO>
@@ -96102,7 +96102,7 @@
 <!--800025-->  <AD_COLUMN_ID><![CDATA[800005]]></AD_COLUMN_ID>
 <!--800025-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--800025-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--800025-->  <DISPLAYLOGIC><![CDATA[@HASSECONDUOM@=1]]></DISPLAYLOGIC>
+<!--800025-->  <DISPLAYLOGIC><![CDATA[(@HASSECONDUOM@=1 & @UomManagement@!'Y')  | (@UomManagement@='Y' & @M_Product_Uom_Id@!'')]]></DISPLAYLOGIC>
 <!--800025-->  <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
 <!--800025-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--800025-->  <SEQNO><![CDATA[90]]></SEQNO>
@@ -96132,7 +96132,7 @@
 <!--800026-->  <AD_COLUMN_ID><![CDATA[800006]]></AD_COLUMN_ID>
 <!--800026-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--800026-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--800026-->  <DISPLAYLOGIC><![CDATA[@HASSECONDUOM@=1]]></DISPLAYLOGIC>
+<!--800026-->  <DISPLAYLOGIC><![CDATA[(@HASSECONDUOM@=1 & @UomManagement@!'Y')  | (@UomManagement@='Y' & @M_Product_Uom_Id@!'')]]></DISPLAYLOGIC>
 <!--800026-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--800026-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--800026-->  <SEQNO><![CDATA[100]]></SEQNO>
@@ -96162,7 +96162,7 @@
 <!--800027-->  <AD_COLUMN_ID><![CDATA[800001]]></AD_COLUMN_ID>
 <!--800027-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--800027-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--800027-->  <DISPLAYLOGIC><![CDATA[@HASSECONDUOM@=1]]></DISPLAYLOGIC>
+<!--800027-->  <DISPLAYLOGIC><![CDATA[(@HASSECONDUOM@=1 & @UomManagement@!'Y')  | (@UomManagement@='Y' & @M_Product_Uom_Id@!'')]]></DISPLAYLOGIC>
 <!--800027-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--800027-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--800027-->  <SEQNO><![CDATA[190]]></SEQNO>
@@ -96191,7 +96191,7 @@
 <!--800028-->  <AD_COLUMN_ID><![CDATA[800002]]></AD_COLUMN_ID>
 <!--800028-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--800028-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--800028-->  <DISPLAYLOGIC><![CDATA[@HASSECONDUOM@=1]]></DISPLAYLOGIC>
+<!--800028-->  <DISPLAYLOGIC><![CDATA[(@HASSECONDUOM@=1 & @UomManagement@!'Y')  | (@UomManagement@='Y' & @M_Product_Uom_Id@!'')]]></DISPLAYLOGIC>
 <!--800028-->  <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
 <!--800028-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--800028-->  <SEQNO><![CDATA[200]]></SEQNO>
@@ -168676,7 +168676,7 @@
 <!--1004400003-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--1004400003-->  <AD_FIELDGROUP_ID><![CDATA[402880E72F1C15A5012F1C7AA98B00E8]]></AD_FIELDGROUP_ID>
 <!--1004400003-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--1004400003-->  <DISPLAYLOGIC><![CDATA[@HASSECONDUOM@=1]]></DISPLAYLOGIC>
+<!--1004400003-->  <DISPLAYLOGIC><![CDATA[(@HASSECONDUOM@=1 & @UomManagement@!'Y')  | (@UomManagement@='Y' & @M_Product_Uom_Id@!'')]]></DISPLAYLOGIC>
 <!--1004400003-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--1004400003-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--1004400003-->  <SEQNO><![CDATA[200]]></SEQNO>
@@ -168707,7 +168707,7 @@
 <!--1004400004-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--1004400004-->  <AD_FIELDGROUP_ID><![CDATA[402880E72F1C15A5012F1C7AA98B00E8]]></AD_FIELDGROUP_ID>
 <!--1004400004-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--1004400004-->  <DISPLAYLOGIC><![CDATA[@HASSECONDUOM@=1]]></DISPLAYLOGIC>
+<!--1004400004-->  <DISPLAYLOGIC><![CDATA[(@HASSECONDUOM@=1 & @UomManagement@!'Y')  | (@UomManagement@='Y' & @M_Product_Uom_Id@!'')]]></DISPLAYLOGIC>
 <!--1004400004-->  <DISPLAYLENGTH><![CDATA[4]]></DISPLAYLENGTH>
 <!--1004400004-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--1004400004-->  <SEQNO><![CDATA[190]]></SEQNO>
@@ -170146,7 +170146,7 @@
 <!--1004400064-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--1004400064-->  <AD_FIELDGROUP_ID><![CDATA[402880E72F1C15A5012F1C7AA98B00E8]]></AD_FIELDGROUP_ID>
 <!--1004400064-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--1004400064-->  <DISPLAYLOGIC><![CDATA[@HASSECONDUOM@=1]]></DISPLAYLOGIC>
+<!--1004400064-->  <DISPLAYLOGIC><![CDATA[(@HASSECONDUOM@=1 & @UomManagement@!'Y')  | (@UomManagement@='Y' & @M_Product_Uom_Id@!'')]]></DISPLAYLOGIC>
 <!--1004400064-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--1004400064-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--1004400064-->  <SEQNO><![CDATA[200]]></SEQNO>
@@ -170178,7 +170178,7 @@
 <!--1004400065-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--1004400065-->  <AD_FIELDGROUP_ID><![CDATA[402880E72F1C15A5012F1C7AA98B00E8]]></AD_FIELDGROUP_ID>
 <!--1004400065-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--1004400065-->  <DISPLAYLOGIC><![CDATA[@HASSECONDUOM@=1]]></DISPLAYLOGIC>
+<!--1004400065-->  <DISPLAYLOGIC><![CDATA[(@HASSECONDUOM@=1 & @UomManagement@!'Y')  | (@UomManagement@='Y' & @M_Product_Uom_Id@!'')]]></DISPLAYLOGIC>
 <!--1004400065-->  <DISPLAYLENGTH><![CDATA[4]]></DISPLAYLENGTH>
 <!--1004400065-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--1004400065-->  <SEQNO><![CDATA[190]]></SEQNO>
@@ -178934,7 +178934,7 @@
 <!--02F393A7547048E09FF54061D551EBB6-->  <DISPLAYLOGIC><![CDATA[@Financial_Invoice_Line@='Y']]></DISPLAYLOGIC>
 <!--02F393A7547048E09FF54061D551EBB6-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
 <!--02F393A7547048E09FF54061D551EBB6-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--02F393A7547048E09FF54061D551EBB6-->  <SEQNO><![CDATA[25]]></SEQNO>
+<!--02F393A7547048E09FF54061D551EBB6-->  <SEQNO><![CDATA[22]]></SEQNO>
 <!--02F393A7547048E09FF54061D551EBB6-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--02F393A7547048E09FF54061D551EBB6-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--02F393A7547048E09FF54061D551EBB6-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -179623,6 +179623,37 @@
 <!--04FCF507D3044039912297B7ACA5CBD1-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--04FCF507D3044039912297B7ACA5CBD1--></AD_FIELD>
 
+<!--04FD347943F0401185E727014EBC3217--><AD_FIELD>
+<!--04FD347943F0401185E727014EBC3217-->  <AD_FIELD_ID><![CDATA[04FD347943F0401185E727014EBC3217]]></AD_FIELD_ID>
+<!--04FD347943F0401185E727014EBC3217-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--04FD347943F0401185E727014EBC3217-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--04FD347943F0401185E727014EBC3217-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--04FD347943F0401185E727014EBC3217-->  <NAME><![CDATA[Alternative UOM]]></NAME>
+<!--04FD347943F0401185E727014EBC3217-->  <DESCRIPTION><![CDATA[A non monetary unit of measure.]]></DESCRIPTION>
+<!--04FD347943F0401185E727014EBC3217-->  <HELP><![CDATA[The Alternative UOM defines a unique non monetary unit of measure]]></HELP>
+<!--04FD347943F0401185E727014EBC3217-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--04FD347943F0401185E727014EBC3217-->  <AD_TAB_ID><![CDATA[1004400002]]></AD_TAB_ID>
+<!--04FD347943F0401185E727014EBC3217-->  <AD_COLUMN_ID><![CDATA[FCC18B6E98564CFB97CAF1EF5E983035]]></AD_COLUMN_ID>
+<!--04FD347943F0401185E727014EBC3217-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--04FD347943F0401185E727014EBC3217-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--04FD347943F0401185E727014EBC3217-->  <DISPLAYLOGIC><![CDATA[@M_Product_Uom_Id@='']]></DISPLAYLOGIC>
+<!--04FD347943F0401185E727014EBC3217-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--04FD347943F0401185E727014EBC3217-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--04FD347943F0401185E727014EBC3217-->  <SEQNO><![CDATA[47]]></SEQNO>
+<!--04FD347943F0401185E727014EBC3217-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--04FD347943F0401185E727014EBC3217-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--04FD347943F0401185E727014EBC3217-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--04FD347943F0401185E727014EBC3217-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--04FD347943F0401185E727014EBC3217-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--04FD347943F0401185E727014EBC3217-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--04FD347943F0401185E727014EBC3217-->  <GRID_SEQNO><![CDATA[47]]></GRID_SEQNO>
+<!--04FD347943F0401185E727014EBC3217-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--04FD347943F0401185E727014EBC3217-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--04FD347943F0401185E727014EBC3217-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--04FD347943F0401185E727014EBC3217-->  <DISPLAYLOGIC_SERVER><![CDATA[@UomManagement@='Y']]></DISPLAYLOGIC_SERVER>
+<!--04FD347943F0401185E727014EBC3217-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--04FD347943F0401185E727014EBC3217--></AD_FIELD>
+
 <!--050DE4E9B1D44EE0BC88B5F457D06AEA--><AD_FIELD>
 <!--050DE4E9B1D44EE0BC88B5F457D06AEA-->  <AD_FIELD_ID><![CDATA[050DE4E9B1D44EE0BC88B5F457D06AEA]]></AD_FIELD_ID>
 <!--050DE4E9B1D44EE0BC88B5F457D06AEA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -181072,6 +181103,37 @@
 <!--08F0383D9A7A453D90FEB519E7BEF561-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--08F0383D9A7A453D90FEB519E7BEF561--></AD_FIELD>
 
+<!--08F288998CF142A780419AD1214ED254--><AD_FIELD>
+<!--08F288998CF142A780419AD1214ED254-->  <AD_FIELD_ID><![CDATA[08F288998CF142A780419AD1214ED254]]></AD_FIELD_ID>
+<!--08F288998CF142A780419AD1214ED254-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--08F288998CF142A780419AD1214ED254-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--08F288998CF142A780419AD1214ED254-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--08F288998CF142A780419AD1214ED254-->  <NAME><![CDATA[Alternative UOM]]></NAME>
+<!--08F288998CF142A780419AD1214ED254-->  <DESCRIPTION><![CDATA[A non monetary unit of measure.]]></DESCRIPTION>
+<!--08F288998CF142A780419AD1214ED254-->  <HELP><![CDATA[The Alternative UOM defines a unique non monetary unit of measure]]></HELP>
+<!--08F288998CF142A780419AD1214ED254-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--08F288998CF142A780419AD1214ED254-->  <AD_TAB_ID><![CDATA[270]]></AD_TAB_ID>
+<!--08F288998CF142A780419AD1214ED254-->  <AD_COLUMN_ID><![CDATA[5DB325BF62E748F5B4DF85FD0381BD8F]]></AD_COLUMN_ID>
+<!--08F288998CF142A780419AD1214ED254-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--08F288998CF142A780419AD1214ED254-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--08F288998CF142A780419AD1214ED254-->  <DISPLAYLOGIC><![CDATA[@M_Product_Uom_Id@='' & @Financial_Invoice_Line@='N']]></DISPLAYLOGIC>
+<!--08F288998CF142A780419AD1214ED254-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--08F288998CF142A780419AD1214ED254-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--08F288998CF142A780419AD1214ED254-->  <SEQNO><![CDATA[25]]></SEQNO>
+<!--08F288998CF142A780419AD1214ED254-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--08F288998CF142A780419AD1214ED254-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--08F288998CF142A780419AD1214ED254-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--08F288998CF142A780419AD1214ED254-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--08F288998CF142A780419AD1214ED254-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--08F288998CF142A780419AD1214ED254-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--08F288998CF142A780419AD1214ED254-->  <GRID_SEQNO><![CDATA[25]]></GRID_SEQNO>
+<!--08F288998CF142A780419AD1214ED254-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--08F288998CF142A780419AD1214ED254-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--08F288998CF142A780419AD1214ED254-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--08F288998CF142A780419AD1214ED254-->  <DISPLAYLOGIC_SERVER><![CDATA[@UomManagement@='Y']]></DISPLAYLOGIC_SERVER>
+<!--08F288998CF142A780419AD1214ED254-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--08F288998CF142A780419AD1214ED254--></AD_FIELD>
+
 <!--08F31CBE658B4840B31380EADE3F5E28--><AD_FIELD>
 <!--08F31CBE658B4840B31380EADE3F5E28-->  <AD_FIELD_ID><![CDATA[08F31CBE658B4840B31380EADE3F5E28]]></AD_FIELD_ID>
 <!--08F31CBE658B4840B31380EADE3F5E28-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -182393,6 +182455,34 @@
 <!--0C813EAFB07042D29B35EC195B70FC22-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--0C813EAFB07042D29B35EC195B70FC22--></AD_FIELD>
 
+<!--0CAEAFED54E34563A60915C74CA39FCB--><AD_FIELD>
+<!--0CAEAFED54E34563A60915C74CA39FCB-->  <AD_FIELD_ID><![CDATA[0CAEAFED54E34563A60915C74CA39FCB]]></AD_FIELD_ID>
+<!--0CAEAFED54E34563A60915C74CA39FCB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0CAEAFED54E34563A60915C74CA39FCB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0CAEAFED54E34563A60915C74CA39FCB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0CAEAFED54E34563A60915C74CA39FCB-->  <NAME><![CDATA[Logistics]]></NAME>
+<!--0CAEAFED54E34563A60915C74CA39FCB-->  <DESCRIPTION><![CDATA[It represents the priority of this AUM to the Logistics flows]]></DESCRIPTION>
+<!--0CAEAFED54E34563A60915C74CA39FCB-->  <HELP><![CDATA[It represents the priority of this AUM to the Logistics flows]]></HELP>
+<!--0CAEAFED54E34563A60915C74CA39FCB-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--0CAEAFED54E34563A60915C74CA39FCB-->  <AD_TAB_ID><![CDATA[A92960D20BB64BBB9C4E88FF58991D6F]]></AD_TAB_ID>
+<!--0CAEAFED54E34563A60915C74CA39FCB-->  <AD_COLUMN_ID><![CDATA[7E8A04B5A3BE43BAA1B7B1D51A937C90]]></AD_COLUMN_ID>
+<!--0CAEAFED54E34563A60915C74CA39FCB-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--0CAEAFED54E34563A60915C74CA39FCB-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--0CAEAFED54E34563A60915C74CA39FCB-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
+<!--0CAEAFED54E34563A60915C74CA39FCB-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--0CAEAFED54E34563A60915C74CA39FCB-->  <SEQNO><![CDATA[90]]></SEQNO>
+<!--0CAEAFED54E34563A60915C74CA39FCB-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--0CAEAFED54E34563A60915C74CA39FCB-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--0CAEAFED54E34563A60915C74CA39FCB-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--0CAEAFED54E34563A60915C74CA39FCB-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--0CAEAFED54E34563A60915C74CA39FCB-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--0CAEAFED54E34563A60915C74CA39FCB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--0CAEAFED54E34563A60915C74CA39FCB-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--0CAEAFED54E34563A60915C74CA39FCB-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--0CAEAFED54E34563A60915C74CA39FCB-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--0CAEAFED54E34563A60915C74CA39FCB-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--0CAEAFED54E34563A60915C74CA39FCB--></AD_FIELD>
+
 <!--0CBE816A45594928AB5484A9B82FBC9D--><AD_FIELD>
 <!--0CBE816A45594928AB5484A9B82FBC9D-->  <AD_FIELD_ID><![CDATA[0CBE816A45594928AB5484A9B82FBC9D]]></AD_FIELD_ID>
 <!--0CBE816A45594928AB5484A9B82FBC9D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -182931,6 +183021,36 @@
 <!--0E4F4F34EC73471D9C2899FC285D9BDA-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--0E4F4F34EC73471D9C2899FC285D9BDA--></AD_FIELD>
 
+<!--0E61C5A20008424FBDEAE2E5A00B66EB--><AD_FIELD>
+<!--0E61C5A20008424FBDEAE2E5A00B66EB-->  <AD_FIELD_ID><![CDATA[0E61C5A20008424FBDEAE2E5A00B66EB]]></AD_FIELD_ID>
+<!--0E61C5A20008424FBDEAE2E5A00B66EB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0E61C5A20008424FBDEAE2E5A00B66EB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0E61C5A20008424FBDEAE2E5A00B66EB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0E61C5A20008424FBDEAE2E5A00B66EB-->  <NAME><![CDATA[Operative Quantity]]></NAME>
+<!--0E61C5A20008424FBDEAE2E5A00B66EB-->  <DESCRIPTION><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></DESCRIPTION>
+<!--0E61C5A20008424FBDEAE2E5A00B66EB-->  <HELP><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></HELP>
+<!--0E61C5A20008424FBDEAE2E5A00B66EB-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--0E61C5A20008424FBDEAE2E5A00B66EB-->  <AD_TAB_ID><![CDATA[FEFB495F59894AD6A1163D13ABE88833]]></AD_TAB_ID>
+<!--0E61C5A20008424FBDEAE2E5A00B66EB-->  <AD_COLUMN_ID><![CDATA[26B12F673B704AA5AA021037BA3E8A85]]></AD_COLUMN_ID>
+<!--0E61C5A20008424FBDEAE2E5A00B66EB-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--0E61C5A20008424FBDEAE2E5A00B66EB-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--0E61C5A20008424FBDEAE2E5A00B66EB-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
+<!--0E61C5A20008424FBDEAE2E5A00B66EB-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--0E61C5A20008424FBDEAE2E5A00B66EB-->  <SEQNO><![CDATA[120]]></SEQNO>
+<!--0E61C5A20008424FBDEAE2E5A00B66EB-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--0E61C5A20008424FBDEAE2E5A00B66EB-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--0E61C5A20008424FBDEAE2E5A00B66EB-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--0E61C5A20008424FBDEAE2E5A00B66EB-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--0E61C5A20008424FBDEAE2E5A00B66EB-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--0E61C5A20008424FBDEAE2E5A00B66EB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--0E61C5A20008424FBDEAE2E5A00B66EB-->  <GRID_SEQNO><![CDATA[42]]></GRID_SEQNO>
+<!--0E61C5A20008424FBDEAE2E5A00B66EB-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--0E61C5A20008424FBDEAE2E5A00B66EB-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--0E61C5A20008424FBDEAE2E5A00B66EB-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--0E61C5A20008424FBDEAE2E5A00B66EB-->  <DISPLAYLOGICGRID><![CDATA[OB.PropertyStore.get('UomManagement')='Y']]></DISPLAYLOGICGRID>
+<!--0E61C5A20008424FBDEAE2E5A00B66EB-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--0E61C5A20008424FBDEAE2E5A00B66EB--></AD_FIELD>
+
 <!--0E7DC6AB645849EEA0A8FC0511B61B64--><AD_FIELD>
 <!--0E7DC6AB645849EEA0A8FC0511B61B64-->  <AD_FIELD_ID><![CDATA[0E7DC6AB645849EEA0A8FC0511B61B64]]></AD_FIELD_ID>
 <!--0E7DC6AB645849EEA0A8FC0511B61B64-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -185559,6 +185679,36 @@
 <!--145A257B6D7A4AB48BD0E72BFCDF9045-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--145A257B6D7A4AB48BD0E72BFCDF9045--></AD_FIELD>
 
+<!--146F851524544236AB4497AA797F1ADF--><AD_FIELD>
+<!--146F851524544236AB4497AA797F1ADF-->  <AD_FIELD_ID><![CDATA[146F851524544236AB4497AA797F1ADF]]></AD_FIELD_ID>
+<!--146F851524544236AB4497AA797F1ADF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--146F851524544236AB4497AA797F1ADF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--146F851524544236AB4497AA797F1ADF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--146F851524544236AB4497AA797F1ADF-->  <NAME><![CDATA[Alternative UOM]]></NAME>
+<!--146F851524544236AB4497AA797F1ADF-->  <DESCRIPTION><![CDATA[A non monetary unit of measure.]]></DESCRIPTION>
+<!--146F851524544236AB4497AA797F1ADF-->  <HELP><![CDATA[The Alternative UOM defines a unique non monetary unit of measure]]></HELP>
+<!--146F851524544236AB4497AA797F1ADF-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--146F851524544236AB4497AA797F1ADF-->  <AD_TAB_ID><![CDATA[258]]></AD_TAB_ID>
+<!--146F851524544236AB4497AA797F1ADF-->  <AD_COLUMN_ID><![CDATA[75E9ED83A89C4CA28416B0F0220431C4]]></AD_COLUMN_ID>
+<!--146F851524544236AB4497AA797F1ADF-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--146F851524544236AB4497AA797F1ADF-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--146F851524544236AB4497AA797F1ADF-->  <DISPLAYLOGIC><![CDATA[@M_Product_Uom_Id@='']]></DISPLAYLOGIC>
+<!--146F851524544236AB4497AA797F1ADF-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--146F851524544236AB4497AA797F1ADF-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--146F851524544236AB4497AA797F1ADF-->  <SEQNO><![CDATA[37]]></SEQNO>
+<!--146F851524544236AB4497AA797F1ADF-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--146F851524544236AB4497AA797F1ADF-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--146F851524544236AB4497AA797F1ADF-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--146F851524544236AB4497AA797F1ADF-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--146F851524544236AB4497AA797F1ADF-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--146F851524544236AB4497AA797F1ADF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--146F851524544236AB4497AA797F1ADF-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--146F851524544236AB4497AA797F1ADF-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--146F851524544236AB4497AA797F1ADF-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--146F851524544236AB4497AA797F1ADF-->  <DISPLAYLOGIC_SERVER><![CDATA[@UomManagement@='Y']]></DISPLAYLOGIC_SERVER>
+<!--146F851524544236AB4497AA797F1ADF-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--146F851524544236AB4497AA797F1ADF--></AD_FIELD>
+
 <!--1471CA1428F24931A1CE2EE0FB44FEA6--><AD_FIELD>
 <!--1471CA1428F24931A1CE2EE0FB44FEA6-->  <AD_FIELD_ID><![CDATA[1471CA1428F24931A1CE2EE0FB44FEA6]]></AD_FIELD_ID>
 <!--1471CA1428F24931A1CE2EE0FB44FEA6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -188329,6 +188479,36 @@
 <!--19F5F337926A45CC88DE2CF6AC253D49-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--19F5F337926A45CC88DE2CF6AC253D49--></AD_FIELD>
 
+<!--1A0A6306BD584F69A3063C91ED7DE90F--><AD_FIELD>
+<!--1A0A6306BD584F69A3063C91ED7DE90F-->  <AD_FIELD_ID><![CDATA[1A0A6306BD584F69A3063C91ED7DE90F]]></AD_FIELD_ID>
+<!--1A0A6306BD584F69A3063C91ED7DE90F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1A0A6306BD584F69A3063C91ED7DE90F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1A0A6306BD584F69A3063C91ED7DE90F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1A0A6306BD584F69A3063C91ED7DE90F-->  <NAME><![CDATA[Active]]></NAME>
+<!--1A0A6306BD584F69A3063C91ED7DE90F-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
+<!--1A0A6306BD584F69A3063C91ED7DE90F-->  <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>
+<!--1A0A6306BD584F69A3063C91ED7DE90F-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--1A0A6306BD584F69A3063C91ED7DE90F-->  <AD_TAB_ID><![CDATA[A92960D20BB64BBB9C4E88FF58991D6F]]></AD_TAB_ID>
+<!--1A0A6306BD584F69A3063C91ED7DE90F-->  <AD_COLUMN_ID><![CDATA[7F830CC599454A1B8512952B87AA27E9]]></AD_COLUMN_ID>
+<!--1A0A6306BD584F69A3063C91ED7DE90F-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--1A0A6306BD584F69A3063C91ED7DE90F-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--1A0A6306BD584F69A3063C91ED7DE90F-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--1A0A6306BD584F69A3063C91ED7DE90F-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--1A0A6306BD584F69A3063C91ED7DE90F-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--1A0A6306BD584F69A3063C91ED7DE90F-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--1A0A6306BD584F69A3063C91ED7DE90F-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--1A0A6306BD584F69A3063C91ED7DE90F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--1A0A6306BD584F69A3063C91ED7DE90F-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--1A0A6306BD584F69A3063C91ED7DE90F-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--1A0A6306BD584F69A3063C91ED7DE90F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1A0A6306BD584F69A3063C91ED7DE90F-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--1A0A6306BD584F69A3063C91ED7DE90F-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--1A0A6306BD584F69A3063C91ED7DE90F-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--1A0A6306BD584F69A3063C91ED7DE90F-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--1A0A6306BD584F69A3063C91ED7DE90F--></AD_FIELD>
+
 <!--1A19D2C2CA9042E8A34A71847CA9E7CA--><AD_FIELD>
 <!--1A19D2C2CA9042E8A34A71847CA9E7CA-->  <AD_FIELD_ID><![CDATA[1A19D2C2CA9042E8A34A71847CA9E7CA]]></AD_FIELD_ID>
 <!--1A19D2C2CA9042E8A34A71847CA9E7CA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -189593,6 +189773,34 @@
 <!--1C8A629E52404C48B4CC703DB057E8F3-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--1C8A629E52404C48B4CC703DB057E8F3--></AD_FIELD>
 
+<!--1CC27333E1BF42578F79095E24F1A887--><AD_FIELD>
+<!--1CC27333E1BF42578F79095E24F1A887-->  <AD_FIELD_ID><![CDATA[1CC27333E1BF42578F79095E24F1A887]]></AD_FIELD_ID>
+<!--1CC27333E1BF42578F79095E24F1A887-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1CC27333E1BF42578F79095E24F1A887-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1CC27333E1BF42578F79095E24F1A887-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1CC27333E1BF42578F79095E24F1A887-->  <NAME><![CDATA[aumId]]></NAME>
+<!--1CC27333E1BF42578F79095E24F1A887-->  <DESCRIPTION><![CDATA[Operative AUM]]></DESCRIPTION>
+<!--1CC27333E1BF42578F79095E24F1A887-->  <HELP><![CDATA[Operative AUM]]></HELP>
+<!--1CC27333E1BF42578F79095E24F1A887-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--1CC27333E1BF42578F79095E24F1A887-->  <AD_TAB_ID><![CDATA[B01BFDF1E6B24CF4941807CA7F77A073]]></AD_TAB_ID>
+<!--1CC27333E1BF42578F79095E24F1A887-->  <AD_COLUMN_ID><![CDATA[6A69C6E317E14BFCB8D5408D57CEE0B4]]></AD_COLUMN_ID>
+<!--1CC27333E1BF42578F79095E24F1A887-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--1CC27333E1BF42578F79095E24F1A887-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--1CC27333E1BF42578F79095E24F1A887-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--1CC27333E1BF42578F79095E24F1A887-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--1CC27333E1BF42578F79095E24F1A887-->  <SEQNO><![CDATA[220]]></SEQNO>
+<!--1CC27333E1BF42578F79095E24F1A887-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--1CC27333E1BF42578F79095E24F1A887-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--1CC27333E1BF42578F79095E24F1A887-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--1CC27333E1BF42578F79095E24F1A887-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--1CC27333E1BF42578F79095E24F1A887-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--1CC27333E1BF42578F79095E24F1A887-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1CC27333E1BF42578F79095E24F1A887-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--1CC27333E1BF42578F79095E24F1A887-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--1CC27333E1BF42578F79095E24F1A887-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--1CC27333E1BF42578F79095E24F1A887-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--1CC27333E1BF42578F79095E24F1A887--></AD_FIELD>
+
 <!--1CE1AEF8897247FDB64A1CE09586B8EC--><AD_FIELD>
 <!--1CE1AEF8897247FDB64A1CE09586B8EC-->  <AD_FIELD_ID><![CDATA[1CE1AEF8897247FDB64A1CE09586B8EC]]></AD_FIELD_ID>
 <!--1CE1AEF8897247FDB64A1CE09586B8EC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -190726,14 +190934,14 @@
 <!--1FDD33B67C99472199B85894DA21E199-->  <AD_COLUMN_ID><![CDATA[1410]]></AD_COLUMN_ID>
 <!--1FDD33B67C99472199B85894DA21E199-->  <PROPERTY><![CDATA[product.name]]></PROPERTY>
 <!--1FDD33B67C99472199B85894DA21E199-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
-<!--1FDD33B67C99472199B85894DA21E199-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--1FDD33B67C99472199B85894DA21E199-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
 <!--1FDD33B67C99472199B85894DA21E199-->  <DISPLAYLENGTH><![CDATA[90]]></DISPLAYLENGTH>
 <!--1FDD33B67C99472199B85894DA21E199-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
 <!--1FDD33B67C99472199B85894DA21E199-->  <SEQNO><![CDATA[30]]></SEQNO>
 <!--1FDD33B67C99472199B85894DA21E199-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1FDD33B67C99472199B85894DA21E199-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1FDD33B67C99472199B85894DA21E199-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1FDD33B67C99472199B85894DA21E199-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1FDD33B67C99472199B85894DA21E199-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1FDD33B67C99472199B85894DA21E199-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--1FDD33B67C99472199B85894DA21E199-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1FDD33B67C99472199B85894DA21E199-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -191081,6 +191289,37 @@
 <!--207E2426BEBA4F2CAAC4310C5032E89B-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--207E2426BEBA4F2CAAC4310C5032E89B--></AD_FIELD>
 
+<!--2086CE27F3B548798997836139C09EE5--><AD_FIELD>
+<!--2086CE27F3B548798997836139C09EE5-->  <AD_FIELD_ID><![CDATA[2086CE27F3B548798997836139C09EE5]]></AD_FIELD_ID>
+<!--2086CE27F3B548798997836139C09EE5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2086CE27F3B548798997836139C09EE5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2086CE27F3B548798997836139C09EE5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2086CE27F3B548798997836139C09EE5-->  <NAME><![CDATA[Operative Quantity]]></NAME>
+<!--2086CE27F3B548798997836139C09EE5-->  <DESCRIPTION><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></DESCRIPTION>
+<!--2086CE27F3B548798997836139C09EE5-->  <HELP><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></HELP>
+<!--2086CE27F3B548798997836139C09EE5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--2086CE27F3B548798997836139C09EE5-->  <AD_TAB_ID><![CDATA[800251]]></AD_TAB_ID>
+<!--2086CE27F3B548798997836139C09EE5-->  <AD_COLUMN_ID><![CDATA[F883C44B478641D5961963B69469CCEB]]></AD_COLUMN_ID>
+<!--2086CE27F3B548798997836139C09EE5-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--2086CE27F3B548798997836139C09EE5-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--2086CE27F3B548798997836139C09EE5-->  <DISPLAYLOGIC><![CDATA[@M_Product_Uom_Id@='']]></DISPLAYLOGIC>
+<!--2086CE27F3B548798997836139C09EE5-->  <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH>
+<!--2086CE27F3B548798997836139C09EE5-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--2086CE27F3B548798997836139C09EE5-->  <SEQNO><![CDATA[42]]></SEQNO>
+<!--2086CE27F3B548798997836139C09EE5-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--2086CE27F3B548798997836139C09EE5-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--2086CE27F3B548798997836139C09EE5-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--2086CE27F3B548798997836139C09EE5-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--2086CE27F3B548798997836139C09EE5-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--2086CE27F3B548798997836139C09EE5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2086CE27F3B548798997836139C09EE5-->  <GRID_SEQNO><![CDATA[78]]></GRID_SEQNO>
+<!--2086CE27F3B548798997836139C09EE5-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--2086CE27F3B548798997836139C09EE5-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--2086CE27F3B548798997836139C09EE5-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--2086CE27F3B548798997836139C09EE5-->  <DISPLAYLOGIC_SERVER><![CDATA[@UomManagement@='Y']]></DISPLAYLOGIC_SERVER>
+<!--2086CE27F3B548798997836139C09EE5-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--2086CE27F3B548798997836139C09EE5--></AD_FIELD>
+
 <!--20CC7CBDF07D481EAC12933526C2FD05--><AD_FIELD>
 <!--20CC7CBDF07D481EAC12933526C2FD05-->  <AD_FIELD_ID><![CDATA[20CC7CBDF07D481EAC12933526C2FD05]]></AD_FIELD_ID>
 <!--20CC7CBDF07D481EAC12933526C2FD05-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -191634,6 +191873,35 @@
 <!--21CAFF3D185E4C44871C70921424DE55-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--21CAFF3D185E4C44871C70921424DE55--></AD_FIELD>
 
+<!--21D45AB2658B4D5392517BECC7617AB0--><AD_FIELD>
+<!--21D45AB2658B4D5392517BECC7617AB0-->  <AD_FIELD_ID><![CDATA[21D45AB2658B4D5392517BECC7617AB0]]></AD_FIELD_ID>
+<!--21D45AB2658B4D5392517BECC7617AB0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--21D45AB2658B4D5392517BECC7617AB0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--21D45AB2658B4D5392517BECC7617AB0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--21D45AB2658B4D5392517BECC7617AB0-->  <NAME><![CDATA[Operative Quantity]]></NAME>
+<!--21D45AB2658B4D5392517BECC7617AB0-->  <DESCRIPTION><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></DESCRIPTION>
+<!--21D45AB2658B4D5392517BECC7617AB0-->  <HELP><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></HELP>
+<!--21D45AB2658B4D5392517BECC7617AB0-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--21D45AB2658B4D5392517BECC7617AB0-->  <AD_TAB_ID><![CDATA[9195CC43B5A4419195030A4DB17D8737]]></AD_TAB_ID>
+<!--21D45AB2658B4D5392517BECC7617AB0-->  <AD_COLUMN_ID><![CDATA[9ACCCB7E8E284CBB8CDF3F8860601107]]></AD_COLUMN_ID>
+<!--21D45AB2658B4D5392517BECC7617AB0-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--21D45AB2658B4D5392517BECC7617AB0-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--21D45AB2658B4D5392517BECC7617AB0-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
+<!--21D45AB2658B4D5392517BECC7617AB0-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--21D45AB2658B4D5392517BECC7617AB0-->  <SEQNO><![CDATA[52]]></SEQNO>
+<!--21D45AB2658B4D5392517BECC7617AB0-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--21D45AB2658B4D5392517BECC7617AB0-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--21D45AB2658B4D5392517BECC7617AB0-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--21D45AB2658B4D5392517BECC7617AB0-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--21D45AB2658B4D5392517BECC7617AB0-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--21D45AB2658B4D5392517BECC7617AB0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--21D45AB2658B4D5392517BECC7617AB0-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--21D45AB2658B4D5392517BECC7617AB0-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--21D45AB2658B4D5392517BECC7617AB0-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--21D45AB2658B4D5392517BECC7617AB0-->  <DISPLAYLOGICGRID><![CDATA[OB.PropertyStore.get('UomManagement')='Y']]></DISPLAYLOGICGRID>
+<!--21D45AB2658B4D5392517BECC7617AB0-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--21D45AB2658B4D5392517BECC7617AB0--></AD_FIELD>
+
 <!--21D7540351B54FCAB5FC1866330454EB--><AD_FIELD>
 <!--21D7540351B54FCAB5FC1866330454EB-->  <AD_FIELD_ID><![CDATA[21D7540351B54FCAB5FC1866330454EB]]></AD_FIELD_ID>
 <!--21D7540351B54FCAB5FC1866330454EB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -192175,6 +192443,36 @@
 <!--233A8E2DFB684D779B72AEBF80D6B96D-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--233A8E2DFB684D779B72AEBF80D6B96D--></AD_FIELD>
 
+<!--233C9D69A18240D8A22D504828644078--><AD_FIELD>
+<!--233C9D69A18240D8A22D504828644078-->  <AD_FIELD_ID><![CDATA[233C9D69A18240D8A22D504828644078]]></AD_FIELD_ID>
+<!--233C9D69A18240D8A22D504828644078-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--233C9D69A18240D8A22D504828644078-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--233C9D69A18240D8A22D504828644078-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--233C9D69A18240D8A22D504828644078-->  <NAME><![CDATA[Operative Quantity]]></NAME>
+<!--233C9D69A18240D8A22D504828644078-->  <DESCRIPTION><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></DESCRIPTION>
+<!--233C9D69A18240D8A22D504828644078-->  <HELP><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></HELP>
+<!--233C9D69A18240D8A22D504828644078-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--233C9D69A18240D8A22D504828644078-->  <AD_TAB_ID><![CDATA[258]]></AD_TAB_ID>
+<!--233C9D69A18240D8A22D504828644078-->  <AD_COLUMN_ID><![CDATA[6E43F881D1C441F8BC834B98C1B4DBEB]]></AD_COLUMN_ID>
+<!--233C9D69A18240D8A22D504828644078-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--233C9D69A18240D8A22D504828644078-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--233C9D69A18240D8A22D504828644078-->  <DISPLAYLOGIC><![CDATA[@M_Product_Uom_Id@='']]></DISPLAYLOGIC>
+<!--233C9D69A18240D8A22D504828644078-->  <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH>
+<!--233C9D69A18240D8A22D504828644078-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--233C9D69A18240D8A22D504828644078-->  <SEQNO><![CDATA[35]]></SEQNO>
+<!--233C9D69A18240D8A22D504828644078-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--233C9D69A18240D8A22D504828644078-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--233C9D69A18240D8A22D504828644078-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--233C9D69A18240D8A22D504828644078-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--233C9D69A18240D8A22D504828644078-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--233C9D69A18240D8A22D504828644078-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--233C9D69A18240D8A22D504828644078-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--233C9D69A18240D8A22D504828644078-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--233C9D69A18240D8A22D504828644078-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--233C9D69A18240D8A22D504828644078-->  <DISPLAYLOGIC_SERVER><![CDATA[@UomManagement@='Y']]></DISPLAYLOGIC_SERVER>
+<!--233C9D69A18240D8A22D504828644078-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--233C9D69A18240D8A22D504828644078--></AD_FIELD>
+
 <!--234F0B887CB041D994C572294BF0E871--><AD_FIELD>
 <!--234F0B887CB041D994C572294BF0E871-->  <AD_FIELD_ID><![CDATA[234F0B887CB041D994C572294BF0E871]]></AD_FIELD_ID>
 <!--234F0B887CB041D994C572294BF0E871-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -192603,7 +192901,7 @@
 <!--24F27A921DB84F49AF40F2799A849CEC-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--24F27A921DB84F49AF40F2799A849CEC-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--24F27A921DB84F49AF40F2799A849CEC-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
-<!--24F27A921DB84F49AF40F2799A849CEC-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--24F27A921DB84F49AF40F2799A849CEC-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--24F27A921DB84F49AF40F2799A849CEC-->  <SEQNO><![CDATA[60]]></SEQNO>
 <!--24F27A921DB84F49AF40F2799A849CEC-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--24F27A921DB84F49AF40F2799A849CEC-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
@@ -192952,6 +193250,35 @@
 <!--25E891FC62E74EA58E85D35FF9814107-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--25E891FC62E74EA58E85D35FF9814107--></AD_FIELD>
 
+<!--25EE3FD53006414DAC86678999E31025--><AD_FIELD>
+<!--25EE3FD53006414DAC86678999E31025-->  <AD_FIELD_ID><![CDATA[25EE3FD53006414DAC86678999E31025]]></AD_FIELD_ID>
+<!--25EE3FD53006414DAC86678999E31025-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--25EE3FD53006414DAC86678999E31025-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--25EE3FD53006414DAC86678999E31025-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--25EE3FD53006414DAC86678999E31025-->  <NAME><![CDATA[Rate]]></NAME>
+<!--25EE3FD53006414DAC86678999E31025-->  <DESCRIPTION><![CDATA[The percentage to be multiplied by the source to arrive at the tax or exchange amount.]]></DESCRIPTION>
+<!--25EE3FD53006414DAC86678999E31025-->  <HELP><![CDATA[The Rate indicates the percentage to be multiplied by the source to arrive at the tax or exchange amount.]]></HELP>
+<!--25EE3FD53006414DAC86678999E31025-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--25EE3FD53006414DAC86678999E31025-->  <AD_TAB_ID><![CDATA[9195CC43B5A4419195030A4DB17D8737]]></AD_TAB_ID>
+<!--25EE3FD53006414DAC86678999E31025-->  <AD_COLUMN_ID><![CDATA[869A1C0B6082452BA462C8590F4A32BB]]></AD_COLUMN_ID>
+<!--25EE3FD53006414DAC86678999E31025-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--25EE3FD53006414DAC86678999E31025-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--25EE3FD53006414DAC86678999E31025-->  <DISPLAYLOGIC><![CDATA[@UomManagement@='Y' & @M_Product_Uom_Id@='']]></DISPLAYLOGIC>
+<!--25EE3FD53006414DAC86678999E31025-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
+<!--25EE3FD53006414DAC86678999E31025-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--25EE3FD53006414DAC86678999E31025-->  <SEQNO><![CDATA[160]]></SEQNO>
+<!--25EE3FD53006414DAC86678999E31025-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--25EE3FD53006414DAC86678999E31025-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--25EE3FD53006414DAC86678999E31025-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--25EE3FD53006414DAC86678999E31025-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--25EE3FD53006414DAC86678999E31025-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--25EE3FD53006414DAC86678999E31025-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--25EE3FD53006414DAC86678999E31025-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--25EE3FD53006414DAC86678999E31025-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--25EE3FD53006414DAC86678999E31025-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--25EE3FD53006414DAC86678999E31025-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--25EE3FD53006414DAC86678999E31025--></AD_FIELD>
+
 <!--261A7EAD754E4802819F8174FE68F605--><AD_FIELD>
 <!--261A7EAD754E4802819F8174FE68F605-->  <AD_FIELD_ID><![CDATA[261A7EAD754E4802819F8174FE68F605]]></AD_FIELD_ID>
 <!--261A7EAD754E4802819F8174FE68F605-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -193835,6 +194162,37 @@
 <!--27EA035E21BE4FCD96BC26A24E25102B-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--27EA035E21BE4FCD96BC26A24E25102B--></AD_FIELD>
 
+<!--27EACCC2ABBE448C82C77654C5EFF80A--><AD_FIELD>
+<!--27EACCC2ABBE448C82C77654C5EFF80A-->  <AD_FIELD_ID><![CDATA[27EACCC2ABBE448C82C77654C5EFF80A]]></AD_FIELD_ID>
+<!--27EACCC2ABBE448C82C77654C5EFF80A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--27EACCC2ABBE448C82C77654C5EFF80A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--27EACCC2ABBE448C82C77654C5EFF80A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--27EACCC2ABBE448C82C77654C5EFF80A-->  <NAME><![CDATA[Operative Quantity]]></NAME>
+<!--27EACCC2ABBE448C82C77654C5EFF80A-->  <DESCRIPTION><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></DESCRIPTION>
+<!--27EACCC2ABBE448C82C77654C5EFF80A-->  <HELP><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></HELP>
+<!--27EACCC2ABBE448C82C77654C5EFF80A-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--27EACCC2ABBE448C82C77654C5EFF80A-->  <AD_TAB_ID><![CDATA[E2F36B4352DA4CA8BE324DC428BEE358]]></AD_TAB_ID>
+<!--27EACCC2ABBE448C82C77654C5EFF80A-->  <AD_COLUMN_ID><![CDATA[BAA3518A49E842DFB007FC6C2BDDCE64]]></AD_COLUMN_ID>
+<!--27EACCC2ABBE448C82C77654C5EFF80A-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--27EACCC2ABBE448C82C77654C5EFF80A-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--27EACCC2ABBE448C82C77654C5EFF80A-->  <DISPLAYLOGIC><![CDATA[@M_Product_Uom_Id@='']]></DISPLAYLOGIC>
+<!--27EACCC2ABBE448C82C77654C5EFF80A-->  <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH>
+<!--27EACCC2ABBE448C82C77654C5EFF80A-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--27EACCC2ABBE448C82C77654C5EFF80A-->  <SEQNO><![CDATA[22]]></SEQNO>
+<!--27EACCC2ABBE448C82C77654C5EFF80A-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--27EACCC2ABBE448C82C77654C5EFF80A-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--27EACCC2ABBE448C82C77654C5EFF80A-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--27EACCC2ABBE448C82C77654C5EFF80A-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--27EACCC2ABBE448C82C77654C5EFF80A-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--27EACCC2ABBE448C82C77654C5EFF80A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--27EACCC2ABBE448C82C77654C5EFF80A-->  <GRID_SEQNO><![CDATA[28]]></GRID_SEQNO>
+<!--27EACCC2ABBE448C82C77654C5EFF80A-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--27EACCC2ABBE448C82C77654C5EFF80A-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--27EACCC2ABBE448C82C77654C5EFF80A-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--27EACCC2ABBE448C82C77654C5EFF80A-->  <DISPLAYLOGIC_SERVER><![CDATA[@UomManagement@='Y']]></DISPLAYLOGIC_SERVER>
+<!--27EACCC2ABBE448C82C77654C5EFF80A-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--27EACCC2ABBE448C82C77654C5EFF80A--></AD_FIELD>
+
 <!--27EAECE5F48C40FF9EB8F671A8BA91E1--><AD_FIELD>
 <!--27EAECE5F48C40FF9EB8F671A8BA91E1-->  <AD_FIELD_ID><![CDATA[27EAECE5F48C40FF9EB8F671A8BA91E1]]></AD_FIELD_ID>
 <!--27EAECE5F48C40FF9EB8F671A8BA91E1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -197598,6 +197956,37 @@
 <!--30D6C84CE8FB45B6B00C8F38C28A38F5-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--30D6C84CE8FB45B6B00C8F38C28A38F5--></AD_FIELD>
 
+<!--30E974A008E546B0958E025AA40EE3E5--><AD_FIELD>
+<!--30E974A008E546B0958E025AA40EE3E5-->  <AD_FIELD_ID><![CDATA[30E974A008E546B0958E025AA40EE3E5]]></AD_FIELD_ID>
+<!--30E974A008E546B0958E025AA40EE3E5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--30E974A008E546B0958E025AA40EE3E5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--30E974A008E546B0958E025AA40EE3E5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--30E974A008E546B0958E025AA40EE3E5-->  <NAME><![CDATA[Alternative UOM]]></NAME>
+<!--30E974A008E546B0958E025AA40EE3E5-->  <DESCRIPTION><![CDATA[A non monetary unit of measure.]]></DESCRIPTION>
+<!--30E974A008E546B0958E025AA40EE3E5-->  <HELP><![CDATA[The Alternative UOM defines a unique non monetary unit of measure]]></HELP>
+<!--30E974A008E546B0958E025AA40EE3E5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--30E974A008E546B0958E025AA40EE3E5-->  <AD_TAB_ID><![CDATA[387B6179438D4C4CB40769A77F4C304C]]></AD_TAB_ID>
+<!--30E974A008E546B0958E025AA40EE3E5-->  <AD_COLUMN_ID><![CDATA[986686B366B044BD8C1E27B729EF9ABB]]></AD_COLUMN_ID>
+<!--30E974A008E546B0958E025AA40EE3E5-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--30E974A008E546B0958E025AA40EE3E5-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--30E974A008E546B0958E025AA40EE3E5-->  <DISPLAYLOGIC><![CDATA[@M_Product_Uom_Id@='']]></DISPLAYLOGIC>
+<!--30E974A008E546B0958E025AA40EE3E5-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--30E974A008E546B0958E025AA40EE3E5-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--30E974A008E546B0958E025AA40EE3E5-->  <SEQNO><![CDATA[35]]></SEQNO>
+<!--30E974A008E546B0958E025AA40EE3E5-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--30E974A008E546B0958E025AA40EE3E5-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--30E974A008E546B0958E025AA40EE3E5-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--30E974A008E546B0958E025AA40EE3E5-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--30E974A008E546B0958E025AA40EE3E5-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--30E974A008E546B0958E025AA40EE3E5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--30E974A008E546B0958E025AA40EE3E5-->  <GRID_SEQNO><![CDATA[39]]></GRID_SEQNO>
+<!--30E974A008E546B0958E025AA40EE3E5-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--30E974A008E546B0958E025AA40EE3E5-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--30E974A008E546B0958E025AA40EE3E5-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--30E974A008E546B0958E025AA40EE3E5-->  <DISPLAYLOGIC_SERVER><![CDATA[@UomManagement@='Y']]></DISPLAYLOGIC_SERVER>
+<!--30E974A008E546B0958E025AA40EE3E5-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--30E974A008E546B0958E025AA40EE3E5--></AD_FIELD>
+
 <!--30EF16CA8097427B9EFADC0F6F9807B1--><AD_FIELD>
 <!--30EF16CA8097427B9EFADC0F6F9807B1-->  <AD_FIELD_ID><![CDATA[30EF16CA8097427B9EFADC0F6F9807B1]]></AD_FIELD_ID>
 <!--30EF16CA8097427B9EFADC0F6F9807B1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -198356,6 +198745,35 @@
 <!--3251836A694348BF925B743638985242-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--3251836A694348BF925B743638985242--></AD_FIELD>
 
+<!--325BE7D960DF4832AC27B600430D56C5--><AD_FIELD>
+<!--325BE7D960DF4832AC27B600430D56C5-->  <AD_FIELD_ID><![CDATA[325BE7D960DF4832AC27B600430D56C5]]></AD_FIELD_ID>
+<!--325BE7D960DF4832AC27B600430D56C5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--325BE7D960DF4832AC27B600430D56C5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--325BE7D960DF4832AC27B600430D56C5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--325BE7D960DF4832AC27B600430D56C5-->  <NAME><![CDATA[Returned UOM]]></NAME>
+<!--325BE7D960DF4832AC27B600430D56C5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--325BE7D960DF4832AC27B600430D56C5-->  <AD_TAB_ID><![CDATA[9195CC43B5A4419195030A4DB17D8737]]></AD_TAB_ID>
+<!--325BE7D960DF4832AC27B600430D56C5-->  <AD_COLUMN_ID><![CDATA[DED319FDA90C4F78A4017AA064C34340]]></AD_COLUMN_ID>
+<!--325BE7D960DF4832AC27B600430D56C5-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--325BE7D960DF4832AC27B600430D56C5-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--325BE7D960DF4832AC27B600430D56C5-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--325BE7D960DF4832AC27B600430D56C5-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--325BE7D960DF4832AC27B600430D56C5-->  <SEQNO><![CDATA[75]]></SEQNO>
+<!--325BE7D960DF4832AC27B600430D56C5-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--325BE7D960DF4832AC27B600430D56C5-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--325BE7D960DF4832AC27B600430D56C5-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--325BE7D960DF4832AC27B600430D56C5-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--325BE7D960DF4832AC27B600430D56C5-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--325BE7D960DF4832AC27B600430D56C5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--325BE7D960DF4832AC27B600430D56C5-->  <GRID_SEQNO><![CDATA[75]]></GRID_SEQNO>
+<!--325BE7D960DF4832AC27B600430D56C5-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--325BE7D960DF4832AC27B600430D56C5-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--325BE7D960DF4832AC27B600430D56C5-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--325BE7D960DF4832AC27B600430D56C5-->  <ONCHANGEFUNCTION><![CDATA[OB.RM.RMShipmentQtyValuesChange]]></ONCHANGEFUNCTION>
+<!--325BE7D960DF4832AC27B600430D56C5-->  <DISPLAYLOGICGRID><![CDATA[OB.PropertyStore.get('UomManagement')='Y']]></DISPLAYLOGICGRID>
+<!--325BE7D960DF4832AC27B600430D56C5-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--325BE7D960DF4832AC27B600430D56C5--></AD_FIELD>
+
 <!--326B46ABC9644BDFB5358DBC226EA3E3--><AD_FIELD>
 <!--326B46ABC9644BDFB5358DBC226EA3E3-->  <AD_FIELD_ID><![CDATA[326B46ABC9644BDFB5358DBC226EA3E3]]></AD_FIELD_ID>
 <!--326B46ABC9644BDFB5358DBC226EA3E3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -198712,7 +199130,7 @@
 <!--333CB18911724224BB55479860D4CA50-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--333CB18911724224BB55479860D4CA50-->  <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
 <!--333CB18911724224BB55479860D4CA50-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--333CB18911724224BB55479860D4CA50-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--333CB18911724224BB55479860D4CA50-->  <SEQNO><![CDATA[55]]></SEQNO>
 <!--333CB18911724224BB55479860D4CA50-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--333CB18911724224BB55479860D4CA50-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--333CB18911724224BB55479860D4CA50-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -201154,6 +201572,37 @@
 <!--395D996B2EF6451BBBD304D4233BFC36-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--395D996B2EF6451BBBD304D4233BFC36--></AD_FIELD>
 
+<!--3978FFA175BA4421802A4438BD3B67E3--><AD_FIELD>
+<!--3978FFA175BA4421802A4438BD3B67E3-->  <AD_FIELD_ID><![CDATA[3978FFA175BA4421802A4438BD3B67E3]]></AD_FIELD_ID>
+<!--3978FFA175BA4421802A4438BD3B67E3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3978FFA175BA4421802A4438BD3B67E3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3978FFA175BA4421802A4438BD3B67E3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3978FFA175BA4421802A4438BD3B67E3-->  <NAME><![CDATA[Operative Quantity]]></NAME>
+<!--3978FFA175BA4421802A4438BD3B67E3-->  <DESCRIPTION><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></DESCRIPTION>
+<!--3978FFA175BA4421802A4438BD3B67E3-->  <HELP><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></HELP>
+<!--3978FFA175BA4421802A4438BD3B67E3-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--3978FFA175BA4421802A4438BD3B67E3-->  <AD_TAB_ID><![CDATA[293]]></AD_TAB_ID>
+<!--3978FFA175BA4421802A4438BD3B67E3-->  <AD_COLUMN_ID><![CDATA[BAA3518A49E842DFB007FC6C2BDDCE64]]></AD_COLUMN_ID>
+<!--3978FFA175BA4421802A4438BD3B67E3-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--3978FFA175BA4421802A4438BD3B67E3-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--3978FFA175BA4421802A4438BD3B67E3-->  <DISPLAYLOGIC><![CDATA[@M_Product_Uom_Id@='']]></DISPLAYLOGIC>
+<!--3978FFA175BA4421802A4438BD3B67E3-->  <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH>
+<!--3978FFA175BA4421802A4438BD3B67E3-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--3978FFA175BA4421802A4438BD3B67E3-->  <SEQNO><![CDATA[22]]></SEQNO>
+<!--3978FFA175BA4421802A4438BD3B67E3-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--3978FFA175BA4421802A4438BD3B67E3-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--3978FFA175BA4421802A4438BD3B67E3-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--3978FFA175BA4421802A4438BD3B67E3-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--3978FFA175BA4421802A4438BD3B67E3-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--3978FFA175BA4421802A4438BD3B67E3-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3978FFA175BA4421802A4438BD3B67E3-->  <GRID_SEQNO><![CDATA[22]]></GRID_SEQNO>
+<!--3978FFA175BA4421802A4438BD3B67E3-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--3978FFA175BA4421802A4438BD3B67E3-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--3978FFA175BA4421802A4438BD3B67E3-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--3978FFA175BA4421802A4438BD3B67E3-->  <DISPLAYLOGIC_SERVER><![CDATA[@UomManagement@='Y']]></DISPLAYLOGIC_SERVER>
+<!--3978FFA175BA4421802A4438BD3B67E3-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--3978FFA175BA4421802A4438BD3B67E3--></AD_FIELD>
+
 <!--3981E3FDBA0C454DAA6F799A05228481--><AD_FIELD>
 <!--3981E3FDBA0C454DAA6F799A05228481-->  <AD_FIELD_ID><![CDATA[3981E3FDBA0C454DAA6F799A05228481]]></AD_FIELD_ID>
 <!--3981E3FDBA0C454DAA6F799A05228481-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -201181,6 +201630,34 @@
 <!--3981E3FDBA0C454DAA6F799A05228481-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--3981E3FDBA0C454DAA6F799A05228481--></AD_FIELD>
 
+<!--398C40B0B7584F8CBD6FA64169BC1194--><AD_FIELD>
+<!--398C40B0B7584F8CBD6FA64169BC1194-->  <AD_FIELD_ID><![CDATA[398C40B0B7584F8CBD6FA64169BC1194]]></AD_FIELD_ID>
+<!--398C40B0B7584F8CBD6FA64169BC1194-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--398C40B0B7584F8CBD6FA64169BC1194-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--398C40B0B7584F8CBD6FA64169BC1194-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--398C40B0B7584F8CBD6FA64169BC1194-->  <NAME><![CDATA[Sales]]></NAME>
+<!--398C40B0B7584F8CBD6FA64169BC1194-->  <DESCRIPTION><![CDATA[It represents the priority of this AUM to the Sales flows]]></DESCRIPTION>
+<!--398C40B0B7584F8CBD6FA64169BC1194-->  <HELP><![CDATA[It represents the priority of this AUM to the Sales flows]]></HELP>
+<!--398C40B0B7584F8CBD6FA64169BC1194-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--398C40B0B7584F8CBD6FA64169BC1194-->  <AD_TAB_ID><![CDATA[A92960D20BB64BBB9C4E88FF58991D6F]]></AD_TAB_ID>
+<!--398C40B0B7584F8CBD6FA64169BC1194-->  <AD_COLUMN_ID><![CDATA[6AAC0F670FA14F42A1147F8384483DEB]]></AD_COLUMN_ID>
+<!--398C40B0B7584F8CBD6FA64169BC1194-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--398C40B0B7584F8CBD6FA64169BC1194-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--398C40B0B7584F8CBD6FA64169BC1194-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
+<!--398C40B0B7584F8CBD6FA64169BC1194-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--398C40B0B7584F8CBD6FA64169BC1194-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--398C40B0B7584F8CBD6FA64169BC1194-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--398C40B0B7584F8CBD6FA64169BC1194-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--398C40B0B7584F8CBD6FA64169BC1194-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--398C40B0B7584F8CBD6FA64169BC1194-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--398C40B0B7584F8CBD6FA64169BC1194-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--398C40B0B7584F8CBD6FA64169BC1194-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--398C40B0B7584F8CBD6FA64169BC1194-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--398C40B0B7584F8CBD6FA64169BC1194-->  <STARTNEWLINE><![CDATA[Y]]></STARTNEWLINE>
+<!--398C40B0B7584F8CBD6FA64169BC1194-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--398C40B0B7584F8CBD6FA64169BC1194-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--398C40B0B7584F8CBD6FA64169BC1194--></AD_FIELD>
+
 <!--3991F1377E6647E4AAD2E0B6251FF7D6--><AD_FIELD>
 <!--3991F1377E6647E4AAD2E0B6251FF7D6-->  <AD_FIELD_ID><![CDATA[3991F1377E6647E4AAD2E0B6251FF7D6]]></AD_FIELD_ID>
 <!--3991F1377E6647E4AAD2E0B6251FF7D6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -201986,6 +202463,33 @@
 <!--3B3775A7690A44DDB9FAB685C74E9561-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--3B3775A7690A44DDB9FAB685C74E9561--></AD_FIELD>
 
+<!--3B38D9ED82F74A148609BBA05C2E46BB--><AD_FIELD>
+<!--3B38D9ED82F74A148609BBA05C2E46BB-->  <AD_FIELD_ID><![CDATA[3B38D9ED82F74A148609BBA05C2E46BB]]></AD_FIELD_ID>
+<!--3B38D9ED82F74A148609BBA05C2E46BB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3B38D9ED82F74A148609BBA05C2E46BB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3B38D9ED82F74A148609BBA05C2E46BB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3B38D9ED82F74A148609BBA05C2E46BB-->  <NAME><![CDATA[Available Qty in AUM]]></NAME>
+<!--3B38D9ED82F74A148609BBA05C2E46BB-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--3B38D9ED82F74A148609BBA05C2E46BB-->  <AD_TAB_ID><![CDATA[9195CC43B5A4419195030A4DB17D8737]]></AD_TAB_ID>
+<!--3B38D9ED82F74A148609BBA05C2E46BB-->  <AD_COLUMN_ID><![CDATA[C19EF153847648679FD9D3AC4574B839]]></AD_COLUMN_ID>
+<!--3B38D9ED82F74A148609BBA05C2E46BB-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--3B38D9ED82F74A148609BBA05C2E46BB-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--3B38D9ED82F74A148609BBA05C2E46BB-->  <DISPLAYLOGIC><![CDATA[@UomManagement@='Y' & @M_Product_Uom_Id@='']]></DISPLAYLOGIC>
+<!--3B38D9ED82F74A148609BBA05C2E46BB-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
+<!--3B38D9ED82F74A148609BBA05C2E46BB-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--3B38D9ED82F74A148609BBA05C2E46BB-->  <SEQNO><![CDATA[140]]></SEQNO>
+<!--3B38D9ED82F74A148609BBA05C2E46BB-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--3B38D9ED82F74A148609BBA05C2E46BB-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--3B38D9ED82F74A148609BBA05C2E46BB-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--3B38D9ED82F74A148609BBA05C2E46BB-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--3B38D9ED82F74A148609BBA05C2E46BB-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--3B38D9ED82F74A148609BBA05C2E46BB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3B38D9ED82F74A148609BBA05C2E46BB-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--3B38D9ED82F74A148609BBA05C2E46BB-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--3B38D9ED82F74A148609BBA05C2E46BB-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--3B38D9ED82F74A148609BBA05C2E46BB-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--3B38D9ED82F74A148609BBA05C2E46BB--></AD_FIELD>
+
 <!--3B4CAD456237406390313D5CAD98D8BE--><AD_FIELD>
 <!--3B4CAD456237406390313D5CAD98D8BE-->  <AD_FIELD_ID><![CDATA[3B4CAD456237406390313D5CAD98D8BE]]></AD_FIELD_ID>
 <!--3B4CAD456237406390313D5CAD98D8BE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -202297,6 +202801,37 @@
 <!--3C5AAC98B6A4464C940B68DE5B85ACCC-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--3C5AAC98B6A4464C940B68DE5B85ACCC--></AD_FIELD>
 
+<!--3C5BC4B02999437AA5FC422C1C73C552--><AD_FIELD>
+<!--3C5BC4B02999437AA5FC422C1C73C552-->  <AD_FIELD_ID><![CDATA[3C5BC4B02999437AA5FC422C1C73C552]]></AD_FIELD_ID>
+<!--3C5BC4B02999437AA5FC422C1C73C552-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3C5BC4B02999437AA5FC422C1C73C552-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3C5BC4B02999437AA5FC422C1C73C552-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3C5BC4B02999437AA5FC422C1C73C552-->  <NAME><![CDATA[Alternative UOM]]></NAME>
+<!--3C5BC4B02999437AA5FC422C1C73C552-->  <DESCRIPTION><![CDATA[A non monetary unit of measure.]]></DESCRIPTION>
+<!--3C5BC4B02999437AA5FC422C1C73C552-->  <HELP><![CDATA[The Alternative UOM defines a unique non monetary unit of measure]]></HELP>
+<!--3C5BC4B02999437AA5FC422C1C73C552-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--3C5BC4B02999437AA5FC422C1C73C552-->  <AD_TAB_ID><![CDATA[293]]></AD_TAB_ID>
+<!--3C5BC4B02999437AA5FC422C1C73C552-->  <AD_COLUMN_ID><![CDATA[986686B366B044BD8C1E27B729EF9ABB]]></AD_COLUMN_ID>
+<!--3C5BC4B02999437AA5FC422C1C73C552-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--3C5BC4B02999437AA5FC422C1C73C552-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--3C5BC4B02999437AA5FC422C1C73C552-->  <DISPLAYLOGIC><![CDATA[@M_Product_Uom_Id@='']]></DISPLAYLOGIC>
+<!--3C5BC4B02999437AA5FC422C1C73C552-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--3C5BC4B02999437AA5FC422C1C73C552-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--3C5BC4B02999437AA5FC422C1C73C552-->  <SEQNO><![CDATA[25]]></SEQNO>
+<!--3C5BC4B02999437AA5FC422C1C73C552-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--3C5BC4B02999437AA5FC422C1C73C552-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--3C5BC4B02999437AA5FC422C1C73C552-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--3C5BC4B02999437AA5FC422C1C73C552-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--3C5BC4B02999437AA5FC422C1C73C552-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--3C5BC4B02999437AA5FC422C1C73C552-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3C5BC4B02999437AA5FC422C1C73C552-->  <GRID_SEQNO><![CDATA[25]]></GRID_SEQNO>
+<!--3C5BC4B02999437AA5FC422C1C73C552-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--3C5BC4B02999437AA5FC422C1C73C552-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--3C5BC4B02999437AA5FC422C1C73C552-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--3C5BC4B02999437AA5FC422C1C73C552-->  <DISPLAYLOGIC_SERVER><![CDATA[@UomManagement@='Y']]></DISPLAYLOGIC_SERVER>
+<!--3C5BC4B02999437AA5FC422C1C73C552-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--3C5BC4B02999437AA5FC422C1C73C552--></AD_FIELD>
+
 <!--3C65B02FAB76494FAEC86C4DA4785C84--><AD_FIELD>
 <!--3C65B02FAB76494FAEC86C4DA4785C84-->  <AD_FIELD_ID><![CDATA[3C65B02FAB76494FAEC86C4DA4785C84]]></AD_FIELD_ID>
 <!--3C65B02FAB76494FAEC86C4DA4785C84-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -203449,6 +203984,37 @@
 <!--3F1025DA003A4C63A8C437285E98D16E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--3F1025DA003A4C63A8C437285E98D16E--></AD_FIELD>
 
+<!--3F12E6F426BD4F31BD1F5470F6EF08BF--><AD_FIELD>
+<!--3F12E6F426BD4F31BD1F5470F6EF08BF-->  <AD_FIELD_ID><![CDATA[3F12E6F426BD4F31BD1F5470F6EF08BF]]></AD_FIELD_ID>
+<!--3F12E6F426BD4F31BD1F5470F6EF08BF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3F12E6F426BD4F31BD1F5470F6EF08BF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3F12E6F426BD4F31BD1F5470F6EF08BF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3F12E6F426BD4F31BD1F5470F6EF08BF-->  <NAME><![CDATA[Operative Quantity]]></NAME>
+<!--3F12E6F426BD4F31BD1F5470F6EF08BF-->  <DESCRIPTION><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></DESCRIPTION>
+<!--3F12E6F426BD4F31BD1F5470F6EF08BF-->  <HELP><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></HELP>
+<!--3F12E6F426BD4F31BD1F5470F6EF08BF-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--3F12E6F426BD4F31BD1F5470F6EF08BF-->  <AD_TAB_ID><![CDATA[187]]></AD_TAB_ID>
+<!--3F12E6F426BD4F31BD1F5470F6EF08BF-->  <AD_COLUMN_ID><![CDATA[BAA3518A49E842DFB007FC6C2BDDCE64]]></AD_COLUMN_ID>
+<!--3F12E6F426BD4F31BD1F5470F6EF08BF-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--3F12E6F426BD4F31BD1F5470F6EF08BF-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--3F12E6F426BD4F31BD1F5470F6EF08BF-->  <DISPLAYLOGIC><![CDATA[@M_Product_Uom_Id@='']]></DISPLAYLOGIC>
+<!--3F12E6F426BD4F31BD1F5470F6EF08BF-->  <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH>
+<!--3F12E6F426BD4F31BD1F5470F6EF08BF-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--3F12E6F426BD4F31BD1F5470F6EF08BF-->  <SEQNO><![CDATA[22]]></SEQNO>
+<!--3F12E6F426BD4F31BD1F5470F6EF08BF-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--3F12E6F426BD4F31BD1F5470F6EF08BF-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--3F12E6F426BD4F31BD1F5470F6EF08BF-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--3F12E6F426BD4F31BD1F5470F6EF08BF-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--3F12E6F426BD4F31BD1F5470F6EF08BF-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--3F12E6F426BD4F31BD1F5470F6EF08BF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3F12E6F426BD4F31BD1F5470F6EF08BF-->  <GRID_SEQNO><![CDATA[22]]></GRID_SEQNO>
+<!--3F12E6F426BD4F31BD1F5470F6EF08BF-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--3F12E6F426BD4F31BD1F5470F6EF08BF-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--3F12E6F426BD4F31BD1F5470F6EF08BF-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--3F12E6F426BD4F31BD1F5470F6EF08BF-->  <DISPLAYLOGIC_SERVER><![CDATA[@UomManagement@='Y']]></DISPLAYLOGIC_SERVER>
+<!--3F12E6F426BD4F31BD1F5470F6EF08BF-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--3F12E6F426BD4F31BD1F5470F6EF08BF--></AD_FIELD>
+
 <!--3F2F90BC20D54C78A9C9639FB083D626--><AD_FIELD>
 <!--3F2F90BC20D54C78A9C9639FB083D626-->  <AD_FIELD_ID><![CDATA[3F2F90BC20D54C78A9C9639FB083D626]]></AD_FIELD_ID>
 <!--3F2F90BC20D54C78A9C9639FB083D626-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -204890,6 +205456,32 @@
 <!--426F7A1722C6452D81C780A47384C348-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--426F7A1722C6452D81C780A47384C348--></AD_FIELD>
 
+<!--42937856CD3944E2BE015A1FAE363343--><AD_FIELD>
+<!--42937856CD3944E2BE015A1FAE363343-->  <AD_FIELD_ID><![CDATA[42937856CD3944E2BE015A1FAE363343]]></AD_FIELD_ID>
+<!--42937856CD3944E2BE015A1FAE363343-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--42937856CD3944E2BE015A1FAE363343-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--42937856CD3944E2BE015A1FAE363343-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--42937856CD3944E2BE015A1FAE363343-->  <NAME><![CDATA[aumConversionRate]]></NAME>
+<!--42937856CD3944E2BE015A1FAE363343-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--42937856CD3944E2BE015A1FAE363343-->  <AD_TAB_ID><![CDATA[B01BFDF1E6B24CF4941807CA7F77A073]]></AD_TAB_ID>
+<!--42937856CD3944E2BE015A1FAE363343-->  <AD_COLUMN_ID><![CDATA[A71A0D2820C043CEADF3CC75B3C1E36C]]></AD_COLUMN_ID>
+<!--42937856CD3944E2BE015A1FAE363343-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--42937856CD3944E2BE015A1FAE363343-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--42937856CD3944E2BE015A1FAE363343-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
+<!--42937856CD3944E2BE015A1FAE363343-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--42937856CD3944E2BE015A1FAE363343-->  <SEQNO><![CDATA[230]]></SEQNO>
+<!--42937856CD3944E2BE015A1FAE363343-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--42937856CD3944E2BE015A1FAE363343-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--42937856CD3944E2BE015A1FAE363343-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--42937856CD3944E2BE015A1FAE363343-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--42937856CD3944E2BE015A1FAE363343-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--42937856CD3944E2BE015A1FAE363343-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--42937856CD3944E2BE015A1FAE363343-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--42937856CD3944E2BE015A1FAE363343-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--42937856CD3944E2BE015A1FAE363343-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--42937856CD3944E2BE015A1FAE363343-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--42937856CD3944E2BE015A1FAE363343--></AD_FIELD>
+
 <!--429632E4736C47339D77E6DBCC728957--><AD_FIELD>
 <!--429632E4736C47339D77E6DBCC728957-->  <AD_FIELD_ID><![CDATA[429632E4736C47339D77E6DBCC728957]]></AD_FIELD_ID>
 <!--429632E4736C47339D77E6DBCC728957-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -206279,7 +206871,7 @@
 <!--45851CFC7C324AEBB97AB8B926872798-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--45851CFC7C324AEBB97AB8B926872798-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--45851CFC7C324AEBB97AB8B926872798-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--45851CFC7C324AEBB97AB8B926872798-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
+<!--45851CFC7C324AEBB97AB8B926872798-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
 <!--45851CFC7C324AEBB97AB8B926872798-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--45851CFC7C324AEBB97AB8B926872798-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--45851CFC7C324AEBB97AB8B926872798-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -206489,6 +207081,37 @@
 <!--462901CB80DA4C9591003CB0FB1A300D-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--462901CB80DA4C9591003CB0FB1A300D--></AD_FIELD>
 
+<!--46444B10EB114EE9BC44D5141EDA41F3--><AD_FIELD>
+<!--46444B10EB114EE9BC44D5141EDA41F3-->  <AD_FIELD_ID><![CDATA[46444B10EB114EE9BC44D5141EDA41F3]]></AD_FIELD_ID>
+<!--46444B10EB114EE9BC44D5141EDA41F3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--46444B10EB114EE9BC44D5141EDA41F3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--46444B10EB114EE9BC44D5141EDA41F3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--46444B10EB114EE9BC44D5141EDA41F3-->  <NAME><![CDATA[Alternative UOM]]></NAME>
+<!--46444B10EB114EE9BC44D5141EDA41F3-->  <DESCRIPTION><![CDATA[A non monetary unit of measure.]]></DESCRIPTION>
+<!--46444B10EB114EE9BC44D5141EDA41F3-->  <HELP><![CDATA[The Alternative UOM defines a unique non monetary unit of measure]]></HELP>
+<!--46444B10EB114EE9BC44D5141EDA41F3-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--46444B10EB114EE9BC44D5141EDA41F3-->  <AD_TAB_ID><![CDATA[291]]></AD_TAB_ID>
+<!--46444B10EB114EE9BC44D5141EDA41F3-->  <AD_COLUMN_ID><![CDATA[5DB325BF62E748F5B4DF85FD0381BD8F]]></AD_COLUMN_ID>
+<!--46444B10EB114EE9BC44D5141EDA41F3-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--46444B10EB114EE9BC44D5141EDA41F3-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--46444B10EB114EE9BC44D5141EDA41F3-->  <DISPLAYLOGIC><![CDATA[@M_Product_Uom_Id@='' & @Financial_Invoice_Line@='N']]></DISPLAYLOGIC>
+<!--46444B10EB114EE9BC44D5141EDA41F3-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--46444B10EB114EE9BC44D5141EDA41F3-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--46444B10EB114EE9BC44D5141EDA41F3-->  <SEQNO><![CDATA[27]]></SEQNO>
+<!--46444B10EB114EE9BC44D5141EDA41F3-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--46444B10EB114EE9BC44D5141EDA41F3-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--46444B10EB114EE9BC44D5141EDA41F3-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--46444B10EB114EE9BC44D5141EDA41F3-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--46444B10EB114EE9BC44D5141EDA41F3-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--46444B10EB114EE9BC44D5141EDA41F3-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--46444B10EB114EE9BC44D5141EDA41F3-->  <GRID_SEQNO><![CDATA[27]]></GRID_SEQNO>
+<!--46444B10EB114EE9BC44D5141EDA41F3-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--46444B10EB114EE9BC44D5141EDA41F3-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--46444B10EB114EE9BC44D5141EDA41F3-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--46444B10EB114EE9BC44D5141EDA41F3-->  <DISPLAYLOGIC_SERVER><![CDATA[@UomManagement@='Y']]></DISPLAYLOGIC_SERVER>
+<!--46444B10EB114EE9BC44D5141EDA41F3-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--46444B10EB114EE9BC44D5141EDA41F3--></AD_FIELD>
+
 <!--46AA010A83114790B27E0F2326EB6598--><AD_FIELD>
 <!--46AA010A83114790B27E0F2326EB6598-->  <AD_FIELD_ID><![CDATA[46AA010A83114790B27E0F2326EB6598]]></AD_FIELD_ID>
 <!--46AA010A83114790B27E0F2326EB6598-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -208469,6 +209092,38 @@
 <!--4C5651CF2F234CE089B3146D68BD9DC3-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--4C5651CF2F234CE089B3146D68BD9DC3--></AD_FIELD>
 
+<!--4C76173F5DBB4636ACDD028E6488CC0B--><AD_FIELD>
+<!--4C76173F5DBB4636ACDD028E6488CC0B-->  <AD_FIELD_ID><![CDATA[4C76173F5DBB4636ACDD028E6488CC0B]]></AD_FIELD_ID>
+<!--4C76173F5DBB4636ACDD028E6488CC0B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4C76173F5DBB4636ACDD028E6488CC0B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4C76173F5DBB4636ACDD028E6488CC0B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4C76173F5DBB4636ACDD028E6488CC0B-->  <NAME><![CDATA[Operative Quantity]]></NAME>
+<!--4C76173F5DBB4636ACDD028E6488CC0B-->  <DESCRIPTION><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></DESCRIPTION>
+<!--4C76173F5DBB4636ACDD028E6488CC0B-->  <HELP><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></HELP>
+<!--4C76173F5DBB4636ACDD028E6488CC0B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--4C76173F5DBB4636ACDD028E6488CC0B-->  <AD_TAB_ID><![CDATA[C9BD6AF9E06F4BE4B4799D09965481DC]]></AD_TAB_ID>
+<!--4C76173F5DBB4636ACDD028E6488CC0B-->  <AD_COLUMN_ID><![CDATA[6E43F881D1C441F8BC834B98C1B4DBEB]]></AD_COLUMN_ID>
+<!--4C76173F5DBB4636ACDD028E6488CC0B-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--4C76173F5DBB4636ACDD028E6488CC0B-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--4C76173F5DBB4636ACDD028E6488CC0B-->  <DISPLAYLOGIC><![CDATA[@M_Product_Uom_Id@='']]></DISPLAYLOGIC>
+<!--4C76173F5DBB4636ACDD028E6488CC0B-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--4C76173F5DBB4636ACDD028E6488CC0B-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--4C76173F5DBB4636ACDD028E6488CC0B-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--4C76173F5DBB4636ACDD028E6488CC0B-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--4C76173F5DBB4636ACDD028E6488CC0B-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--4C76173F5DBB4636ACDD028E6488CC0B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--4C76173F5DBB4636ACDD028E6488CC0B-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4C76173F5DBB4636ACDD028E6488CC0B-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--4C76173F5DBB4636ACDD028E6488CC0B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4C76173F5DBB4636ACDD028E6488CC0B-->  <GRID_SEQNO><![CDATA[38]]></GRID_SEQNO>
+<!--4C76173F5DBB4636ACDD028E6488CC0B-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--4C76173F5DBB4636ACDD028E6488CC0B-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--4C76173F5DBB4636ACDD028E6488CC0B-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--4C76173F5DBB4636ACDD028E6488CC0B-->  <CLIENTCLASS><![CDATA[OBTruncAddMinusDisplay]]></CLIENTCLASS>
+<!--4C76173F5DBB4636ACDD028E6488CC0B-->  <DISPLAYLOGIC_SERVER><![CDATA[@UomManagement@='Y']]></DISPLAYLOGIC_SERVER>
+<!--4C76173F5DBB4636ACDD028E6488CC0B-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--4C76173F5DBB4636ACDD028E6488CC0B--></AD_FIELD>
+
 <!--4C762EF911CE4DD7A8C1CC9A2EB3DE54--><AD_FIELD>
 <!--4C762EF911CE4DD7A8C1CC9A2EB3DE54-->  <AD_FIELD_ID><![CDATA[4C762EF911CE4DD7A8C1CC9A2EB3DE54]]></AD_FIELD_ID>
 <!--4C762EF911CE4DD7A8C1CC9A2EB3DE54-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -224054,6 +224709,34 @@
 <!--5DEE7AFA496940ACA3E55E3BE0F13DA6-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--5DEE7AFA496940ACA3E55E3BE0F13DA6--></AD_FIELD>
 
+<!--5E0FA18F59FF4CD0974E8D0D69F58FD5--><AD_FIELD>
+<!--5E0FA18F59FF4CD0974E8D0D69F58FD5-->  <AD_FIELD_ID><![CDATA[5E0FA18F59FF4CD0974E8D0D69F58FD5]]></AD_FIELD_ID>
+<!--5E0FA18F59FF4CD0974E8D0D69F58FD5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5E0FA18F59FF4CD0974E8D0D69F58FD5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5E0FA18F59FF4CD0974E8D0D69F58FD5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5E0FA18F59FF4CD0974E8D0D69F58FD5-->  <NAME><![CDATA[Organization]]></NAME>
+<!--5E0FA18F59FF4CD0974E8D0D69F58FD5-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--5E0FA18F59FF4CD0974E8D0D69F58FD5-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--5E0FA18F59FF4CD0974E8D0D69F58FD5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--5E0FA18F59FF4CD0974E8D0D69F58FD5-->  <AD_TAB_ID><![CDATA[A92960D20BB64BBB9C4E88FF58991D6F]]></AD_TAB_ID>
+<!--5E0FA18F59FF4CD0974E8D0D69F58FD5-->  <AD_COLUMN_ID><![CDATA[065407325C0F4FE4B8831900482884DD]]></AD_COLUMN_ID>
+<!--5E0FA18F59FF4CD0974E8D0D69F58FD5-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--5E0FA18F59FF4CD0974E8D0D69F58FD5-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--5E0FA18F59FF4CD0974E8D0D69F58FD5-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--5E0FA18F59FF4CD0974E8D0D69F58FD5-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--5E0FA18F59FF4CD0974E8D0D69F58FD5-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--5E0FA18F59FF4CD0974E8D0D69F58FD5-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--5E0FA18F59FF4CD0974E8D0D69F58FD5-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--5E0FA18F59FF4CD0974E8D0D69F58FD5-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--5E0FA18F59FF4CD0974E8D0D69F58FD5-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--5E0FA18F59FF4CD0974E8D0D69F58FD5-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--5E0FA18F59FF4CD0974E8D0D69F58FD5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5E0FA18F59FF4CD0974E8D0D69F58FD5-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--5E0FA18F59FF4CD0974E8D0D69F58FD5-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--5E0FA18F59FF4CD0974E8D0D69F58FD5-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--5E0FA18F59FF4CD0974E8D0D69F58FD5-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--5E0FA18F59FF4CD0974E8D0D69F58FD5--></AD_FIELD>
+
 <!--5E219C5344E344AEBB40C901BF1D8CEA--><AD_FIELD>
 <!--5E219C5344E344AEBB40C901BF1D8CEA-->  <AD_FIELD_ID><![CDATA[5E219C5344E344AEBB40C901BF1D8CEA]]></AD_FIELD_ID>
 <!--5E219C5344E344AEBB40C901BF1D8CEA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -224596,6 +225279,37 @@
 <!--5EDAF4681A1A4A928D4E6CA68F7C1A57-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--5EDAF4681A1A4A928D4E6CA68F7C1A57--></AD_FIELD>
 
+<!--5F0C5F6390674C0299DE56901475CC99--><AD_FIELD>
+<!--5F0C5F6390674C0299DE56901475CC99-->  <AD_FIELD_ID><![CDATA[5F0C5F6390674C0299DE56901475CC99]]></AD_FIELD_ID>
+<!--5F0C5F6390674C0299DE56901475CC99-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5F0C5F6390674C0299DE56901475CC99-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5F0C5F6390674C0299DE56901475CC99-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5F0C5F6390674C0299DE56901475CC99-->  <NAME><![CDATA[Alternative UOM]]></NAME>
+<!--5F0C5F6390674C0299DE56901475CC99-->  <DESCRIPTION><![CDATA[A non monetary unit of measure.]]></DESCRIPTION>
+<!--5F0C5F6390674C0299DE56901475CC99-->  <HELP><![CDATA[The Alternative UOM defines a unique non monetary unit of measure]]></HELP>
+<!--5F0C5F6390674C0299DE56901475CC99-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--5F0C5F6390674C0299DE56901475CC99-->  <AD_TAB_ID><![CDATA[C9BD6AF9E06F4BE4B4799D09965481DC]]></AD_TAB_ID>
+<!--5F0C5F6390674C0299DE56901475CC99-->  <AD_COLUMN_ID><![CDATA[75E9ED83A89C4CA28416B0F0220431C4]]></AD_COLUMN_ID>
+<!--5F0C5F6390674C0299DE56901475CC99-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--5F0C5F6390674C0299DE56901475CC99-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--5F0C5F6390674C0299DE56901475CC99-->  <DISPLAYLOGIC><![CDATA[@M_Product_Uom_Id@='']]></DISPLAYLOGIC>
+<!--5F0C5F6390674C0299DE56901475CC99-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--5F0C5F6390674C0299DE56901475CC99-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--5F0C5F6390674C0299DE56901475CC99-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--5F0C5F6390674C0299DE56901475CC99-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--5F0C5F6390674C0299DE56901475CC99-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--5F0C5F6390674C0299DE56901475CC99-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--5F0C5F6390674C0299DE56901475CC99-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--5F0C5F6390674C0299DE56901475CC99-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--5F0C5F6390674C0299DE56901475CC99-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5F0C5F6390674C0299DE56901475CC99-->  <GRID_SEQNO><![CDATA[39]]></GRID_SEQNO>
+<!--5F0C5F6390674C0299DE56901475CC99-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--5F0C5F6390674C0299DE56901475CC99-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--5F0C5F6390674C0299DE56901475CC99-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--5F0C5F6390674C0299DE56901475CC99-->  <DISPLAYLOGIC_SERVER><![CDATA[@UomManagement@='Y']]></DISPLAYLOGIC_SERVER>
+<!--5F0C5F6390674C0299DE56901475CC99-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--5F0C5F6390674C0299DE56901475CC99--></AD_FIELD>
+
 <!--5F2229AB143A468FB07C52734788EABB--><AD_FIELD>
 <!--5F2229AB143A468FB07C52734788EABB-->  <AD_FIELD_ID><![CDATA[5F2229AB143A468FB07C52734788EABB]]></AD_FIELD_ID>
 <!--5F2229AB143A468FB07C52734788EABB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -228748,13 +229462,44 @@
 <!--6720E75CB0E9442DA0B510165EBD93B1-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--6720E75CB0E9442DA0B510165EBD93B1-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--6720E75CB0E9442DA0B510165EBD93B1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--6720E75CB0E9442DA0B510165EBD93B1-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
+<!--6720E75CB0E9442DA0B510165EBD93B1-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
 <!--6720E75CB0E9442DA0B510165EBD93B1-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--6720E75CB0E9442DA0B510165EBD93B1-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--6720E75CB0E9442DA0B510165EBD93B1-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
 <!--6720E75CB0E9442DA0B510165EBD93B1-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--6720E75CB0E9442DA0B510165EBD93B1--></AD_FIELD>
 
+<!--674BBEBEBAE3408084999F6553F84955--><AD_FIELD>
+<!--674BBEBEBAE3408084999F6553F84955-->  <AD_FIELD_ID><![CDATA[674BBEBEBAE3408084999F6553F84955]]></AD_FIELD_ID>
+<!--674BBEBEBAE3408084999F6553F84955-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--674BBEBEBAE3408084999F6553F84955-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--674BBEBEBAE3408084999F6553F84955-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--674BBEBEBAE3408084999F6553F84955-->  <NAME><![CDATA[Operative Quantity]]></NAME>
+<!--674BBEBEBAE3408084999F6553F84955-->  <DESCRIPTION><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></DESCRIPTION>
+<!--674BBEBEBAE3408084999F6553F84955-->  <HELP><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></HELP>
+<!--674BBEBEBAE3408084999F6553F84955-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--674BBEBEBAE3408084999F6553F84955-->  <AD_TAB_ID><![CDATA[297]]></AD_TAB_ID>
+<!--674BBEBEBAE3408084999F6553F84955-->  <AD_COLUMN_ID><![CDATA[6E43F881D1C441F8BC834B98C1B4DBEB]]></AD_COLUMN_ID>
+<!--674BBEBEBAE3408084999F6553F84955-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--674BBEBEBAE3408084999F6553F84955-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--674BBEBEBAE3408084999F6553F84955-->  <DISPLAYLOGIC><![CDATA[@M_Product_Uom_Id@='']]></DISPLAYLOGIC>
+<!--674BBEBEBAE3408084999F6553F84955-->  <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH>
+<!--674BBEBEBAE3408084999F6553F84955-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--674BBEBEBAE3408084999F6553F84955-->  <SEQNO><![CDATA[35]]></SEQNO>
+<!--674BBEBEBAE3408084999F6553F84955-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--674BBEBEBAE3408084999F6553F84955-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--674BBEBEBAE3408084999F6553F84955-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--674BBEBEBAE3408084999F6553F84955-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--674BBEBEBAE3408084999F6553F84955-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--674BBEBEBAE3408084999F6553F84955-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--674BBEBEBAE3408084999F6553F84955-->  <GRID_SEQNO><![CDATA[35]]></GRID_SEQNO>
+<!--674BBEBEBAE3408084999F6553F84955-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--674BBEBEBAE3408084999F6553F84955-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--674BBEBEBAE3408084999F6553F84955-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--674BBEBEBAE3408084999F6553F84955-->  <DISPLAYLOGIC_SERVER><![CDATA[@UomManagement@='Y']]></DISPLAYLOGIC_SERVER>
+<!--674BBEBEBAE3408084999F6553F84955-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--674BBEBEBAE3408084999F6553F84955--></AD_FIELD>
+
 <!--6767ECED19E148D3A8D751478E90251B--><AD_FIELD>
 <!--6767ECED19E148D3A8D751478E90251B-->  <AD_FIELD_ID><![CDATA[6767ECED19E148D3A8D751478E90251B]]></AD_FIELD_ID>
 <!--6767ECED19E148D3A8D751478E90251B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -228810,6 +229555,33 @@
 <!--67B0812B06E84BCAA90A52F7C23B9A65-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--67B0812B06E84BCAA90A52F7C23B9A65--></AD_FIELD>
 
+<!--67C0DDEC51E24A16A19B784929324CF9--><AD_FIELD>
+<!--67C0DDEC51E24A16A19B784929324CF9-->  <AD_FIELD_ID><![CDATA[67C0DDEC51E24A16A19B784929324CF9]]></AD_FIELD_ID>
+<!--67C0DDEC51E24A16A19B784929324CF9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--67C0DDEC51E24A16A19B784929324CF9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--67C0DDEC51E24A16A19B784929324CF9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--67C0DDEC51E24A16A19B784929324CF9-->  <NAME><![CDATA[Client]]></NAME>
+<!--67C0DDEC51E24A16A19B784929324CF9-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--67C0DDEC51E24A16A19B784929324CF9-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--67C0DDEC51E24A16A19B784929324CF9-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--67C0DDEC51E24A16A19B784929324CF9-->  <AD_TAB_ID><![CDATA[A92960D20BB64BBB9C4E88FF58991D6F]]></AD_TAB_ID>
+<!--67C0DDEC51E24A16A19B784929324CF9-->  <AD_COLUMN_ID><![CDATA[BD1A5D4B40E84593B3185CC22CFC28A5]]></AD_COLUMN_ID>
+<!--67C0DDEC51E24A16A19B784929324CF9-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--67C0DDEC51E24A16A19B784929324CF9-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--67C0DDEC51E24A16A19B784929324CF9-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--67C0DDEC51E24A16A19B784929324CF9-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--67C0DDEC51E24A16A19B784929324CF9-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--67C0DDEC51E24A16A19B784929324CF9-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--67C0DDEC51E24A16A19B784929324CF9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--67C0DDEC51E24A16A19B784929324CF9-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--67C0DDEC51E24A16A19B784929324CF9-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--67C0DDEC51E24A16A19B784929324CF9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--67C0DDEC51E24A16A19B784929324CF9-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--67C0DDEC51E24A16A19B784929324CF9-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--67C0DDEC51E24A16A19B784929324CF9-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--67C0DDEC51E24A16A19B784929324CF9-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--67C0DDEC51E24A16A19B784929324CF9--></AD_FIELD>
+
 <!--67E05DE9B13C40F7B8DCF2AA74D74052--><AD_FIELD>
 <!--67E05DE9B13C40F7B8DCF2AA74D74052-->  <AD_FIELD_ID><![CDATA[67E05DE9B13C40F7B8DCF2AA74D74052]]></AD_FIELD_ID>
 <!--67E05DE9B13C40F7B8DCF2AA74D74052-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -230522,6 +231294,37 @@
 <!--6C8B4DB8B83C46A8B54EA1624A7D9BF7-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--6C8B4DB8B83C46A8B54EA1624A7D9BF7--></AD_FIELD>
 
+<!--6C8CF4874B2D472B9739EBF2B991B261--><AD_FIELD>
+<!--6C8CF4874B2D472B9739EBF2B991B261-->  <AD_FIELD_ID><![CDATA[6C8CF4874B2D472B9739EBF2B991B261]]></AD_FIELD_ID>
+<!--6C8CF4874B2D472B9739EBF2B991B261-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6C8CF4874B2D472B9739EBF2B991B261-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6C8CF4874B2D472B9739EBF2B991B261-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6C8CF4874B2D472B9739EBF2B991B261-->  <NAME><![CDATA[Operative Quantity]]></NAME>
+<!--6C8CF4874B2D472B9739EBF2B991B261-->  <DESCRIPTION><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></DESCRIPTION>
+<!--6C8CF4874B2D472B9739EBF2B991B261-->  <HELP><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></HELP>
+<!--6C8CF4874B2D472B9739EBF2B991B261-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--6C8CF4874B2D472B9739EBF2B991B261-->  <AD_TAB_ID><![CDATA[291]]></AD_TAB_ID>
+<!--6C8CF4874B2D472B9739EBF2B991B261-->  <AD_COLUMN_ID><![CDATA[3243D34AA7E9477A95A5AFF70824363B]]></AD_COLUMN_ID>
+<!--6C8CF4874B2D472B9739EBF2B991B261-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--6C8CF4874B2D472B9739EBF2B991B261-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--6C8CF4874B2D472B9739EBF2B991B261-->  <DISPLAYLOGIC><![CDATA[@M_Product_Uom_Id@='' & @Financial_Invoice_Line@='N']]></DISPLAYLOGIC>
+<!--6C8CF4874B2D472B9739EBF2B991B261-->  <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH>
+<!--6C8CF4874B2D472B9739EBF2B991B261-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--6C8CF4874B2D472B9739EBF2B991B261-->  <SEQNO><![CDATA[25]]></SEQNO>
+<!--6C8CF4874B2D472B9739EBF2B991B261-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--6C8CF4874B2D472B9739EBF2B991B261-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--6C8CF4874B2D472B9739EBF2B991B261-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6C8CF4874B2D472B9739EBF2B991B261-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--6C8CF4874B2D472B9739EBF2B991B261-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--6C8CF4874B2D472B9739EBF2B991B261-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6C8CF4874B2D472B9739EBF2B991B261-->  <GRID_SEQNO><![CDATA[25]]></GRID_SEQNO>
+<!--6C8CF4874B2D472B9739EBF2B991B261-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--6C8CF4874B2D472B9739EBF2B991B261-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--6C8CF4874B2D472B9739EBF2B991B261-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--6C8CF4874B2D472B9739EBF2B991B261-->  <DISPLAYLOGIC_SERVER><![CDATA[@UomManagement@='Y']]></DISPLAYLOGIC_SERVER>
+<!--6C8CF4874B2D472B9739EBF2B991B261-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--6C8CF4874B2D472B9739EBF2B991B261--></AD_FIELD>
+
 <!--6CAE8771333E46698C87F963193332D8--><AD_FIELD>
 <!--6CAE8771333E46698C87F963193332D8-->  <AD_FIELD_ID><![CDATA[6CAE8771333E46698C87F963193332D8]]></AD_FIELD_ID>
 <!--6CAE8771333E46698C87F963193332D8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -235805,6 +236608,33 @@
 <!--76D4693741914D3ABCC012E5204210B3-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--76D4693741914D3ABCC012E5204210B3--></AD_FIELD>
 
+<!--76DF07CCFC7B4C1BBE69EA17DAFFD1CE--><AD_FIELD>
+<!--76DF07CCFC7B4C1BBE69EA17DAFFD1CE-->  <AD_FIELD_ID><![CDATA[76DF07CCFC7B4C1BBE69EA17DAFFD1CE]]></AD_FIELD_ID>
+<!--76DF07CCFC7B4C1BBE69EA17DAFFD1CE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--76DF07CCFC7B4C1BBE69EA17DAFFD1CE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--76DF07CCFC7B4C1BBE69EA17DAFFD1CE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--76DF07CCFC7B4C1BBE69EA17DAFFD1CE-->  <NAME><![CDATA[Pending Qty in AUM]]></NAME>
+<!--76DF07CCFC7B4C1BBE69EA17DAFFD1CE-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--76DF07CCFC7B4C1BBE69EA17DAFFD1CE-->  <AD_TAB_ID><![CDATA[9195CC43B5A4419195030A4DB17D8737]]></AD_TAB_ID>
+<!--76DF07CCFC7B4C1BBE69EA17DAFFD1CE-->  <AD_COLUMN_ID><![CDATA[AB8223F8CD7949938E1ACCD5EED6B33D]]></AD_COLUMN_ID>
+<!--76DF07CCFC7B4C1BBE69EA17DAFFD1CE-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--76DF07CCFC7B4C1BBE69EA17DAFFD1CE-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--76DF07CCFC7B4C1BBE69EA17DAFFD1CE-->  <DISPLAYLOGIC><![CDATA[@UomManagement@='Y' & @M_Product_Uom_Id@='']]></DISPLAYLOGIC>
+<!--76DF07CCFC7B4C1BBE69EA17DAFFD1CE-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
+<!--76DF07CCFC7B4C1BBE69EA17DAFFD1CE-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--76DF07CCFC7B4C1BBE69EA17DAFFD1CE-->  <SEQNO><![CDATA[130]]></SEQNO>
+<!--76DF07CCFC7B4C1BBE69EA17DAFFD1CE-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--76DF07CCFC7B4C1BBE69EA17DAFFD1CE-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--76DF07CCFC7B4C1BBE69EA17DAFFD1CE-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--76DF07CCFC7B4C1BBE69EA17DAFFD1CE-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--76DF07CCFC7B4C1BBE69EA17DAFFD1CE-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--76DF07CCFC7B4C1BBE69EA17DAFFD1CE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--76DF07CCFC7B4C1BBE69EA17DAFFD1CE-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--76DF07CCFC7B4C1BBE69EA17DAFFD1CE-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--76DF07CCFC7B4C1BBE69EA17DAFFD1CE-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--76DF07CCFC7B4C1BBE69EA17DAFFD1CE-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--76DF07CCFC7B4C1BBE69EA17DAFFD1CE--></AD_FIELD>
+
 <!--770167C23FAA77C5E040007F0101517B--><AD_FIELD>
 <!--770167C23FAA77C5E040007F0101517B-->  <AD_FIELD_ID><![CDATA[770167C23FAA77C5E040007F0101517B]]></AD_FIELD_ID>
 <!--770167C23FAA77C5E040007F0101517B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -236815,6 +237645,36 @@
 <!--7949E14F61B34AB79213F80D62676222-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--7949E14F61B34AB79213F80D62676222--></AD_FIELD>
 
+<!--796B5B46ACA74CE9A53A7B49D4FADEA0--><AD_FIELD>
+<!--796B5B46ACA74CE9A53A7B49D4FADEA0-->  <AD_FIELD_ID><![CDATA[796B5B46ACA74CE9A53A7B49D4FADEA0]]></AD_FIELD_ID>
+<!--796B5B46ACA74CE9A53A7B49D4FADEA0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--796B5B46ACA74CE9A53A7B49D4FADEA0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--796B5B46ACA74CE9A53A7B49D4FADEA0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--796B5B46ACA74CE9A53A7B49D4FADEA0-->  <NAME><![CDATA[Aum Quantity]]></NAME>
+<!--796B5B46ACA74CE9A53A7B49D4FADEA0-->  <DESCRIPTION><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></DESCRIPTION>
+<!--796B5B46ACA74CE9A53A7B49D4FADEA0-->  <HELP><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></HELP>
+<!--796B5B46ACA74CE9A53A7B49D4FADEA0-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--796B5B46ACA74CE9A53A7B49D4FADEA0-->  <AD_TAB_ID><![CDATA[616CE914B91B4B878CFC330A170442A4]]></AD_TAB_ID>
+<!--796B5B46ACA74CE9A53A7B49D4FADEA0-->  <AD_COLUMN_ID><![CDATA[6C8B920A688149BC9E6C9747ABB8D133]]></AD_COLUMN_ID>
+<!--796B5B46ACA74CE9A53A7B49D4FADEA0-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--796B5B46ACA74CE9A53A7B49D4FADEA0-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--796B5B46ACA74CE9A53A7B49D4FADEA0-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--796B5B46ACA74CE9A53A7B49D4FADEA0-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--796B5B46ACA74CE9A53A7B49D4FADEA0-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--796B5B46ACA74CE9A53A7B49D4FADEA0-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--796B5B46ACA74CE9A53A7B49D4FADEA0-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--796B5B46ACA74CE9A53A7B49D4FADEA0-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--796B5B46ACA74CE9A53A7B49D4FADEA0-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--796B5B46ACA74CE9A53A7B49D4FADEA0-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--796B5B46ACA74CE9A53A7B49D4FADEA0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--796B5B46ACA74CE9A53A7B49D4FADEA0-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--796B5B46ACA74CE9A53A7B49D4FADEA0-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--796B5B46ACA74CE9A53A7B49D4FADEA0-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--796B5B46ACA74CE9A53A7B49D4FADEA0-->  <ONCHANGEFUNCTION><![CDATA[OB.PROC.CreateLinesOnChangeQuantityAum]]></ONCHANGEFUNCTION>
+<!--796B5B46ACA74CE9A53A7B49D4FADEA0-->  <DISPLAYLOGIC_SERVER><![CDATA[@UomManagement@='Y']]></DISPLAYLOGIC_SERVER>
+<!--796B5B46ACA74CE9A53A7B49D4FADEA0-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--796B5B46ACA74CE9A53A7B49D4FADEA0--></AD_FIELD>
+
 <!--797BE3BA371D46258512632C3A7ADC48--><AD_FIELD>
 <!--797BE3BA371D46258512632C3A7ADC48-->  <AD_FIELD_ID><![CDATA[797BE3BA371D46258512632C3A7ADC48]]></AD_FIELD_ID>
 <!--797BE3BA371D46258512632C3A7ADC48-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -237721,6 +238581,35 @@
 <!--7B63118BA4E6483D8894F3F6290B36F6-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--7B63118BA4E6483D8894F3F6290B36F6--></AD_FIELD>
 
+<!--7B727004361F4AADABCB0F4C489804B4--><AD_FIELD>
+<!--7B727004361F4AADABCB0F4C489804B4-->  <AD_FIELD_ID><![CDATA[7B727004361F4AADABCB0F4C489804B4]]></AD_FIELD_ID>
+<!--7B727004361F4AADABCB0F4C489804B4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7B727004361F4AADABCB0F4C489804B4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7B727004361F4AADABCB0F4C489804B4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7B727004361F4AADABCB0F4C489804B4-->  <NAME><![CDATA[Operative Quantity]]></NAME>
+<!--7B727004361F4AADABCB0F4C489804B4-->  <DESCRIPTION><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></DESCRIPTION>
+<!--7B727004361F4AADABCB0F4C489804B4-->  <HELP><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></HELP>
+<!--7B727004361F4AADABCB0F4C489804B4-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--7B727004361F4AADABCB0F4C489804B4-->  <AD_TAB_ID><![CDATA[B01BFDF1E6B24CF4941807CA7F77A073]]></AD_TAB_ID>
+<!--7B727004361F4AADABCB0F4C489804B4-->  <AD_COLUMN_ID><![CDATA[EC21DC290761445D96F9EAB6740FF9F7]]></AD_COLUMN_ID>
+<!--7B727004361F4AADABCB0F4C489804B4-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--7B727004361F4AADABCB0F4C489804B4-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--7B727004361F4AADABCB0F4C489804B4-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--7B727004361F4AADABCB0F4C489804B4-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--7B727004361F4AADABCB0F4C489804B4-->  <SEQNO><![CDATA[125]]></SEQNO>
+<!--7B727004361F4AADABCB0F4C489804B4-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--7B727004361F4AADABCB0F4C489804B4-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--7B727004361F4AADABCB0F4C489804B4-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7B727004361F4AADABCB0F4C489804B4-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--7B727004361F4AADABCB0F4C489804B4-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--7B727004361F4AADABCB0F4C489804B4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7B727004361F4AADABCB0F4C489804B4-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--7B727004361F4AADABCB0F4C489804B4-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--7B727004361F4AADABCB0F4C489804B4-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--7B727004361F4AADABCB0F4C489804B4-->  <DISPLAYLOGICGRID><![CDATA[OB.PropertyStore.get('UomManagement')='Y']]></DISPLAYLOGICGRID>
+<!--7B727004361F4AADABCB0F4C489804B4-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--7B727004361F4AADABCB0F4C489804B4--></AD_FIELD>
+
 <!--7B7817B12D374682B591FBEFE4731092--><AD_FIELD>
 <!--7B7817B12D374682B591FBEFE4731092-->  <AD_FIELD_ID><![CDATA[7B7817B12D374682B591FBEFE4731092]]></AD_FIELD_ID>
 <!--7B7817B12D374682B591FBEFE4731092-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -241882,6 +242771,37 @@
 <!--7EC3B5CF03739057E040007F010110BF-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--7EC3B5CF03739057E040007F010110BF--></AD_FIELD>
 
+<!--7EC61D3055FC47EE8D3E3CA1E87C2ACA--><AD_FIELD>
+<!--7EC61D3055FC47EE8D3E3CA1E87C2ACA-->  <AD_FIELD_ID><![CDATA[7EC61D3055FC47EE8D3E3CA1E87C2ACA]]></AD_FIELD_ID>
+<!--7EC61D3055FC47EE8D3E3CA1E87C2ACA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7EC61D3055FC47EE8D3E3CA1E87C2ACA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7EC61D3055FC47EE8D3E3CA1E87C2ACA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7EC61D3055FC47EE8D3E3CA1E87C2ACA-->  <NAME><![CDATA[Operative Quantity]]></NAME>
+<!--7EC61D3055FC47EE8D3E3CA1E87C2ACA-->  <DESCRIPTION><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></DESCRIPTION>
+<!--7EC61D3055FC47EE8D3E3CA1E87C2ACA-->  <HELP><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></HELP>
+<!--7EC61D3055FC47EE8D3E3CA1E87C2ACA-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--7EC61D3055FC47EE8D3E3CA1E87C2ACA-->  <AD_TAB_ID><![CDATA[270]]></AD_TAB_ID>
+<!--7EC61D3055FC47EE8D3E3CA1E87C2ACA-->  <AD_COLUMN_ID><![CDATA[3243D34AA7E9477A95A5AFF70824363B]]></AD_COLUMN_ID>
+<!--7EC61D3055FC47EE8D3E3CA1E87C2ACA-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--7EC61D3055FC47EE8D3E3CA1E87C2ACA-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--7EC61D3055FC47EE8D3E3CA1E87C2ACA-->  <DISPLAYLOGIC><![CDATA[@M_Product_Uom_Id@='' & @Financial_Invoice_Line@='N']]></DISPLAYLOGIC>
+<!--7EC61D3055FC47EE8D3E3CA1E87C2ACA-->  <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH>
+<!--7EC61D3055FC47EE8D3E3CA1E87C2ACA-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--7EC61D3055FC47EE8D3E3CA1E87C2ACA-->  <SEQNO><![CDATA[22]]></SEQNO>
+<!--7EC61D3055FC47EE8D3E3CA1E87C2ACA-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--7EC61D3055FC47EE8D3E3CA1E87C2ACA-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--7EC61D3055FC47EE8D3E3CA1E87C2ACA-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7EC61D3055FC47EE8D3E3CA1E87C2ACA-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--7EC61D3055FC47EE8D3E3CA1E87C2ACA-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--7EC61D3055FC47EE8D3E3CA1E87C2ACA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7EC61D3055FC47EE8D3E3CA1E87C2ACA-->  <GRID_SEQNO><![CDATA[22]]></GRID_SEQNO>
+<!--7EC61D3055FC47EE8D3E3CA1E87C2ACA-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--7EC61D3055FC47EE8D3E3CA1E87C2ACA-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--7EC61D3055FC47EE8D3E3CA1E87C2ACA-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--7EC61D3055FC47EE8D3E3CA1E87C2ACA-->  <DISPLAYLOGIC_SERVER><![CDATA[@UomManagement@='Y']]></DISPLAYLOGIC_SERVER>
+<!--7EC61D3055FC47EE8D3E3CA1E87C2ACA-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--7EC61D3055FC47EE8D3E3CA1E87C2ACA--></AD_FIELD>
+
 <!--7ECD822F05DF4FEB98CACB392EB1E726--><AD_FIELD>
 <!--7ECD822F05DF4FEB98CACB392EB1E726-->  <AD_FIELD_ID><![CDATA[7ECD822F05DF4FEB98CACB392EB1E726]]></AD_FIELD_ID>
 <!--7ECD822F05DF4FEB98CACB392EB1E726-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -243126,7 +244046,7 @@
 <!--807015D07BC241389CCD79777F91D613-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--807015D07BC241389CCD79777F91D613-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--807015D07BC241389CCD79777F91D613-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--807015D07BC241389CCD79777F91D613-->  <SEQNO><![CDATA[35]]></SEQNO>
+<!--807015D07BC241389CCD79777F91D613-->  <SEQNO><![CDATA[37]]></SEQNO>
 <!--807015D07BC241389CCD79777F91D613-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--807015D07BC241389CCD79777F91D613-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--807015D07BC241389CCD79777F91D613-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -243840,6 +244760,37 @@
 <!--811D6EDA72F1400DA692E954A9C0CF96-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--811D6EDA72F1400DA692E954A9C0CF96--></AD_FIELD>
 
+<!--8134E8C12F1A4BC0801D3AAA2453DBBD--><AD_FIELD>
+<!--8134E8C12F1A4BC0801D3AAA2453DBBD-->  <AD_FIELD_ID><![CDATA[8134E8C12F1A4BC0801D3AAA2453DBBD]]></AD_FIELD_ID>
+<!--8134E8C12F1A4BC0801D3AAA2453DBBD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8134E8C12F1A4BC0801D3AAA2453DBBD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8134E8C12F1A4BC0801D3AAA2453DBBD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8134E8C12F1A4BC0801D3AAA2453DBBD-->  <NAME><![CDATA[Alternative UOM]]></NAME>
+<!--8134E8C12F1A4BC0801D3AAA2453DBBD-->  <DESCRIPTION><![CDATA[A non monetary unit of measure.]]></DESCRIPTION>
+<!--8134E8C12F1A4BC0801D3AAA2453DBBD-->  <HELP><![CDATA[The Alternative UOM defines a unique non monetary unit of measure]]></HELP>
+<!--8134E8C12F1A4BC0801D3AAA2453DBBD-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--8134E8C12F1A4BC0801D3AAA2453DBBD-->  <AD_TAB_ID><![CDATA[800251]]></AD_TAB_ID>
+<!--8134E8C12F1A4BC0801D3AAA2453DBBD-->  <AD_COLUMN_ID><![CDATA[FCC18B6E98564CFB97CAF1EF5E983035]]></AD_COLUMN_ID>
+<!--8134E8C12F1A4BC0801D3AAA2453DBBD-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--8134E8C12F1A4BC0801D3AAA2453DBBD-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--8134E8C12F1A4BC0801D3AAA2453DBBD-->  <DISPLAYLOGIC><![CDATA[@M_Product_Uom_Id@='']]></DISPLAYLOGIC>
+<!--8134E8C12F1A4BC0801D3AAA2453DBBD-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--8134E8C12F1A4BC0801D3AAA2453DBBD-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--8134E8C12F1A4BC0801D3AAA2453DBBD-->  <SEQNO><![CDATA[45]]></SEQNO>
+<!--8134E8C12F1A4BC0801D3AAA2453DBBD-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--8134E8C12F1A4BC0801D3AAA2453DBBD-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--8134E8C12F1A4BC0801D3AAA2453DBBD-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--8134E8C12F1A4BC0801D3AAA2453DBBD-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--8134E8C12F1A4BC0801D3AAA2453DBBD-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--8134E8C12F1A4BC0801D3AAA2453DBBD-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8134E8C12F1A4BC0801D3AAA2453DBBD-->  <GRID_SEQNO><![CDATA[79]]></GRID_SEQNO>
+<!--8134E8C12F1A4BC0801D3AAA2453DBBD-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--8134E8C12F1A4BC0801D3AAA2453DBBD-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--8134E8C12F1A4BC0801D3AAA2453DBBD-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--8134E8C12F1A4BC0801D3AAA2453DBBD-->  <DISPLAYLOGIC_SERVER><![CDATA[@UomManagement@='Y']]></DISPLAYLOGIC_SERVER>
+<!--8134E8C12F1A4BC0801D3AAA2453DBBD-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--8134E8C12F1A4BC0801D3AAA2453DBBD--></AD_FIELD>
+
 <!--81725CBFCA8D4659A58B4A8D6BDDB9AB--><AD_FIELD>
 <!--81725CBFCA8D4659A58B4A8D6BDDB9AB-->  <AD_FIELD_ID><![CDATA[81725CBFCA8D4659A58B4A8D6BDDB9AB]]></AD_FIELD_ID>
 <!--81725CBFCA8D4659A58B4A8D6BDDB9AB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -247585,6 +248536,37 @@
 <!--84F753945A21484FBFC9B0AE5662AFEF-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--84F753945A21484FBFC9B0AE5662AFEF--></AD_FIELD>
 
+<!--8521EC9FCDD64FA380ACBD25CC9026AB--><AD_FIELD>
+<!--8521EC9FCDD64FA380ACBD25CC9026AB-->  <AD_FIELD_ID><![CDATA[8521EC9FCDD64FA380ACBD25CC9026AB]]></AD_FIELD_ID>
+<!--8521EC9FCDD64FA380ACBD25CC9026AB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8521EC9FCDD64FA380ACBD25CC9026AB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8521EC9FCDD64FA380ACBD25CC9026AB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8521EC9FCDD64FA380ACBD25CC9026AB-->  <NAME><![CDATA[Alternative UOM]]></NAME>
+<!--8521EC9FCDD64FA380ACBD25CC9026AB-->  <DESCRIPTION><![CDATA[A non monetary unit of measure.]]></DESCRIPTION>
+<!--8521EC9FCDD64FA380ACBD25CC9026AB-->  <HELP><![CDATA[The Alternative UOM defines a unique non monetary unit of measure]]></HELP>
+<!--8521EC9FCDD64FA380ACBD25CC9026AB-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--8521EC9FCDD64FA380ACBD25CC9026AB-->  <AD_TAB_ID><![CDATA[E2F36B4352DA4CA8BE324DC428BEE358]]></AD_TAB_ID>
+<!--8521EC9FCDD64FA380ACBD25CC9026AB-->  <AD_COLUMN_ID><![CDATA[986686B366B044BD8C1E27B729EF9ABB]]></AD_COLUMN_ID>
+<!--8521EC9FCDD64FA380ACBD25CC9026AB-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--8521EC9FCDD64FA380ACBD25CC9026AB-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--8521EC9FCDD64FA380ACBD25CC9026AB-->  <DISPLAYLOGIC><![CDATA[@M_Product_Uom_Id@='']]></DISPLAYLOGIC>
+<!--8521EC9FCDD64FA380ACBD25CC9026AB-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--8521EC9FCDD64FA380ACBD25CC9026AB-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--8521EC9FCDD64FA380ACBD25CC9026AB-->  <SEQNO><![CDATA[25]]></SEQNO>
+<!--8521EC9FCDD64FA380ACBD25CC9026AB-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--8521EC9FCDD64FA380ACBD25CC9026AB-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--8521EC9FCDD64FA380ACBD25CC9026AB-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--8521EC9FCDD64FA380ACBD25CC9026AB-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--8521EC9FCDD64FA380ACBD25CC9026AB-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--8521EC9FCDD64FA380ACBD25CC9026AB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8521EC9FCDD64FA380ACBD25CC9026AB-->  <GRID_SEQNO><![CDATA[29]]></GRID_SEQNO>
+<!--8521EC9FCDD64FA380ACBD25CC9026AB-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--8521EC9FCDD64FA380ACBD25CC9026AB-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--8521EC9FCDD64FA380ACBD25CC9026AB-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--8521EC9FCDD64FA380ACBD25CC9026AB-->  <DISPLAYLOGIC_SERVER><![CDATA[@UomManagement@='Y']]></DISPLAYLOGIC_SERVER>
+<!--8521EC9FCDD64FA380ACBD25CC9026AB-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--8521EC9FCDD64FA380ACBD25CC9026AB--></AD_FIELD>
+
 <!--8538F64419FD9963E040007F01015494--><AD_FIELD>
 <!--8538F64419FD9963E040007F01015494-->  <AD_FIELD_ID><![CDATA[8538F64419FD9963E040007F01015494]]></AD_FIELD_ID>
 <!--8538F64419FD9963E040007F01015494-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -255495,6 +256477,37 @@
 <!--91F596DF68F18B97E040007F010051BE-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--91F596DF68F18B97E040007F010051BE--></AD_FIELD>
 
+<!--91F7C7DB7CCB486D909BCF70D484B6E1--><AD_FIELD>
+<!--91F7C7DB7CCB486D909BCF70D484B6E1-->  <AD_FIELD_ID><![CDATA[91F7C7DB7CCB486D909BCF70D484B6E1]]></AD_FIELD_ID>
+<!--91F7C7DB7CCB486D909BCF70D484B6E1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--91F7C7DB7CCB486D909BCF70D484B6E1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--91F7C7DB7CCB486D909BCF70D484B6E1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--91F7C7DB7CCB486D909BCF70D484B6E1-->  <NAME><![CDATA[Alternative UOM]]></NAME>
+<!--91F7C7DB7CCB486D909BCF70D484B6E1-->  <DESCRIPTION><![CDATA[A non monetary unit of measure.]]></DESCRIPTION>
+<!--91F7C7DB7CCB486D909BCF70D484B6E1-->  <HELP><![CDATA[The Alternative UOM defines a unique non monetary unit of measure]]></HELP>
+<!--91F7C7DB7CCB486D909BCF70D484B6E1-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--91F7C7DB7CCB486D909BCF70D484B6E1-->  <AD_TAB_ID><![CDATA[AF4090093D471431E040007F010048A5]]></AD_TAB_ID>
+<!--91F7C7DB7CCB486D909BCF70D484B6E1-->  <AD_COLUMN_ID><![CDATA[986686B366B044BD8C1E27B729EF9ABB]]></AD_COLUMN_ID>
+<!--91F7C7DB7CCB486D909BCF70D484B6E1-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--91F7C7DB7CCB486D909BCF70D484B6E1-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--91F7C7DB7CCB486D909BCF70D484B6E1-->  <DISPLAYLOGIC><![CDATA[@M_Product_Uom_Id@='']]></DISPLAYLOGIC>
+<!--91F7C7DB7CCB486D909BCF70D484B6E1-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--91F7C7DB7CCB486D909BCF70D484B6E1-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--91F7C7DB7CCB486D909BCF70D484B6E1-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--91F7C7DB7CCB486D909BCF70D484B6E1-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--91F7C7DB7CCB486D909BCF70D484B6E1-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--91F7C7DB7CCB486D909BCF70D484B6E1-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--91F7C7DB7CCB486D909BCF70D484B6E1-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--91F7C7DB7CCB486D909BCF70D484B6E1-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--91F7C7DB7CCB486D909BCF70D484B6E1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--91F7C7DB7CCB486D909BCF70D484B6E1-->  <GRID_SEQNO><![CDATA[29]]></GRID_SEQNO>
+<!--91F7C7DB7CCB486D909BCF70D484B6E1-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--91F7C7DB7CCB486D909BCF70D484B6E1-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--91F7C7DB7CCB486D909BCF70D484B6E1-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--91F7C7DB7CCB486D909BCF70D484B6E1-->  <DISPLAYLOGIC_SERVER><![CDATA[@UomManagement@='Y']]></DISPLAYLOGIC_SERVER>
+<!--91F7C7DB7CCB486D909BCF70D484B6E1-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--91F7C7DB7CCB486D909BCF70D484B6E1--></AD_FIELD>
+
 <!--91F972D6CBA2431F8BE14BC10C968330--><AD_FIELD>
 <!--91F972D6CBA2431F8BE14BC10C968330-->  <AD_FIELD_ID><![CDATA[91F972D6CBA2431F8BE14BC10C968330]]></AD_FIELD_ID>
 <!--91F972D6CBA2431F8BE14BC10C968330-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -256314,6 +257327,37 @@
 <!--938460E8002D4E12BF577D62F003F5A2-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--938460E8002D4E12BF577D62F003F5A2--></AD_FIELD>
 
+<!--938A8C6D18AF455C942989A003D355AB--><AD_FIELD>
+<!--938A8C6D18AF455C942989A003D355AB-->  <AD_FIELD_ID><![CDATA[938A8C6D18AF455C942989A003D355AB]]></AD_FIELD_ID>
+<!--938A8C6D18AF455C942989A003D355AB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--938A8C6D18AF455C942989A003D355AB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--938A8C6D18AF455C942989A003D355AB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--938A8C6D18AF455C942989A003D355AB-->  <NAME><![CDATA[Alternative UOM]]></NAME>
+<!--938A8C6D18AF455C942989A003D355AB-->  <DESCRIPTION><![CDATA[A non monetary unit of measure.]]></DESCRIPTION>
+<!--938A8C6D18AF455C942989A003D355AB-->  <HELP><![CDATA[The Alternative UOM defines a unique non monetary unit of measure]]></HELP>
+<!--938A8C6D18AF455C942989A003D355AB-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--938A8C6D18AF455C942989A003D355AB-->  <AD_TAB_ID><![CDATA[CF6D6C7B85EB473CB88E757E14D1D022]]></AD_TAB_ID>
+<!--938A8C6D18AF455C942989A003D355AB-->  <AD_COLUMN_ID><![CDATA[75E9ED83A89C4CA28416B0F0220431C4]]></AD_COLUMN_ID>
+<!--938A8C6D18AF455C942989A003D355AB-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--938A8C6D18AF455C942989A003D355AB-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--938A8C6D18AF455C942989A003D355AB-->  <DISPLAYLOGIC><![CDATA[@M_Product_Uom_Id@='']]></DISPLAYLOGIC>
+<!--938A8C6D18AF455C942989A003D355AB-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--938A8C6D18AF455C942989A003D355AB-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--938A8C6D18AF455C942989A003D355AB-->  <SEQNO><![CDATA[38]]></SEQNO>
+<!--938A8C6D18AF455C942989A003D355AB-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--938A8C6D18AF455C942989A003D355AB-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--938A8C6D18AF455C942989A003D355AB-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--938A8C6D18AF455C942989A003D355AB-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--938A8C6D18AF455C942989A003D355AB-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--938A8C6D18AF455C942989A003D355AB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--938A8C6D18AF455C942989A003D355AB-->  <GRID_SEQNO><![CDATA[29]]></GRID_SEQNO>
+<!--938A8C6D18AF455C942989A003D355AB-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--938A8C6D18AF455C942989A003D355AB-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--938A8C6D18AF455C942989A003D355AB-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--938A8C6D18AF455C942989A003D355AB-->  <DISPLAYLOGIC_SERVER><![CDATA[@UomManagement@='Y']]></DISPLAYLOGIC_SERVER>
+<!--938A8C6D18AF455C942989A003D355AB-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--938A8C6D18AF455C942989A003D355AB--></AD_FIELD>
+
 <!--9397E028904B4B43E040007F0100749D--><AD_FIELD>
 <!--9397E028904B4B43E040007F0100749D-->  <AD_FIELD_ID><![CDATA[9397E028904B4B43E040007F0100749D]]></AD_FIELD_ID>
 <!--9397E028904B4B43E040007F0100749D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -256342,6 +257386,38 @@
 <!--9397E028904B4B43E040007F0100749D-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--9397E028904B4B43E040007F0100749D--></AD_FIELD>
 
+<!--93B5A7F711C34042B8706D94C96BDEDE--><AD_FIELD>
+<!--93B5A7F711C34042B8706D94C96BDEDE-->  <AD_FIELD_ID><![CDATA[93B5A7F711C34042B8706D94C96BDEDE]]></AD_FIELD_ID>
+<!--93B5A7F711C34042B8706D94C96BDEDE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--93B5A7F711C34042B8706D94C96BDEDE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--93B5A7F711C34042B8706D94C96BDEDE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--93B5A7F711C34042B8706D94C96BDEDE-->  <NAME><![CDATA[Operative Quantity]]></NAME>
+<!--93B5A7F711C34042B8706D94C96BDEDE-->  <DESCRIPTION><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></DESCRIPTION>
+<!--93B5A7F711C34042B8706D94C96BDEDE-->  <HELP><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></HELP>
+<!--93B5A7F711C34042B8706D94C96BDEDE-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--93B5A7F711C34042B8706D94C96BDEDE-->  <AD_TAB_ID><![CDATA[387B6179438D4C4CB40769A77F4C304C]]></AD_TAB_ID>
+<!--93B5A7F711C34042B8706D94C96BDEDE-->  <AD_COLUMN_ID><![CDATA[BAA3518A49E842DFB007FC6C2BDDCE64]]></AD_COLUMN_ID>
+<!--93B5A7F711C34042B8706D94C96BDEDE-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--93B5A7F711C34042B8706D94C96BDEDE-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--93B5A7F711C34042B8706D94C96BDEDE-->  <DISPLAYLOGIC><![CDATA[@M_Product_Uom_Id@='']]></DISPLAYLOGIC>
+<!--93B5A7F711C34042B8706D94C96BDEDE-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
+<!--93B5A7F711C34042B8706D94C96BDEDE-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--93B5A7F711C34042B8706D94C96BDEDE-->  <SEQNO><![CDATA[33]]></SEQNO>
+<!--93B5A7F711C34042B8706D94C96BDEDE-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--93B5A7F711C34042B8706D94C96BDEDE-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--93B5A7F711C34042B8706D94C96BDEDE-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--93B5A7F711C34042B8706D94C96BDEDE-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--93B5A7F711C34042B8706D94C96BDEDE-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--93B5A7F711C34042B8706D94C96BDEDE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--93B5A7F711C34042B8706D94C96BDEDE-->  <GRID_SEQNO><![CDATA[38]]></GRID_SEQNO>
+<!--93B5A7F711C34042B8706D94C96BDEDE-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--93B5A7F711C34042B8706D94C96BDEDE-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--93B5A7F711C34042B8706D94C96BDEDE-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--93B5A7F711C34042B8706D94C96BDEDE-->  <CLIENTCLASS><![CDATA[OBTruncAddMinusDisplay]]></CLIENTCLASS>
+<!--93B5A7F711C34042B8706D94C96BDEDE-->  <DISPLAYLOGIC_SERVER><![CDATA[@UomManagement@='Y']]></DISPLAYLOGIC_SERVER>
+<!--93B5A7F711C34042B8706D94C96BDEDE-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--93B5A7F711C34042B8706D94C96BDEDE--></AD_FIELD>
+
 <!--94198F3D4AD1462C9871CED2CA14CA21--><AD_FIELD>
 <!--94198F3D4AD1462C9871CED2CA14CA21-->  <AD_FIELD_ID><![CDATA[94198F3D4AD1462C9871CED2CA14CA21]]></AD_FIELD_ID>
 <!--94198F3D4AD1462C9871CED2CA14CA21-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -259100,6 +260176,38 @@
 <!--9A7EE4DD1D984E29A587E13DFD92BC55-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--9A7EE4DD1D984E29A587E13DFD92BC55--></AD_FIELD>
 
+<!--9A7EF51748574331A7D4DF0AD6E170F2--><AD_FIELD>
+<!--9A7EF51748574331A7D4DF0AD6E170F2-->  <AD_FIELD_ID><![CDATA[9A7EF51748574331A7D4DF0AD6E170F2]]></AD_FIELD_ID>
+<!--9A7EF51748574331A7D4DF0AD6E170F2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9A7EF51748574331A7D4DF0AD6E170F2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9A7EF51748574331A7D4DF0AD6E170F2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9A7EF51748574331A7D4DF0AD6E170F2-->  <NAME><![CDATA[Operative Quantity]]></NAME>
+<!--9A7EF51748574331A7D4DF0AD6E170F2-->  <DESCRIPTION><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></DESCRIPTION>
+<!--9A7EF51748574331A7D4DF0AD6E170F2-->  <HELP><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></HELP>
+<!--9A7EF51748574331A7D4DF0AD6E170F2-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--9A7EF51748574331A7D4DF0AD6E170F2-->  <AD_TAB_ID><![CDATA[AF4090093D471431E040007F010048A5]]></AD_TAB_ID>
+<!--9A7EF51748574331A7D4DF0AD6E170F2-->  <AD_COLUMN_ID><![CDATA[BAA3518A49E842DFB007FC6C2BDDCE64]]></AD_COLUMN_ID>
+<!--9A7EF51748574331A7D4DF0AD6E170F2-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--9A7EF51748574331A7D4DF0AD6E170F2-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--9A7EF51748574331A7D4DF0AD6E170F2-->  <DISPLAYLOGIC><![CDATA[@M_Product_Uom_Id@='']]></DISPLAYLOGIC>
+<!--9A7EF51748574331A7D4DF0AD6E170F2-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
+<!--9A7EF51748574331A7D4DF0AD6E170F2-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--9A7EF51748574331A7D4DF0AD6E170F2-->  <SEQNO><![CDATA[35]]></SEQNO>
+<!--9A7EF51748574331A7D4DF0AD6E170F2-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--9A7EF51748574331A7D4DF0AD6E170F2-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--9A7EF51748574331A7D4DF0AD6E170F2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9A7EF51748574331A7D4DF0AD6E170F2-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--9A7EF51748574331A7D4DF0AD6E170F2-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--9A7EF51748574331A7D4DF0AD6E170F2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9A7EF51748574331A7D4DF0AD6E170F2-->  <GRID_SEQNO><![CDATA[28]]></GRID_SEQNO>
+<!--9A7EF51748574331A7D4DF0AD6E170F2-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--9A7EF51748574331A7D4DF0AD6E170F2-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--9A7EF51748574331A7D4DF0AD6E170F2-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--9A7EF51748574331A7D4DF0AD6E170F2-->  <CLIENTCLASS><![CDATA[OBTruncAddMinusDisplay]]></CLIENTCLASS>
+<!--9A7EF51748574331A7D4DF0AD6E170F2-->  <DISPLAYLOGIC_SERVER><![CDATA[@UomManagement@='Y']]></DISPLAYLOGIC_SERVER>
+<!--9A7EF51748574331A7D4DF0AD6E170F2-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--9A7EF51748574331A7D4DF0AD6E170F2--></AD_FIELD>
+
 <!--9A837839E0E349FDB5D9C824B9F3B2E3--><AD_FIELD>
 <!--9A837839E0E349FDB5D9C824B9F3B2E3-->  <AD_FIELD_ID><![CDATA[9A837839E0E349FDB5D9C824B9F3B2E3]]></AD_FIELD_ID>
 <!--9A837839E0E349FDB5D9C824B9F3B2E3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -262626,6 +263734,34 @@
 <!--A29FD04F1E93406A8DB15BC680E9571B-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--A29FD04F1E93406A8DB15BC680E9571B--></AD_FIELD>
 
+<!--A2C76F72C8D34D2C896192A2A7D5A1F3--><AD_FIELD>
+<!--A2C76F72C8D34D2C896192A2A7D5A1F3-->  <AD_FIELD_ID><![CDATA[A2C76F72C8D34D2C896192A2A7D5A1F3]]></AD_FIELD_ID>
+<!--A2C76F72C8D34D2C896192A2A7D5A1F3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A2C76F72C8D34D2C896192A2A7D5A1F3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A2C76F72C8D34D2C896192A2A7D5A1F3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A2C76F72C8D34D2C896192A2A7D5A1F3-->  <NAME><![CDATA[Gtin]]></NAME>
+<!--A2C76F72C8D34D2C896192A2A7D5A1F3-->  <DESCRIPTION><![CDATA[The GTIN is a globally unique 14-digit number used to identify trade items, products, or services]]></DESCRIPTION>
+<!--A2C76F72C8D34D2C896192A2A7D5A1F3-->  <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>
+<!--A2C76F72C8D34D2C896192A2A7D5A1F3-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--A2C76F72C8D34D2C896192A2A7D5A1F3-->  <AD_TAB_ID><![CDATA[A92960D20BB64BBB9C4E88FF58991D6F]]></AD_TAB_ID>
+<!--A2C76F72C8D34D2C896192A2A7D5A1F3-->  <AD_COLUMN_ID><![CDATA[0A876947058D449FBA2EC32DB0893517]]></AD_COLUMN_ID>
+<!--A2C76F72C8D34D2C896192A2A7D5A1F3-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--A2C76F72C8D34D2C896192A2A7D5A1F3-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--A2C76F72C8D34D2C896192A2A7D5A1F3-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
+<!--A2C76F72C8D34D2C896192A2A7D5A1F3-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--A2C76F72C8D34D2C896192A2A7D5A1F3-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--A2C76F72C8D34D2C896192A2A7D5A1F3-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--A2C76F72C8D34D2C896192A2A7D5A1F3-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--A2C76F72C8D34D2C896192A2A7D5A1F3-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A2C76F72C8D34D2C896192A2A7D5A1F3-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--A2C76F72C8D34D2C896192A2A7D5A1F3-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--A2C76F72C8D34D2C896192A2A7D5A1F3-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A2C76F72C8D34D2C896192A2A7D5A1F3-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--A2C76F72C8D34D2C896192A2A7D5A1F3-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--A2C76F72C8D34D2C896192A2A7D5A1F3-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--A2C76F72C8D34D2C896192A2A7D5A1F3-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--A2C76F72C8D34D2C896192A2A7D5A1F3--></AD_FIELD>
+
 <!--A2F9D04C36A64FC293128875629FEAF9--><AD_FIELD>
 <!--A2F9D04C36A64FC293128875629FEAF9-->  <AD_FIELD_ID><![CDATA[A2F9D04C36A64FC293128875629FEAF9]]></AD_FIELD_ID>
 <!--A2F9D04C36A64FC293128875629FEAF9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -262790,6 +263926,34 @@
 <!--A36648F42492464FAE65B6A693043951-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--A36648F42492464FAE65B6A693043951--></AD_FIELD>
 
+<!--A38BA8ECD09B453CA01EFE870627B4F6--><AD_FIELD>
+<!--A38BA8ECD09B453CA01EFE870627B4F6-->  <AD_FIELD_ID><![CDATA[A38BA8ECD09B453CA01EFE870627B4F6]]></AD_FIELD_ID>
+<!--A38BA8ECD09B453CA01EFE870627B4F6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A38BA8ECD09B453CA01EFE870627B4F6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A38BA8ECD09B453CA01EFE870627B4F6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A38BA8ECD09B453CA01EFE870627B4F6-->  <NAME><![CDATA[Product]]></NAME>
+<!--A38BA8ECD09B453CA01EFE870627B4F6-->  <DESCRIPTION><![CDATA[An item produced by a process.]]></DESCRIPTION>
+<!--A38BA8ECD09B453CA01EFE870627B4F6-->  <HELP><![CDATA[Identifies an item which is either purchased or sold in this organization.]]></HELP>
+<!--A38BA8ECD09B453CA01EFE870627B4F6-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--A38BA8ECD09B453CA01EFE870627B4F6-->  <AD_TAB_ID><![CDATA[A92960D20BB64BBB9C4E88FF58991D6F]]></AD_TAB_ID>
+<!--A38BA8ECD09B453CA01EFE870627B4F6-->  <AD_COLUMN_ID><![CDATA[A21157A9F702436D861756568E45521E]]></AD_COLUMN_ID>
+<!--A38BA8ECD09B453CA01EFE870627B4F6-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--A38BA8ECD09B453CA01EFE870627B4F6-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--A38BA8ECD09B453CA01EFE870627B4F6-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--A38BA8ECD09B453CA01EFE870627B4F6-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--A38BA8ECD09B453CA01EFE870627B4F6-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--A38BA8ECD09B453CA01EFE870627B4F6-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--A38BA8ECD09B453CA01EFE870627B4F6-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--A38BA8ECD09B453CA01EFE870627B4F6-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A38BA8ECD09B453CA01EFE870627B4F6-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--A38BA8ECD09B453CA01EFE870627B4F6-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--A38BA8ECD09B453CA01EFE870627B4F6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A38BA8ECD09B453CA01EFE870627B4F6-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--A38BA8ECD09B453CA01EFE870627B4F6-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--A38BA8ECD09B453CA01EFE870627B4F6-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--A38BA8ECD09B453CA01EFE870627B4F6-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--A38BA8ECD09B453CA01EFE870627B4F6--></AD_FIELD>
+
 <!--A39E969B0D01C460E040007F01001F53--><AD_FIELD>
 <!--A39E969B0D01C460E040007F01001F53-->  <AD_FIELD_ID><![CDATA[A39E969B0D01C460E040007F01001F53]]></AD_FIELD_ID>
 <!--A39E969B0D01C460E040007F01001F53-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -266375,6 +267539,31 @@
 <!--AD0EE5FEDBAB40F78E8499582B685477-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--AD0EE5FEDBAB40F78E8499582B685477--></AD_FIELD>
 
+<!--AD1BCCA59A31439D99D52E44202344C8--><AD_FIELD>
+<!--AD1BCCA59A31439D99D52E44202344C8-->  <AD_FIELD_ID><![CDATA[AD1BCCA59A31439D99D52E44202344C8]]></AD_FIELD_ID>
+<!--AD1BCCA59A31439D99D52E44202344C8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AD1BCCA59A31439D99D52E44202344C8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AD1BCCA59A31439D99D52E44202344C8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AD1BCCA59A31439D99D52E44202344C8-->  <NAME><![CDATA[M_Product_Aum_ID]]></NAME>
+<!--AD1BCCA59A31439D99D52E44202344C8-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--AD1BCCA59A31439D99D52E44202344C8-->  <AD_TAB_ID><![CDATA[A92960D20BB64BBB9C4E88FF58991D6F]]></AD_TAB_ID>
+<!--AD1BCCA59A31439D99D52E44202344C8-->  <AD_COLUMN_ID><![CDATA[783365B75F5447609FC4DD24BC432947]]></AD_COLUMN_ID>
+<!--AD1BCCA59A31439D99D52E44202344C8-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--AD1BCCA59A31439D99D52E44202344C8-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--AD1BCCA59A31439D99D52E44202344C8-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--AD1BCCA59A31439D99D52E44202344C8-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--AD1BCCA59A31439D99D52E44202344C8-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--AD1BCCA59A31439D99D52E44202344C8-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--AD1BCCA59A31439D99D52E44202344C8-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--AD1BCCA59A31439D99D52E44202344C8-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--AD1BCCA59A31439D99D52E44202344C8-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--AD1BCCA59A31439D99D52E44202344C8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--AD1BCCA59A31439D99D52E44202344C8-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--AD1BCCA59A31439D99D52E44202344C8-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--AD1BCCA59A31439D99D52E44202344C8-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--AD1BCCA59A31439D99D52E44202344C8-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--AD1BCCA59A31439D99D52E44202344C8--></AD_FIELD>
+
 <!--AD1E6E66B44C49FBAA59926797DED13C--><AD_FIELD>
 <!--AD1E6E66B44C49FBAA59926797DED13C-->  <AD_FIELD_ID><![CDATA[AD1E6E66B44C49FBAA59926797DED13C]]></AD_FIELD_ID>
 <!--AD1E6E66B44C49FBAA59926797DED13C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -270249,7 +271438,7 @@
 <!--AF4090093D581431E040007F010048A5-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--AF4090093D581431E040007F010048A5-->  <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
 <!--AF4090093D581431E040007F010048A5-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--AF4090093D581431E040007F010048A5-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--AF4090093D581431E040007F010048A5-->  <SEQNO><![CDATA[45]]></SEQNO>
 <!--AF4090093D581431E040007F010048A5-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--AF4090093D581431E040007F010048A5-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--AF4090093D581431E040007F010048A5-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -270306,7 +271495,7 @@
 <!--AF4090093D5A1431E040007F010048A5-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--AF4090093D5A1431E040007F010048A5-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--AF4090093D5A1431E040007F010048A5-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--AF4090093D5A1431E040007F010048A5-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--AF4090093D5A1431E040007F010048A5-->  <SEQNO><![CDATA[42]]></SEQNO>
 <!--AF4090093D5A1431E040007F010048A5-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--AF4090093D5A1431E040007F010048A5-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--AF4090093D5A1431E040007F010048A5-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -273981,7 +275170,7 @@
 <!--B0D4715F1147E93FE040007F01005164-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--B0D4715F1147E93FE040007F01005164-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--B0D4715F1147E93FE040007F01005164-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--B0D4715F1147E93FE040007F01005164-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
+<!--B0D4715F1147E93FE040007F01005164-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
 <!--B0D4715F1147E93FE040007F01005164-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--B0D4715F1147E93FE040007F01005164-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--B0D4715F1147E93FE040007F01005164-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -274066,41 +275255,13 @@
 <!--B0D4715F114AE93FE040007F01005164-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--B0D4715F114AE93FE040007F01005164-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--B0D4715F114AE93FE040007F01005164-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--B0D4715F114AE93FE040007F01005164-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
+<!--B0D4715F114AE93FE040007F01005164-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
 <!--B0D4715F114AE93FE040007F01005164-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--B0D4715F114AE93FE040007F01005164-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--B0D4715F114AE93FE040007F01005164-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
 <!--B0D4715F114AE93FE040007F01005164-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--B0D4715F114AE93FE040007F01005164--></AD_FIELD>
 
-<!--B0D4715F114BE93FE040007F01005164--><AD_FIELD>
-<!--B0D4715F114BE93FE040007F01005164-->  <AD_FIELD_ID><![CDATA[B0D4715F114BE93FE040007F01005164]]></AD_FIELD_ID>
-<!--B0D4715F114BE93FE040007F01005164-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--B0D4715F114BE93FE040007F01005164-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--B0D4715F114BE93FE040007F01005164-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B0D4715F114BE93FE040007F01005164-->  <NAME><![CDATA[Receiving]]></NAME>
-<!--B0D4715F114BE93FE040007F01005164-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--B0D4715F114BE93FE040007F01005164-->  <AD_TAB_ID><![CDATA[FEFB495F59894AD6A1163D13ABE88833]]></AD_TAB_ID>
-<!--B0D4715F114BE93FE040007F01005164-->  <AD_COLUMN_ID><![CDATA[B0D44F14A9F2533DE040007F01004FD0]]></AD_COLUMN_ID>
-<!--B0D4715F114BE93FE040007F01005164-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--B0D4715F114BE93FE040007F01005164-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--B0D4715F114BE93FE040007F01005164-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
-<!--B0D4715F114BE93FE040007F01005164-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--B0D4715F114BE93FE040007F01005164-->  <SEQNO><![CDATA[70]]></SEQNO>
-<!--B0D4715F114BE93FE040007F01005164-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--B0D4715F114BE93FE040007F01005164-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--B0D4715F114BE93FE040007F01005164-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--B0D4715F114BE93FE040007F01005164-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
-<!--B0D4715F114BE93FE040007F01005164-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--B0D4715F114BE93FE040007F01005164-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--B0D4715F114BE93FE040007F01005164-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
-<!--B0D4715F114BE93FE040007F01005164-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--B0D4715F114BE93FE040007F01005164-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--B0D4715F114BE93FE040007F01005164-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--B0D4715F114BE93FE040007F01005164-->  <EM_OBUIAPP_VALIDATOR><![CDATA[OB.RM.RMReceiptQtyValidate]]></EM_OBUIAPP_VALIDATOR>
-<!--B0D4715F114BE93FE040007F01005164-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--B0D4715F114BE93FE040007F01005164--></AD_FIELD>
-
 <!--B0D4715F114DE93FE040007F01005164--><AD_FIELD>
 <!--B0D4715F114DE93FE040007F01005164-->  <AD_FIELD_ID><![CDATA[B0D4715F114DE93FE040007F01005164]]></AD_FIELD_ID>
 <!--B0D4715F114DE93FE040007F01005164-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -274123,7 +275284,7 @@
 <!--B0D4715F114DE93FE040007F01005164-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--B0D4715F114DE93FE040007F01005164-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--B0D4715F114DE93FE040007F01005164-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--B0D4715F114DE93FE040007F01005164-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
+<!--B0D4715F114DE93FE040007F01005164-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
 <!--B0D4715F114DE93FE040007F01005164-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--B0D4715F114DE93FE040007F01005164-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--B0D4715F114DE93FE040007F01005164-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -281105,7 +282266,7 @@
 <!--BBC32E30B77E4EBCA3A8837AD4D2F01C-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
 <!--BBC32E30B77E4EBCA3A8837AD4D2F01C-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
 <!--BBC32E30B77E4EBCA3A8837AD4D2F01C-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--BBC32E30B77E4EBCA3A8837AD4D2F01C-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--BBC32E30B77E4EBCA3A8837AD4D2F01C-->  <SEQNO><![CDATA[35]]></SEQNO>
 <!--BBC32E30B77E4EBCA3A8837AD4D2F01C-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--BBC32E30B77E4EBCA3A8837AD4D2F01C-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--BBC32E30B77E4EBCA3A8837AD4D2F01C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -282292,6 +283453,36 @@
 <!--BEAEE8F7263C47798AD3C4DC486893BD-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--BEAEE8F7263C47798AD3C4DC486893BD--></AD_FIELD>
 
+<!--BEAFA538F5B940E38870B6E202848CC3--><AD_FIELD>
+<!--BEAFA538F5B940E38870B6E202848CC3-->  <AD_FIELD_ID><![CDATA[BEAFA538F5B940E38870B6E202848CC3]]></AD_FIELD_ID>
+<!--BEAFA538F5B940E38870B6E202848CC3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BEAFA538F5B940E38870B6E202848CC3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BEAFA538F5B940E38870B6E202848CC3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BEAFA538F5B940E38870B6E202848CC3-->  <NAME><![CDATA[Returned UOM]]></NAME>
+<!--BEAFA538F5B940E38870B6E202848CC3-->  <DESCRIPTION><![CDATA[Returned UOM]]></DESCRIPTION>
+<!--BEAFA538F5B940E38870B6E202848CC3-->  <HELP><![CDATA[Returned UOM]]></HELP>
+<!--BEAFA538F5B940E38870B6E202848CC3-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--BEAFA538F5B940E38870B6E202848CC3-->  <AD_TAB_ID><![CDATA[B01BFDF1E6B24CF4941807CA7F77A073]]></AD_TAB_ID>
+<!--BEAFA538F5B940E38870B6E202848CC3-->  <AD_COLUMN_ID><![CDATA[8E9F151AC731431FB1183BFA6C2E86D8]]></AD_COLUMN_ID>
+<!--BEAFA538F5B940E38870B6E202848CC3-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--BEAFA538F5B940E38870B6E202848CC3-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--BEAFA538F5B940E38870B6E202848CC3-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--BEAFA538F5B940E38870B6E202848CC3-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--BEAFA538F5B940E38870B6E202848CC3-->  <SEQNO><![CDATA[135]]></SEQNO>
+<!--BEAFA538F5B940E38870B6E202848CC3-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--BEAFA538F5B940E38870B6E202848CC3-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--BEAFA538F5B940E38870B6E202848CC3-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--BEAFA538F5B940E38870B6E202848CC3-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--BEAFA538F5B940E38870B6E202848CC3-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--BEAFA538F5B940E38870B6E202848CC3-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--BEAFA538F5B940E38870B6E202848CC3-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--BEAFA538F5B940E38870B6E202848CC3-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--BEAFA538F5B940E38870B6E202848CC3-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--BEAFA538F5B940E38870B6E202848CC3-->  <DISPLAYLOGICGRID><![CDATA[OB.PropertyStore.get('UomManagement')='Y']]></DISPLAYLOGICGRID>
+<!--BEAFA538F5B940E38870B6E202848CC3-->  <EM_OBUIAPP_VALIDATOR><![CDATA[OB.RM.RMReturnedUOMValidate]]></EM_OBUIAPP_VALIDATOR>
+<!--BEAFA538F5B940E38870B6E202848CC3-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--BEAFA538F5B940E38870B6E202848CC3--></AD_FIELD>
+
 <!--BEB0D785211B4CF8BE7C249EA81C13F7--><AD_FIELD>
 <!--BEB0D785211B4CF8BE7C249EA81C13F7-->  <AD_FIELD_ID><![CDATA[BEB0D785211B4CF8BE7C249EA81C13F7]]></AD_FIELD_ID>
 <!--BEB0D785211B4CF8BE7C249EA81C13F7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -288261,7 +289452,7 @@
 <!--CAF6E1EEDFB14301BB22A0FF84D3D46A-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>