details: https://code.openbravo.com/erp/devel/pi/rev/4ab20a09c571 changeset: 20141:4ab20a09c571 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Mon Apr 15 17:14:03 2013 +0200 summary: Fixed issue 23342 correct validation in organization field in product-costing
diffstat: src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 24 ++++++++++++++++++++++++ src-db/database/sourcedata/AD_COLUMN.xml | 2 +- src-db/database/sourcedata/AD_VAL_RULE.xml | 17 +++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletions(-) diffs (80 lines): diff -r b5a72c7ad0dc -r 4ab20a09c571 src-db/database/sourcedata/AD_AUXILIARINPUT.xml --- a/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Wed Apr 17 18:50:35 2013 +0200 +++ b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Mon Apr 15 17:14:03 2013 +0200 @@ -2198,6 +2198,17 @@ <!--861880FCEE6846A1B6BF4E129EDAF3DD--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--861880FCEE6846A1B6BF4E129EDAF3DD--></AD_AUXILIARINPUT> +<!--873024A63FD6429D8B1A64F63E0CBA00--><AD_AUXILIARINPUT> +<!--873024A63FD6429D8B1A64F63E0CBA00--> <AD_AUXILIARINPUT_ID><![CDATA[873024A63FD6429D8B1A64F63E0CBA00]]></AD_AUXILIARINPUT_ID> +<!--873024A63FD6429D8B1A64F63E0CBA00--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--873024A63FD6429D8B1A64F63E0CBA00--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--873024A63FD6429D8B1A64F63E0CBA00--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--873024A63FD6429D8B1A64F63E0CBA00--> <AD_TAB_ID><![CDATA[800057]]></AD_TAB_ID> +<!--873024A63FD6429D8B1A64F63E0CBA00--> <NAME><![CDATA[isCostMigrated]]></NAME> +<!--873024A63FD6429D8B1A64F63E0CBA00--> <CODE><![CDATA[@SQL= select 1 from ad_preference where attribute='Cost_Eng_Ins_Migrated']]></CODE> +<!--873024A63FD6429D8B1A64F63E0CBA00--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--873024A63FD6429D8B1A64F63E0CBA00--></AD_AUXILIARINPUT> + <!--87EA26BD00A04638B556D52621D46131--><AD_AUXILIARINPUT> <!--87EA26BD00A04638B556D52621D46131--> <AD_AUXILIARINPUT_ID><![CDATA[87EA26BD00A04638B556D52621D46131]]></AD_AUXILIARINPUT_ID> <!--87EA26BD00A04638B556D52621D46131--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -3155,6 +3166,19 @@ <!--E5295F791A5840A2B28868ED6A7634D3--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--E5295F791A5840A2B28868ED6A7634D3--></AD_AUXILIARINPUT> +<!--E8459A62A91F4BD4A0F3B30B97F4C185--><AD_AUXILIARINPUT> +<!--E8459A62A91F4BD4A0F3B30B97F4C185--> <AD_AUXILIARINPUT_ID><![CDATA[E8459A62A91F4BD4A0F3B30B97F4C185]]></AD_AUXILIARINPUT_ID> +<!--E8459A62A91F4BD4A0F3B30B97F4C185--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--E8459A62A91F4BD4A0F3B30B97F4C185--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--E8459A62A91F4BD4A0F3B30B97F4C185--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--E8459A62A91F4BD4A0F3B30B97F4C185--> <AD_TAB_ID><![CDATA[800057]]></AD_TAB_ID> +<!--E8459A62A91F4BD4A0F3B30B97F4C185--> <NAME><![CDATA[Parent_AD_Org]]></NAME> +<!--E8459A62A91F4BD4A0F3B30B97F4C185--> <CODE><![CDATA[@SQL= SELECT AD_ORG_ID +FROM M_PRODUCT +WHERE M_PRODUCT_ID = @M_PRODUCT_ID@]]></CODE> +<!--E8459A62A91F4BD4A0F3B30B97F4C185--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--E8459A62A91F4BD4A0F3B30B97F4C185--></AD_AUXILIARINPUT> + <!--E852BFC21B4C468C9E3F22901A6ED75C--><AD_AUXILIARINPUT> <!--E852BFC21B4C468C9E3F22901A6ED75C--> <AD_AUXILIARINPUT_ID><![CDATA[E852BFC21B4C468C9E3F22901A6ED75C]]></AD_AUXILIARINPUT_ID> <!--E852BFC21B4C468C9E3F22901A6ED75C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r b5a72c7ad0dc -r 4ab20a09c571 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Wed Apr 17 18:50:35 2013 +0200 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Mon Apr 15 17:14:03 2013 +0200 @@ -138905,7 +138905,7 @@ <!--800756--> <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME> <!--800756--> <AD_TABLE_ID><![CDATA[800043]]></AD_TABLE_ID> <!--800756--> <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID> -<!--800756--> <AD_VAL_RULE_ID><![CDATA[E00B19370995405C8014D48E2DE98FD1]]></AD_VAL_RULE_ID> +<!--800756--> <AD_VAL_RULE_ID><![CDATA[57D84BE9C3774FDD87CD846F805A07FB]]></AD_VAL_RULE_ID> <!--800756--> <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH> <!--800756--> <DEFAULTVALUE><![CDATA[@AD_ORG_ID@]]></DEFAULTVALUE> <!--800756--> <ISKEY><![CDATA[N]]></ISKEY> diff -r b5a72c7ad0dc -r 4ab20a09c571 src-db/database/sourcedata/AD_VAL_RULE.xml --- a/src-db/database/sourcedata/AD_VAL_RULE.xml Wed Apr 17 18:50:35 2013 +0200 +++ b/src-db/database/sourcedata/AD_VAL_RULE.xml Mon Apr 15 17:14:03 2013 +0200 @@ -1487,6 +1487,23 @@ <!--53AE60A473D2460D8663D7A1BC5BA732--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--53AE60A473D2460D8663D7A1BC5BA732--></AD_VAL_RULE> +<!--57D84BE9C3774FDD87CD846F805A07FB--><AD_VAL_RULE> +<!--57D84BE9C3774FDD87CD846F805A07FB--> <AD_VAL_RULE_ID><![CDATA[57D84BE9C3774FDD87CD846F805A07FB]]></AD_VAL_RULE_ID> +<!--57D84BE9C3774FDD87CD846F805A07FB--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--57D84BE9C3774FDD87CD846F805A07FB--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--57D84BE9C3774FDD87CD846F805A07FB--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--57D84BE9C3774FDD87CD846F805A07FB--> <NAME><![CDATA[AD_Org In product costing tab]]></NAME> +<!--57D84BE9C3774FDD87CD846F805A07FB--> <DESCRIPTION><![CDATA[Validation to be used in organization field in product window in costing tab. This validation it is different if the instance is migrated to new costing engine or not. ]]></DESCRIPTION> +<!--57D84BE9C3774FDD87CD846F805A07FB--> <TYPE><![CDATA[S]]></TYPE> +<!--57D84BE9C3774FDD87CD846F805A07FB--> <CODE><![CDATA[( +(@isCostMigrated@ IS NULL AND AD_ISORGINCLUDED(ad_org.ad_org_id, @Product_Org@, ad_org.ad_client_id)<>-1 AND IsReady = 'Y') +OR +(@isCostMigrated@ IS NOT NULL AND exists (select 1 from ad_orgtype where ad_orgtype.ad_orgtype_id = ad_org.ad_orgtype_id and islegalentity='Y') + AND IsReady='Y' AND ad_org_isinnaturaltree(ad_org_id, @Parent_AD_Org@, ad_client_id) ='Y') +)]]></CODE> +<!--57D84BE9C3774FDD87CD846F805A07FB--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--57D84BE9C3774FDD87CD846F805A07FB--></AD_VAL_RULE> + <!--58401EEE65CC4551BEC649A16FA16479--><AD_VAL_RULE> <!--58401EEE65CC4551BEC649A16FA16479--> <AD_VAL_RULE_ID><![CDATA[58401EEE65CC4551BEC649A16FA16479]]></AD_VAL_RULE_ID> <!--58401EEE65CC4551BEC649A16FA16479--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> ------------------------------------------------------------------------------ Precog is a next-generation analytics platform capable of advanced analytics on semi-structured data. The platform includes APIs for building apps and a phenomenal toolset for data science. Developers can use our toolset for easy data analysis & visualization. Get a free account! http://www2.precog.com/precogplatform/slashdotnewsletter _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
