Attached Files | issue.diff [^] (24,520 bytes) 2016-06-10 14:15 [Show Content] [Hide Content]diff --git a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
@@ -309,6 +309,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(
diff --git a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/procurement/ob-procurement.js b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/procurement/ob-procurement.js
new file mode 100644
--- /dev/null
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/procurement/ob-procurement.js
@@ -0,0 +1,37 @@
+/*
+ *************************************************************************
+ * 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 || {};
+
+/**
+ * Check that entered return quantity is less than original inout qty.
+ */
+
+OB.PROC.OnChangeQuantity = function(item, view, form, grid) {
+ var aumQty = new BigDecimal(String(item.getValue()));
+ var record = grid.getSelectionObject().lastSelectionItem;
+
+ grid.setEditValue(item.grid.getEditRow(), 'orderedQuantity', Number(aumQty));
+ record.orderedQuantity = Number(aumQty);
+ record.aumQuantity = record.orderedQuantity;
+}
+
+//OB.PROC.Validate = function(item, validator, value, record) {
+// return true
+//};
\ No newline at end of file
diff --git a/src-db/database/model/views/M_CREATEPOLINES_PE_V.xml b/src-db/database/model/views/M_CREATEPOLINES_PE_V.xml
--- a/src-db/database/model/views/M_CREATEPOLINES_PE_V.xml
+++ b/src-db/database/model/views/M_CREATEPOLINES_PE_V.xml
@@ -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, p.c_uom_id 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>
diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml
+++ b/src-db/database/sourcedata/AD_COLUMN.xml
@@ -285078,6 +285078,39 @@
<!--6C802FA6ECA048DC9AC6A2EB3E794DCA--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
<!--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--> <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[Y]]></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--> <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--></AD_COLUMN>
+
<!--6C8FCF912B654DE9BD3417F682DD282C--><AD_COLUMN>
<!--6C8FCF912B654DE9BD3417F682DD282C--> <AD_COLUMN_ID><![CDATA[6C8FCF912B654DE9BD3417F682DD282C]]></AD_COLUMN_ID>
<!--6C8FCF912B654DE9BD3417F682DD282C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -314560,6 +314593,41 @@
<!--8A718B77477545B99732A6DEBDD3333B--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
<!--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--> <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--></AD_COLUMN>
+
<!--8A9065C3D71C40098FBF44E1E1FEA9EC--><AD_COLUMN>
<!--8A9065C3D71C40098FBF44E1E1FEA9EC--> <AD_COLUMN_ID><![CDATA[8A9065C3D71C40098FBF44E1E1FEA9EC]]></AD_COLUMN_ID>
<!--8A9065C3D71C40098FBF44E1E1FEA9EC--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/AD_FIELD.xml b/src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml
+++ b/src-db/database/sourcedata/AD_FIELD.xml
@@ -190894,14 +190894,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>
@@ -192861,7 +192861,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>
@@ -237358,6 +237358,33 @@
<!--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--> <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[120]]></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.OnChangeQuantity]]></ONCHANGEFUNCTION>
+<!--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>
@@ -300947,6 +300974,32 @@
<!--DF7629CDD37749B3B209A3F89597FA58--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--DF7629CDD37749B3B209A3F89597FA58--></AD_FIELD>
+<!--DF79EB34026B4B638EFBDFD7B79142A6--><AD_FIELD>
+<!--DF79EB34026B4B638EFBDFD7B79142A6--> <AD_FIELD_ID><![CDATA[DF79EB34026B4B638EFBDFD7B79142A6]]></AD_FIELD_ID>
+<!--DF79EB34026B4B638EFBDFD7B79142A6--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DF79EB34026B4B638EFBDFD7B79142A6--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DF79EB34026B4B638EFBDFD7B79142A6--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DF79EB34026B4B638EFBDFD7B79142A6--> <NAME><![CDATA[Aum]]></NAME>
+<!--DF79EB34026B4B638EFBDFD7B79142A6--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--DF79EB34026B4B638EFBDFD7B79142A6--> <AD_TAB_ID><![CDATA[616CE914B91B4B878CFC330A170442A4]]></AD_TAB_ID>
+<!--DF79EB34026B4B638EFBDFD7B79142A6--> <AD_COLUMN_ID><![CDATA[8A7D05EE6B49441CB2EA2B6DC314DE02]]></AD_COLUMN_ID>
+<!--DF79EB34026B4B638EFBDFD7B79142A6--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--DF79EB34026B4B638EFBDFD7B79142A6--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--DF79EB34026B4B638EFBDFD7B79142A6--> <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--DF79EB34026B4B638EFBDFD7B79142A6--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--DF79EB34026B4B638EFBDFD7B79142A6--> <SEQNO><![CDATA[110]]></SEQNO>
+<!--DF79EB34026B4B638EFBDFD7B79142A6--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--DF79EB34026B4B638EFBDFD7B79142A6--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--DF79EB34026B4B638EFBDFD7B79142A6--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--DF79EB34026B4B638EFBDFD7B79142A6--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--DF79EB34026B4B638EFBDFD7B79142A6--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--DF79EB34026B4B638EFBDFD7B79142A6--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--DF79EB34026B4B638EFBDFD7B79142A6--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--DF79EB34026B4B638EFBDFD7B79142A6--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--DF79EB34026B4B638EFBDFD7B79142A6--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--DF79EB34026B4B638EFBDFD7B79142A6--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--DF79EB34026B4B638EFBDFD7B79142A6--></AD_FIELD>
+
<!--DF7A918EA3604E26A3AE8E294093AB15--><AD_FIELD>
<!--DF7A918EA3604E26A3AE8E294093AB15--> <AD_FIELD_ID><![CDATA[DF7A918EA3604E26A3AE8E294093AB15]]></AD_FIELD_ID>
<!--DF7A918EA3604E26A3AE8E294093AB15--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -301682,13 +301735,14 @@
<!--E07191A3B2F162F6E040007F010016E8--> <AD_TAB_ID><![CDATA[616CE914B91B4B878CFC330A170442A4]]></AD_TAB_ID>
<!--E07191A3B2F162F6E040007F010016E8--> <AD_COLUMN_ID><![CDATA[E070B14C0077DAA1E040007F010016DD]]></AD_COLUMN_ID>
<!--E07191A3B2F162F6E040007F010016E8--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--E07191A3B2F162F6E040007F010016E8--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--E07191A3B2F162F6E040007F010016E8--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--E07191A3B2F162F6E040007F010016E8--> <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--E07191A3B2F162F6E040007F010016E8--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--E07191A3B2F162F6E040007F010016E8--> <SEQNO><![CDATA[30]]></SEQNO>
<!--E07191A3B2F162F6E040007F010016E8--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--E07191A3B2F162F6E040007F010016E8--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--E07191A3B2F162F6E040007F010016E8--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--E07191A3B2F162F6E040007F010016E8--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--E07191A3B2F162F6E040007F010016E8--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
<!--E07191A3B2F162F6E040007F010016E8--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
<!--E07191A3B2F162F6E040007F010016E8--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--E07191A3B2F162F6E040007F010016E8--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
diff --git a/src-db/database/sourcedata/AD_REFERENCE.xml b/src-db/database/sourcedata/AD_REFERENCE.xml
--- a/src-db/database/sourcedata/AD_REFERENCE.xml
+++ b/src-db/database/sourcedata/AD_REFERENCE.xml
@@ -6225,6 +6225,18 @@
<!--C123B7BF5B2C438D84D2E509734776B5--> <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
<!--C123B7BF5B2C438D84D2E509734776B5--></AD_REFERENCE>
+<!--C258AE68FAD2494AA02C8EC0E5930C4F--><AD_REFERENCE>
+<!--C258AE68FAD2494AA02C8EC0E5930C4F--> <AD_REFERENCE_ID><![CDATA[C258AE68FAD2494AA02C8EC0E5930C4F]]></AD_REFERENCE_ID>
+<!--C258AE68FAD2494AA02C8EC0E5930C4F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C258AE68FAD2494AA02C8EC0E5930C4F--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C258AE68FAD2494AA02C8EC0E5930C4F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C258AE68FAD2494AA02C8EC0E5930C4F--> <NAME><![CDATA[AUM Selector Filtered by Product]]></NAME>
+<!--C258AE68FAD2494AA02C8EC0E5930C4F--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C258AE68FAD2494AA02C8EC0E5930C4F--> <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
+<!--C258AE68FAD2494AA02C8EC0E5930C4F--> <PARENTREFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></PARENTREFERENCE_ID>
+<!--C258AE68FAD2494AA02C8EC0E5930C4F--> <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
+<!--C258AE68FAD2494AA02C8EC0E5930C4F--></AD_REFERENCE>
+
<!--C3531F85C14B4515AB7259F0D338050D--><AD_REFERENCE>
<!--C3531F85C14B4515AB7259F0D338050D--> <AD_REFERENCE_ID><![CDATA[C3531F85C14B4515AB7259F0D338050D]]></AD_REFERENCE_ID>
<!--C3531F85C14B4515AB7259F0D338050D--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/OBUISEL_SELECTOR.xml b/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
--- a/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
+++ b/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
@@ -935,6 +935,22 @@
<!--DF21B651CB604FA9A709D7108FA51177--> <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY>
<!--DF21B651CB604FA9A709D7108FA51177--></OBUISEL_SELECTOR>
+<!--DFC496029B4743E49D78E6B4414BDAF2--><OBUISEL_SELECTOR>
+<!--DFC496029B4743E49D78E6B4414BDAF2--> <OBUISEL_SELECTOR_ID><![CDATA[DFC496029B4743E49D78E6B4414BDAF2]]></OBUISEL_SELECTOR_ID>
+<!--DFC496029B4743E49D78E6B4414BDAF2--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DFC496029B4743E49D78E6B4414BDAF2--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DFC496029B4743E49D78E6B4414BDAF2--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--DFC496029B4743E49D78E6B4414BDAF2--> <NAME><![CDATA[AUM Selector Filtered by Product]]></NAME>
+<!--DFC496029B4743E49D78E6B4414BDAF2--> <AD_REFERENCE_ID><![CDATA[C258AE68FAD2494AA02C8EC0E5930C4F]]></AD_REFERENCE_ID>
+<!--DFC496029B4743E49D78E6B4414BDAF2--> <AD_TABLE_ID><![CDATA[146]]></AD_TABLE_ID>
+<!--DFC496029B4743E49D78E6B4414BDAF2--> <FILTER_EXPRESSION><![CDATA["e.id in (select p.uOM.id from Product p where p.id = '" + OB.getParameters().get('inpmProductId') + "') or e.id in (select a.uOM.id from ProductAUM a where a.product.id = '" + OB.getParameters().get('inpmProductId') + "')"]]></FILTER_EXPRESSION>
+<!--DFC496029B4743E49D78E6B4414BDAF2--> <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID>
+<!--DFC496029B4743E49D78E6B4414BDAF2--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DFC496029B4743E49D78E6B4414BDAF2--> <SUGGESTIONTEXTMATCHSTYLE><![CDATA[substring]]></SUGGESTIONTEXTMATCHSTYLE>
+<!--DFC496029B4743E49D78E6B4414BDAF2--> <POPUPTEXTMATCHSTYLE><![CDATA[substring]]></POPUPTEXTMATCHSTYLE>
+<!--DFC496029B4743E49D78E6B4414BDAF2--> <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY>
+<!--DFC496029B4743E49D78E6B4414BDAF2--></OBUISEL_SELECTOR>
+
<!--E1F081829D324B20B7214E7018B589C4--><OBUISEL_SELECTOR>
<!--E1F081829D324B20B7214E7018B589C4--> <OBUISEL_SELECTOR_ID><![CDATA[E1F081829D324B20B7214E7018B589C4]]></OBUISEL_SELECTOR_ID>
<!--E1F081829D324B20B7214E7018B589C4--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
issue33216v2.export [^] (6,610 bytes) 2016-06-30 17:43 |