details: https://code.openbravo.com/erp/devel/pi/rev/b113beaac27c changeset: 20245:b113beaac27c user: David Miguelez <david.miguelez <at> openbravo.com> date: Mon Apr 29 13:44:37 2013 +0200 summary: Fixes Issue 22639. Do not filter by non stockable products in Goods Receipt window.
details: https://code.openbravo.com/erp/devel/pi/rev/ad7168af39fc changeset: 20246:ad7168af39fc user: David Miguelez <david.miguelez <at> openbravo.com> date: Mon Apr 29 13:47:02 2013 +0200 summary: Fixes Issue 15768. Executes trigger before deleting record. details: https://code.openbravo.com/erp/devel/pi/rev/acfb929ac422 changeset: 20247:acfb929ac422 user: David Miguelez <david.miguelez <at> openbravo.com> date: Tue Apr 30 20:06:23 2013 +0200 summary: Fixes Issue 23661: In Sales Invoice and Purchase Invoice windows do not filter the Product Selector by Warehouse. diffstat: src-db/database/model/tables/AD_IMAGE.xml | 2 +- src-db/database/model/triggers/AD_ORG_BEFORE_TRG.xml | 62 +++++++++++++++++++ src-db/database/model/triggers/AD_ORG_TRG.xml | 21 +------ src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 4 +- 4 files changed, 66 insertions(+), 23 deletions(-) diffs (137 lines): diff -r b9020a608e64 -r acfb929ac422 src-db/database/model/tables/AD_IMAGE.xml --- a/src-db/database/model/tables/AD_IMAGE.xml Tue Apr 30 18:58:06 2013 +0200 +++ b/src-db/database/model/tables/AD_IMAGE.xml Tue Apr 30 20:06:23 2013 +0200 @@ -60,7 +60,7 @@ <foreign-key foreignTable="AD_CLIENT" name="AD_IMAGE_AD_CLIENT"> <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/> </foreign-key> - <foreign-key foreignTable="AD_ORG" name="AD_IMAGE_AD_ORG"> + <foreign-key foreignTable="AD_ORG" name="AD_IMAGE_AD_ORG" onDelete="cascade"> <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/> </foreign-key> <check name="AD_IMAGE_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check> diff -r b9020a608e64 -r acfb929ac422 src-db/database/model/triggers/AD_ORG_BEFORE_TRG.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src-db/database/model/triggers/AD_ORG_BEFORE_TRG.xml Tue Apr 30 20:06:23 2013 +0200 @@ -0,0 +1,62 @@ +<?xml version="1.0"?> + <database name="TRIGGER AD_ORG_BEFORE_TRG"> + <trigger name="AD_ORG_BEFORE_TRG" table="AD_ORG" fires="before" insert="false" update="false" delete="true" 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) 2013 Openbravo, S.L.U. + * + * Specifically, this derivative work is based upon the following Compiere + * file and version. + *************************************************************************/ + v_xTree_ID VARCHAR2(32); + v_xParent_ID VARCHAR2(32); + TYPE RECORD IS REF CURSOR; + CUR_PeriodControl RECORD; + v_count NUMBER; + +BEGIN + + IF AD_isTriggerEnabled()='N' THEN RETURN; + END IF; + + IF(DELETING) THEN + -- Delete TreeNode -- + -- get AD_Tree_ID + SELECT c.AD_Tree_Org_ID + INTO v_xTree_ID + FROM AD_ClientInfo c + WHERE c.AD_Client_ID=:old.AD_Client_ID; + select COUNT(*) INTO v_count from AD_TREENODE where parent_id=:old.AD_ORG_ID + and AD_TREE_ID=v_xTree_ID; + IF(v_count>0) THEN + RAISE_APPLICATION_ERROR(-20000, '@ChildOrgCheck@') ; + END IF; + DELETE + FROM AD_TREENODE + WHERE AD_CLIENT_ID=:old.AD_Client_ID + AND AD_Tree_ID=v_xTree_ID + AND Node_ID=:old.AD_Org_ID; + END IF; + + -- Deleting +EXCEPTION +WHEN NO_DATA_FOUND THEN + RAISE_APPLICATION_ERROR(-20000, '@20014@') ; +END AD_ORG_BEFORE_TRG +]]></body> + </trigger> + </database> diff -r b9020a608e64 -r acfb929ac422 src-db/database/model/triggers/AD_ORG_TRG.xml --- a/src-db/database/model/triggers/AD_ORG_TRG.xml Tue Apr 30 18:58:06 2013 +0200 +++ b/src-db/database/model/triggers/AD_ORG_TRG.xml Tue Apr 30 20:06:23 2013 +0200 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <database name="TRIGGER AD_ORG_TRG"> - <trigger name="AD_ORG_TRG" table="AD_ORG" fires="after" insert="true" update="true" delete="true" foreach="row"> + <trigger name="AD_ORG_TRG" table="AD_ORG" fires="after" insert="true" update="false" delete="false" foreach="row"> <body><![CDATA[ /************************************************************************* * The contents of this file are subject to the Compiere Public @@ -104,26 +104,7 @@ '?' ) ; - - ELSIF(DELETING) THEN - -- Delete TreeNode -- - -- get AD_Tree_ID - SELECT c.AD_Tree_Org_ID - INTO v_xTree_ID - FROM AD_ClientInfo c - WHERE c.AD_Client_ID=:old.AD_Client_ID; - select COUNT(*) INTO v_count from AD_TREENODE where parent_id=:old.AD_ORG_ID - and AD_TREE_ID=v_xTree_ID; - IF(v_count>0) THEN - RAISE_APPLICATION_ERROR(-20000, '@ChildOrgCheck@') ; - END IF; - DELETE - FROM AD_TREENODE - WHERE AD_CLIENT_ID=:old.AD_Client_ID - AND AD_Tree_ID=v_xTree_ID - AND Node_ID=:old.AD_Org_ID; END IF; - -- Deleting EXCEPTION WHEN NO_DATA_FOUND THEN RAISE_APPLICATION_ERROR(-20000, '@20014@') ; diff -r b9020a608e64 -r acfb929ac422 src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml --- a/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml Tue Apr 30 18:58:06 2013 +0200 +++ b/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml Tue Apr 30 20:06:23 2013 +0200 @@ -1028,7 +1028,7 @@ <!--7A814E72DF9240E280BA6B2AEFF9405A--> <SORTNO><![CDATA[35]]></SORTNO> <!--7A814E72DF9240E280BA6B2AEFF9405A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--7A814E72DF9240E280BA6B2AEFF9405A--> <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD> -<!--7A814E72DF9240E280BA6B2AEFF9405A--> <DEFAULT_EXPRESSION><![CDATA[if (OB.getWindowId() && OB.getSession().getAttribute(OB.getWindowId() +"|M_WAREHOUSE_ID")) { OB.getSession().getAttribute(OB.getWindowId() +"|M_WAREHOUSE_ID"); } else { if (OB.getContext().getWarehouse() != null) { OB.getContext().getWarehouse().id; } }]]></DEFAULT_EXPRESSION> +<!--7A814E72DF9240E280BA6B2AEFF9405A--> <DEFAULT_EXPRESSION><![CDATA[if (OB.getWindowId() != "183" && OB.getWindowId() != "167") { if (OB.getWindowId() && OB.getSession().getAttribute(OB.getWindowId() +"|M_WAREHOUSE_ID")) { OB.getSession().getAttribute(OB.getWindowId() +"|M_WAREHOUSE_ID"); } else { if (OB.getContext().getWarehouse() != null) { OB.getContext().getWarehouse().id; } } }]]></DEFAULT_EXPRESSION> <!--7A814E72DF9240E280BA6B2AEFF9405A--> <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST> <!--7A814E72DF9240E280BA6B2AEFF9405A--></OBUISEL_SELECTOR_FIELD> @@ -2312,7 +2312,7 @@ <!--FF8080812E77708D012E7796A94B0017--> <SORTNO><![CDATA[110]]></SORTNO> <!--FF8080812E77708D012E7796A94B0017--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--FF8080812E77708D012E7796A94B0017--> <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD> -<!--FF8080812E77708D012E7796A94B0017--> <DEFAULT_EXPRESSION><![CDATA[if (OB.getWindowId() == '800051' || OB.getWindowId() == '800052' || OB.getWindowId() == '800096' || OB.getWindowId() == '800027') {false} else {if (OB.isSalesTransaction() == true) { true } else {false}}]]></DEFAULT_EXPRESSION> +<!--FF8080812E77708D012E7796A94B0017--> <DEFAULT_EXPRESSION><![CDATA[if (OB.getWindowId() == '800051' || OB.getWindowId() == '800052' || OB.getWindowId() == '800096' || OB.getWindowId() == '800027') {false} else {if (OB.isSalesTransaction() == true) { true } else {if (OB.getWindowId() != '184') {false}}}]]></DEFAULT_EXPRESSION> <!--FF8080812E77708D012E7796A94B0017--> <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST> <!--FF8080812E77708D012E7796A94B0017--></OBUISEL_SELECTOR_FIELD> ------------------------------------------------------------------------------ Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET Get 100% visibility into your production application - at no cost. Code-level diagnostics for performance bottlenecks with <2% overhead Download for free and get started troubleshooting in minutes. http://p.sf.net/sfu/appdyn_d2d_ap1 _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
