details: https://code.openbravo.com/erp/devel/pi/rev/7232cc0b37a9 changeset: 30696:7232cc0b37a9 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Fri Nov 18 14:51:11 2016 +0100 summary: Fixes issue 34612: Performance problem in Return To Vendor Shipment
Implemented C_OrderLine.QtyDelivered for return to vendor flow. This column was used only by the sales flow. However RTV (which is just a return in a purchase flow) can be considered like a sales flow (actually we are delivering products), so it has been easily adapted. This column is now shown in RTV lines. Implemented C_Order.IsDelivered flag for sales orders and return to vendor flows. This column was only implemented for the following Sales orders subtypes: "On Credit Order", "POS Order" and "Warehouse Order"; now it should work fine for all the sales order (although this is not a requirement for the RTVS refactor, it has been quite easy to do it). This column is now shown in RTV header. details: https://code.openbravo.com/erp/devel/pi/rev/50698b513147 changeset: 30697:50698b513147 user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Fri Nov 25 14:06:04 2016 +0100 summary: Related to issue 34612: Code review improvements Exclude discount lines when calculating C_Order.IsDelivered flag. Show IsDelivered in Sales Order and RTV header when document is processed. Show QtyDelivered in Sales Order and RTV lines when document is processed. Update ModuleScript limit to 17Q1. Improve QtyDelivered update performance in ModuleScript by removing inefficient exists clause (it was causing a sequencial scan in M_InOutLine table). Improve IsDelivered update performance in ModuleScript by removing unneeded extra join with C_Order table. diffstat: src-db/database/model/functions/M_INOUT_POST.xml | 52 ++++++- src-db/database/model/views/M_RM_SHIPMENT_PICK_EDIT.xml | 2 +- src-db/database/sourcedata/AD_COLUMN.xml | 37 +++++ src-db/database/sourcedata/AD_ELEMENT.xml | 12 + src-db/database/sourcedata/AD_FIELD.xml | 56 ++++++- src-db/database/sourcedata/AD_TAB.xml | 2 +- src-util/modulescript/build/classes/org/openbravo/modulescript/UpdateQtyDelivered.class | 0 src-util/modulescript/build/classes/org/openbravo/modulescript/UpdateQtyDeliveredData.class | 0 src-util/modulescript/src/org/openbravo/modulescript/UpdateQtyDelivered.java | 59 ++++++++ src-util/modulescript/src/org/openbravo/modulescript/UpdateQtyDelivered_data.xsql | 71 ++++++++++ 10 files changed, 268 insertions(+), 23 deletions(-) diffs (truncated from 448 to 300 lines): diff -r 83e12075fade -r 50698b513147 src-db/database/model/functions/M_INOUT_POST.xml --- a/src-db/database/model/functions/M_INOUT_POST.xml Wed Nov 30 17:02:36 2016 +0100 +++ b/src-db/database/model/functions/M_INOUT_POST.xml Fri Nov 25 14:06:04 2016 +0100 @@ -80,8 +80,6 @@ v_QtyPO NUMBER; v_QtySO NUMBER; v_QuantityOrder NUMBER; - v_QuantityOrderPO NUMBER; - v_QuantityOrderSO NUMBER; v_RDocumentNo VARCHAR2(40) ; v_RInOut_ID VARCHAR2(32); v_IsStocked NUMBER; @@ -530,16 +528,12 @@ v_Qty:=- Cur_InOutLine.MovementQty; v_QuantityOrder:=-Cur_InOutLine.QuantityOrder; END IF; - IF(Cur_InOut.IsSOTrx='N') THEN + IF (Cur_InOut.IsSOTrx='N' AND v_isreturndoctype='N') THEN v_QtySO:=0; v_QtyPO:=Cur_InOutLine.MovementQty; - v_QuantityOrderSO:=0; - v_QuantityOrderPO:=Cur_InOutLine.QuantityOrder; ELSE v_QtySO:=Cur_InOutLine.MovementQty; v_QtyPO:=0; - v_QuantityOrderSO:=Cur_InOutLine.QuantityOrder; - v_QuantityOrderPO:=0; END IF; -- UOM Conversion -- Is it a standard stocked product:3 @@ -747,7 +741,7 @@ END IF; v_ResultStr:='UpdateOrderLine'; IF(Cur_InOutLine.C_OrderLine_ID IS NOT NULL) THEN - if(Cur_InOut.ISSOTRX='Y') THEN + IF (Cur_InOut.ISSOTRX='Y' OR (Cur_InOut.ISSOTRX='N' AND v_isreturndoctype='Y')) THEN -- Sets DateDelivered with the recent shipment date -- of the shipment/s done for the orderline. SELECT MAX(M.MOVEMENTDATE) INTO v_DateDelivered @@ -808,6 +802,48 @@ END IF; END IF; END LOOP; -- For all InOut Lines + + -- Update the C_Order.IsDelivered flag only for Sales or RTV flows + -- This should be extended for other flows too in the future + IF (v_isSoTrx='Y' OR (v_isSoTrx='N' AND v_isreturndoctype='Y')) THEN + FOR Cur_Order IN + (SELECT o.c_order_id + FROM C_Order o + WHERE EXISTS (SELECT 1 + FROM C_ORDERLINE ol + JOIN M_INOUTLINE iol ON iol.C_ORDERLINE_ID = ol.C_ORDERLINE_ID + WHERE ol.C_Order_ID = o.C_Order_ID + AND iol.m_inout_id = CUR_InOut.m_inout_id + ) + ) + LOOP + IF (v_IsReversedDoc = 'N') THEN + -- Normal Scenario + UPDATE C_Order o + SET IsDelivered = 'Y' + WHERE o.c_order_id = Cur_Order.c_order_id + AND o.IsDelivered = 'N' + AND EXISTS (SELECT 1 + FROM C_ORDERLINE ol + WHERE ol.C_Order_ID = o.C_Order_ID + AND ol.c_order_discount_id IS NULL + GROUP BY ol.C_Order_ID + HAVING SUM(ol.QTYORDERED) = SUM(ol.QTYDELIVERED)); + ELSIF (v_IsReversedDoc = 'Y') THEN + -- Void Scenario + UPDATE C_Order o + SET IsDelivered = 'N' + WHERE o.c_order_id = Cur_Order.c_order_id + AND o.IsDelivered = 'Y' + AND EXISTS (SELECT 1 + FROM C_ORDERLINE ol + WHERE ol.C_Order_ID = o.C_Order_ID + AND ol.c_order_discount_id IS NULL + AND ol.QTYORDERED <> ol.QTYDELIVERED); + END IF; + END LOOP; + END IF; + /******************* * PO Matching ******************/ diff -r 83e12075fade -r 50698b513147 src-db/database/model/views/M_RM_SHIPMENT_PICK_EDIT.xml --- a/src-db/database/model/views/M_RM_SHIPMENT_PICK_EDIT.xml Wed Nov 30 17:02:36 2016 +0100 +++ b/src-db/database/model/views/M_RM_SHIPMENT_PICK_EDIT.xml Fri Nov 25 14:06:04 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 - to_number(COALESCE((SELECT to_char(sum(COALESCE(iol3.movementqty, 0))) AS sum FROM m_inoutline iol3 JOIN m_inout io3 ON iol3.m_inout_id = io3.m_inout_id AND io3.processed = 'Y' WHERE iol3.c_orderline_id = ol.c_orderline_id), '0'))) AS pendingqty, iol.m_inout_id, CASE WHEN iol.m_inout_id IS NOT NULL THEN 'Y' ELSE 'N' END AS ob_selected, ol.c_orderline_id, ol.line, iol.m_inoutline_id, p.isstocked, o.c_bpartner_id FROM c_orderline ol JOIN c_order o ON o.c_order_id = ol.c_order_id AND o.processed = 'Y' AND o.issotrx = 'N' LEFT JOIN m_storage_detail sd ON sd.m_product_id = ol.m_product_id AND COALESCE(sd.m_attributesetinstance_id, '0') = COALESCE(ol.m_attributesetinstance_id, '0') AND sd.qtyonhand > 0 LEFT JOIN m_locator l ON sd.m_locator_id = l.m_locator_id JOIN m_product p ON p.m_product_id = ol.m_product_id JOIN c_doctype dt ON o.c_doctypetarget_id = dt.c_doctype_id AND dt.isreturn = 'Y' LEFT JOIN (SELECT iol2.m_inoutline_id, iol2.m_inout_id, iol2.movementqty, iol2.c_orderline_id, iol2.ad_org_id, iol2.m_locator_id FROM m_inoutline iol2 JOIN m_inout io2 ON iol2.m_inout_id = io2.m_inout_id AND io2.processed = 'N') iol ON iol.c_orderline_id = ol.c_orderline_id AND iol.m_locator_id = sd.m_locator_id WHERE o.docstatus = 'CO']]></view> + <view name="M_RM_SHIPMENT_PICK_EDIT"><![CDATA[SELECT COALESCE(sd.m_storage_detail_id, '') || ol.c_orderline_id AS m_rm_shipment_pick_edit_id, ol.ad_client_id, COALESCE(iol.ad_org_id, ol.ad_org_id) AS ad_org_id, ol.isactive, ol.createdby, ol.created, ol.updatedby, ol.updated, o.documentno AS returnorderno, ol.m_product_id, ol.m_attributesetinstance_id, ol.c_uom_id, (-1) * ol.qtyordered AS returned, (-1) * iol.movementqty AS movementqty, sd.m_locator_id, CASE WHEN sd.m_locator_id IS NULL THEN (-1) * ol.qtyordered ELSE COALESCE(sd.qtyonhand, 0) END AS availableqty, (-1) * (ol.qtyordered - ol.qtydelivered) AS pendingqty, iol.m_inout_id, CASE WHEN iol.m_inout_id IS NOT NULL THEN 'Y' ELSE 'N' END AS ob_selected, ol.c_orderline_id, ol.line, iol.m_inoutline_id, p.isstocked, o.c_bpartner_id, l.ad_org_id AS locatororg 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> diff -r 83e12075fade -r 50698b513147 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Wed Nov 30 17:02:36 2016 +0100 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Fri Nov 25 14:06:04 2016 +0100 @@ -345482,6 +345482,43 @@ <!--B651D62716A2B629E040007F01004BB7--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> <!--B651D62716A2B629E040007F01004BB7--></AD_COLUMN> +<!--B65E754D8494496C87B61CA842B6F598--><AD_COLUMN> +<!--B65E754D8494496C87B61CA842B6F598--> <AD_COLUMN_ID><![CDATA[B65E754D8494496C87B61CA842B6F598]]></AD_COLUMN_ID> +<!--B65E754D8494496C87B61CA842B6F598--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--B65E754D8494496C87B61CA842B6F598--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--B65E754D8494496C87B61CA842B6F598--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--B65E754D8494496C87B61CA842B6F598--> <NAME><![CDATA[LocatorOrg]]></NAME> +<!--B65E754D8494496C87B61CA842B6F598--> <COLUMNNAME><![CDATA[LocatorOrg]]></COLUMNNAME> +<!--B65E754D8494496C87B61CA842B6F598--> <AD_TABLE_ID><![CDATA[347B0AA5C3CD4D18910D2FE4990B790E]]></AD_TABLE_ID> +<!--B65E754D8494496C87B61CA842B6F598--> <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID> +<!--B65E754D8494496C87B61CA842B6F598--> <AD_REFERENCE_VALUE_ID><![CDATA[276]]></AD_REFERENCE_VALUE_ID> +<!--B65E754D8494496C87B61CA842B6F598--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> +<!--B65E754D8494496C87B61CA842B6F598--> <ISKEY><![CDATA[N]]></ISKEY> +<!--B65E754D8494496C87B61CA842B6F598--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--B65E754D8494496C87B61CA842B6F598--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> +<!--B65E754D8494496C87B61CA842B6F598--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> +<!--B65E754D8494496C87B61CA842B6F598--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--B65E754D8494496C87B61CA842B6F598--> <SEQNO><![CDATA[250]]></SEQNO> +<!--B65E754D8494496C87B61CA842B6F598--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--B65E754D8494496C87B61CA842B6F598--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--B65E754D8494496C87B61CA842B6F598--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--B65E754D8494496C87B61CA842B6F598--> <AD_ELEMENT_ID><![CDATA[7125A2F10D07409FBDC9EF761344831D]]></AD_ELEMENT_ID> +<!--B65E754D8494496C87B61CA842B6F598--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--B65E754D8494496C87B61CA842B6F598--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--B65E754D8494496C87B61CA842B6F598--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--B65E754D8494496C87B61CA842B6F598--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--B65E754D8494496C87B61CA842B6F598--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--B65E754D8494496C87B61CA842B6F598--> <POSITION><![CDATA[25]]></POSITION> +<!--B65E754D8494496C87B61CA842B6F598--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--B65E754D8494496C87B61CA842B6F598--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--B65E754D8494496C87B61CA842B6F598--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--B65E754D8494496C87B61CA842B6F598--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> +<!--B65E754D8494496C87B61CA842B6F598--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--B65E754D8494496C87B61CA842B6F598--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> +<!--B65E754D8494496C87B61CA842B6F598--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> +<!--B65E754D8494496C87B61CA842B6F598--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> +<!--B65E754D8494496C87B61CA842B6F598--></AD_COLUMN> + <!--B6767E6BD31B48AEA60533DE5F560824--><AD_COLUMN> <!--B6767E6BD31B48AEA60533DE5F560824--> <AD_COLUMN_ID><![CDATA[B6767E6BD31B48AEA60533DE5F560824]]></AD_COLUMN_ID> <!--B6767E6BD31B48AEA60533DE5F560824--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 83e12075fade -r 50698b513147 src-db/database/sourcedata/AD_ELEMENT.xml --- a/src-db/database/sourcedata/AD_ELEMENT.xml Wed Nov 30 17:02:36 2016 +0100 +++ b/src-db/database/sourcedata/AD_ELEMENT.xml Fri Nov 25 14:06:04 2016 +0100 @@ -26802,6 +26802,18 @@ <!--70E55A579FBB43BDB3C4233D9C6729B7--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> <!--70E55A579FBB43BDB3C4233D9C6729B7--></AD_ELEMENT> +<!--7125A2F10D07409FBDC9EF761344831D--><AD_ELEMENT> +<!--7125A2F10D07409FBDC9EF761344831D--> <AD_ELEMENT_ID><![CDATA[7125A2F10D07409FBDC9EF761344831D]]></AD_ELEMENT_ID> +<!--7125A2F10D07409FBDC9EF761344831D--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--7125A2F10D07409FBDC9EF761344831D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--7125A2F10D07409FBDC9EF761344831D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--7125A2F10D07409FBDC9EF761344831D--> <COLUMNNAME><![CDATA[LocatorOrg]]></COLUMNNAME> +<!--7125A2F10D07409FBDC9EF761344831D--> <NAME><![CDATA[Locator Organization]]></NAME> +<!--7125A2F10D07409FBDC9EF761344831D--> <PRINTNAME><![CDATA[Locator Organization]]></PRINTNAME> +<!--7125A2F10D07409FBDC9EF761344831D--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--7125A2F10D07409FBDC9EF761344831D--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> +<!--7125A2F10D07409FBDC9EF761344831D--></AD_ELEMENT> + <!--722EE1A3B4A4660EE040007F01001A37--><AD_ELEMENT> <!--722EE1A3B4A4660EE040007F01001A37--> <AD_ELEMENT_ID><![CDATA[722EE1A3B4A4660EE040007F01001A37]]></AD_ELEMENT_ID> <!--722EE1A3B4A4660EE040007F01001A37--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 83e12075fade -r 50698b513147 src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml Wed Nov 30 17:02:36 2016 +0100 +++ b/src-db/database/sourcedata/AD_FIELD.xml Fri Nov 25 14:06:04 2016 +0100 @@ -14470,18 +14470,19 @@ <!--1089--> <AD_TAB_ID><![CDATA[186]]></AD_TAB_ID> <!--1089--> <AD_COLUMN_ID><![CDATA[2177]]></AD_COLUMN_ID> <!--1089--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> -<!--1089--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED> +<!--1089--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--1089--> <DISPLAYLOGIC><![CDATA[@Processed@='Y']]></DISPLAYLOGIC> <!--1089--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH> <!--1089--> <ISREADONLY><![CDATA[Y]]></ISREADONLY> <!--1089--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> <!--1089--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> <!--1089--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> -<!--1089--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> +<!--1089--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION> <!--1089--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> <!--1089--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--1089--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> <!--1089--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> -<!--1089--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--1089--> <ISSHOWNINSTATUSBAR><![CDATA[Y]]></ISSHOWNINSTATUSBAR> <!--1089--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> <!--1089--></AD_FIELD> @@ -15405,15 +15406,15 @@ <!--1132--> <AD_TAB_ID><![CDATA[187]]></AD_TAB_ID> <!--1132--> <AD_COLUMN_ID><![CDATA[2226]]></AD_COLUMN_ID> <!--1132--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> -<!--1132--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED> -<!--1132--> <DISPLAYLOGIC><![CDATA[@OrderType@='OB' | @OrderType@='SO' | @Processed@='Y']]></DISPLAYLOGIC> +<!--1132--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--1132--> <DISPLAYLOGIC><![CDATA[@Processed@='Y']]></DISPLAYLOGIC> <!--1132--> <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH> <!--1132--> <ISREADONLY><![CDATA[Y]]></ISREADONLY> <!--1132--> <SEQNO><![CDATA[140]]></SEQNO> <!--1132--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> <!--1132--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> <!--1132--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> -<!--1132--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> +<!--1132--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION> <!--1132--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> <!--1132--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--1132--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> @@ -208070,6 +208071,33 @@ <!--4B536D8ED0CB480BA1A0D5526FCE202F--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> <!--4B536D8ED0CB480BA1A0D5526FCE202F--></AD_FIELD> +<!--4B5C67AF614F49B69CAE940CC61140AC--><AD_FIELD> +<!--4B5C67AF614F49B69CAE940CC61140AC--> <AD_FIELD_ID><![CDATA[4B5C67AF614F49B69CAE940CC61140AC]]></AD_FIELD_ID> +<!--4B5C67AF614F49B69CAE940CC61140AC--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--4B5C67AF614F49B69CAE940CC61140AC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--4B5C67AF614F49B69CAE940CC61140AC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--4B5C67AF614F49B69CAE940CC61140AC--> <NAME><![CDATA[Locator Organization]]></NAME> +<!--4B5C67AF614F49B69CAE940CC61140AC--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> +<!--4B5C67AF614F49B69CAE940CC61140AC--> <AD_TAB_ID><![CDATA[9195CC43B5A4419195030A4DB17D8737]]></AD_TAB_ID> +<!--4B5C67AF614F49B69CAE940CC61140AC--> <AD_COLUMN_ID><![CDATA[B65E754D8494496C87B61CA842B6F598]]></AD_COLUMN_ID> +<!--4B5C67AF614F49B69CAE940CC61140AC--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> +<!--4B5C67AF614F49B69CAE940CC61140AC--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED> +<!--4B5C67AF614F49B69CAE940CC61140AC--> <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH> +<!--4B5C67AF614F49B69CAE940CC61140AC--> <ISREADONLY><![CDATA[Y]]></ISREADONLY> +<!--4B5C67AF614F49B69CAE940CC61140AC--> <SEQNO><![CDATA[120]]></SEQNO> +<!--4B5C67AF614F49B69CAE940CC61140AC--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> +<!--4B5C67AF614F49B69CAE940CC61140AC--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> +<!--4B5C67AF614F49B69CAE940CC61140AC--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--4B5C67AF614F49B69CAE940CC61140AC--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> +<!--4B5C67AF614F49B69CAE940CC61140AC--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> +<!--4B5C67AF614F49B69CAE940CC61140AC--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--4B5C67AF614F49B69CAE940CC61140AC--> <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO> +<!--4B5C67AF614F49B69CAE940CC61140AC--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> +<!--4B5C67AF614F49B69CAE940CC61140AC--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> +<!--4B5C67AF614F49B69CAE940CC61140AC--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--4B5C67AF614F49B69CAE940CC61140AC--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +<!--4B5C67AF614F49B69CAE940CC61140AC--></AD_FIELD> + <!--4B6FC57258F7415586F93FCEDB12199F--><AD_FIELD> <!--4B6FC57258F7415586F93FCEDB12199F--> <AD_FIELD_ID><![CDATA[4B6FC57258F7415586F93FCEDB12199F]]></AD_FIELD_ID> <!--4B6FC57258F7415586F93FCEDB12199F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -248776,18 +248804,19 @@ <!--86EE88F76E7C45A095D955A26A7D1ADD--> <AD_TAB_ID><![CDATA[5A5CCFC8359B4D79BA705DC487FE8173]]></AD_TAB_ID> <!--86EE88F76E7C45A095D955A26A7D1ADD--> <AD_COLUMN_ID><![CDATA[2177]]></AD_COLUMN_ID> <!--86EE88F76E7C45A095D955A26A7D1ADD--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> -<!--86EE88F76E7C45A095D955A26A7D1ADD--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED> +<!--86EE88F76E7C45A095D955A26A7D1ADD--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--86EE88F76E7C45A095D955A26A7D1ADD--> <DISPLAYLOGIC><![CDATA[@Processed@='Y']]></DISPLAYLOGIC> <!--86EE88F76E7C45A095D955A26A7D1ADD--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH> <!--86EE88F76E7C45A095D955A26A7D1ADD--> <ISREADONLY><![CDATA[Y]]></ISREADONLY> <!--86EE88F76E7C45A095D955A26A7D1ADD--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> <!--86EE88F76E7C45A095D955A26A7D1ADD--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> <!--86EE88F76E7C45A095D955A26A7D1ADD--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> -<!--86EE88F76E7C45A095D955A26A7D1ADD--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> +<!--86EE88F76E7C45A095D955A26A7D1ADD--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION> <!--86EE88F76E7C45A095D955A26A7D1ADD--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> <!--86EE88F76E7C45A095D955A26A7D1ADD--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--86EE88F76E7C45A095D955A26A7D1ADD--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> <!--86EE88F76E7C45A095D955A26A7D1ADD--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> -<!--86EE88F76E7C45A095D955A26A7D1ADD--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--86EE88F76E7C45A095D955A26A7D1ADD--> <ISSHOWNINSTATUSBAR><![CDATA[Y]]></ISSHOWNINSTATUSBAR> <!--86EE88F76E7C45A095D955A26A7D1ADD--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> <!--86EE88F76E7C45A095D955A26A7D1ADD--></AD_FIELD> @@ -299006,20 +299035,21 @@ <!--DC5D838BF9554E8FAC7C17F6AB99D877--> <AD_TAB_ID><![CDATA[387B6179438D4C4CB40769A77F4C304C]]></AD_TAB_ID> <!--DC5D838BF9554E8FAC7C17F6AB99D877--> <AD_COLUMN_ID><![CDATA[2226]]></AD_COLUMN_ID> <!--DC5D838BF9554E8FAC7C17F6AB99D877--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> -<!--DC5D838BF9554E8FAC7C17F6AB99D877--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED> -<!--DC5D838BF9554E8FAC7C17F6AB99D877--> <DISPLAYLOGIC><![CDATA[@OrderType@='OB' | @OrderType@='SO' | @OrderType@='PO']]></DISPLAYLOGIC> +<!--DC5D838BF9554E8FAC7C17F6AB99D877--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--DC5D838BF9554E8FAC7C17F6AB99D877--> <DISPLAYLOGIC><![CDATA[@Processed@='Y']]></DISPLAYLOGIC> <!--DC5D838BF9554E8FAC7C17F6AB99D877--> <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH> <!--DC5D838BF9554E8FAC7C17F6AB99D877--> <ISREADONLY><![CDATA[Y]]></ISREADONLY> <!--DC5D838BF9554E8FAC7C17F6AB99D877--> <SEQNO><![CDATA[244]]></SEQNO> <!--DC5D838BF9554E8FAC7C17F6AB99D877--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> <!--DC5D838BF9554E8FAC7C17F6AB99D877--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> <!--DC5D838BF9554E8FAC7C17F6AB99D877--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> -<!--DC5D838BF9554E8FAC7C17F6AB99D877--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> +<!--DC5D838BF9554E8FAC7C17F6AB99D877--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION> <!--DC5D838BF9554E8FAC7C17F6AB99D877--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> <!--DC5D838BF9554E8FAC7C17F6AB99D877--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--DC5D838BF9554E8FAC7C17F6AB99D877--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> <!--DC5D838BF9554E8FAC7C17F6AB99D877--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> -<!--DC5D838BF9554E8FAC7C17F6AB99D877--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--DC5D838BF9554E8FAC7C17F6AB99D877--> <ISSHOWNINSTATUSBAR><![CDATA[Y]]></ISSHOWNINSTATUSBAR> +<!--DC5D838BF9554E8FAC7C17F6AB99D877--> <CLIENTCLASS><![CDATA[OBTruncAddMinusDisplay]]></CLIENTCLASS> <!--DC5D838BF9554E8FAC7C17F6AB99D877--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> <!--DC5D838BF9554E8FAC7C17F6AB99D877--></AD_FIELD> diff -r 83e12075fade -r 50698b513147 src-db/database/sourcedata/AD_TAB.xml --- a/src-db/database/sourcedata/AD_TAB.xml Wed Nov 30 17:02:36 2016 +0100 +++ b/src-db/database/sourcedata/AD_TAB.xml Fri Nov 25 14:06:04 2016 +0100 @@ -17363,7 +17363,7 @@ <!--9195CC43B5A4419195030A4DB17D8737--> <UIPATTERN><![CDATA[STD]]></UIPATTERN> <!--9195CC43B5A4419195030A4DB17D8737--> <HQLWHERECLAUSE><