details: https://code.openbravo.com/erp/devel/pi/rev/ccb26bc958a4 changeset: 17866:ccb26bc958a4 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Fri Jun 01 14:34:27 2012 +0200 summary: Fixed bug 17850 New date validation C_Tax_IsSOTrx_Date New date validation C_Tax_IsSOTrx_Date to only choose a valid tax.
diffstat: src-db/database/sourcedata/AD_COLUMN.xml | 4 ++-- src-db/database/sourcedata/AD_VAL_RULE.xml | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diffs (42 lines): diff -r d0b852e8789f -r ccb26bc958a4 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Fri Aug 31 14:30:48 2012 +0200 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Fri Jun 01 14:34:27 2012 +0200 @@ -31432,7 +31432,7 @@ <!--2235--> <AD_TABLE_ID><![CDATA[260]]></AD_TABLE_ID> <!--2235--> <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID> <!--2235--> <AD_REFERENCE_VALUE_ID><![CDATA[158]]></AD_REFERENCE_VALUE_ID> -<!--2235--> <AD_VAL_RULE_ID><![CDATA[299FA667CF374AC5ACC74739C3251134]]></AD_VAL_RULE_ID> +<!--2235--> <AD_VAL_RULE_ID><![CDATA[5BEA56148DC74215A63927481BDC0B63]]></AD_VAL_RULE_ID> <!--2235--> <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH> <!--2235--> <ISKEY><![CDATA[N]]></ISKEY> <!--2235--> <ISPARENT><![CDATA[N]]></ISPARENT> @@ -62943,7 +62943,7 @@ <!--3848--> <AD_TABLE_ID><![CDATA[333]]></AD_TABLE_ID> <!--3848--> <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID> <!--3848--> <AD_REFERENCE_VALUE_ID><![CDATA[158]]></AD_REFERENCE_VALUE_ID> -<!--3848--> <AD_VAL_RULE_ID><![CDATA[299FA667CF374AC5ACC74739C3251134]]></AD_VAL_RULE_ID> +<!--3848--> <AD_VAL_RULE_ID><![CDATA[5BEA56148DC74215A63927481BDC0B63]]></AD_VAL_RULE_ID> <!--3848--> <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH> <!--3848--> <ISKEY><![CDATA[N]]></ISKEY> <!--3848--> <ISPARENT><![CDATA[N]]></ISPARENT> diff -r d0b852e8789f -r ccb26bc958a4 src-db/database/sourcedata/AD_VAL_RULE.xml --- a/src-db/database/sourcedata/AD_VAL_RULE.xml Fri Aug 31 14:30:48 2012 +0200 +++ b/src-db/database/sourcedata/AD_VAL_RULE.xml Fri Jun 01 14:34:27 2012 +0200 @@ -1461,6 +1461,17 @@ <!--5B897800ED59442DA1FA1EBBECE14047--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--5B897800ED59442DA1FA1EBBECE14047--></AD_VAL_RULE> +<!--5BEA56148DC74215A63927481BDC0B63--><AD_VAL_RULE> +<!--5BEA56148DC74215A63927481BDC0B63--> <AD_VAL_RULE_ID><![CDATA[5BEA56148DC74215A63927481BDC0B63]]></AD_VAL_RULE_ID> +<!--5BEA56148DC74215A63927481BDC0B63--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--5BEA56148DC74215A63927481BDC0B63--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--5BEA56148DC74215A63927481BDC0B63--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--5BEA56148DC74215A63927481BDC0B63--> <NAME><![CDATA[C_Tax_IsSOTrx_Date]]></NAME> +<!--5BEA56148DC74215A63927481BDC0B63--> <TYPE><![CDATA[S]]></TYPE> +<!--5BEA56148DC74215A63927481BDC0B63--> <CODE><![CDATA[C_TAX.VALIDFROM<=COALESCE(@DateInvoiced@,@DateOrdered@) AND (C_TAX.SOPOTYPE =(CASE WHEN @IsSOTrx@ = 'Y' THEN 'S' ELSE 'P' END) OR C_TAX.SOPOTYPE = 'B') AND C_TAX.AD_CLIENT_ID=@AD_CLIENT_ID@ AND C_TAX.C_TAX_ID=(CASE WHEN @IsSOTrx@ = 'Y' AND EXISTS(SELECT 1 FROM AD_ORGINFO WHERE ISTAXUNDEDUCTABLE='Y' AND AD_ORG_ID=@AD_ORG_ID@) THEN (SELECT C_TAX_ID FROM AD_ORGINFO WHERE ISTAXUNDEDUCTABLE='Y' AND AD_ORG_ID=@AD_ORG_ID@) ELSE C_TAX.C_TAX_ID END)]]></CODE> +<!--5BEA56148DC74215A63927481BDC0B63--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--5BEA56148DC74215A63927481BDC0B63--></AD_VAL_RULE> + <!--60D95BB313204FD8A01DFB67B9FCB3F1--><AD_VAL_RULE> <!--60D95BB313204FD8A01DFB67B9FCB3F1--> <AD_VAL_RULE_ID><![CDATA[60D95BB313204FD8A01DFB67B9FCB3F1]]></AD_VAL_RULE_ID> <!--60D95BB313204FD8A01DFB67B9FCB3F1--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
