details: /erp/devel/main/rev/5f7bd7f27cda changeset: 8511:5f7bd7f27cda user: Mikel Irurita <mikel.irurita <at> openbravo.com> date: Fri Oct 08 11:43:43 2010 +0200 summary: Fixes issue 14758: Payment Method combo should show only associated payment methods
details: /erp/devel/main/rev/d0357aced767 changeset: 8512:d0357aced767 user: RM packaging bot <staff.rm <at> openbravo.com> date: Sat Oct 09 12:43:47 2010 +0000 summary: CI: promote changesets from pi to main diffstat: src-db/database/sourcedata/AD_COLUMN.xml | 8 ++++++++ src-db/database/sourcedata/AD_MODULE.xml | 4 ++-- src-db/database/sourcedata/AD_VAL_RULE.xml | 24 ++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) diffs (129 lines): diff -r a2bb7e6fb443 -r d0357aced767 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Thu Oct 07 16:53:30 2010 +0200 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Sat Oct 09 12:43:47 2010 +0000 @@ -300026,6 +300026,7 @@ <!--828EE0AE7FF25FA1E040007F010067C7--> <COLUMNNAME><![CDATA[FIN_Paymentmethod_ID]]></COLUMNNAME> <!--828EE0AE7FF25FA1E040007F010067C7--> <AD_TABLE_ID><![CDATA[AC389EBD8A774AAE8223A77F692983D8]]></AD_TABLE_ID> <!--828EE0AE7FF25FA1E040007F010067C7--> <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID> +<!--828EE0AE7FF25FA1E040007F010067C7--> <AD_VAL_RULE_ID><![CDATA[9D87FCD2F19D4CB7AA55F15F5A6C0FBA]]></AD_VAL_RULE_ID> <!--828EE0AE7FF25FA1E040007F010067C7--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> <!--828EE0AE7FF25FA1E040007F010067C7--> <ISKEY><![CDATA[N]]></ISKEY> <!--828EE0AE7FF25FA1E040007F010067C7--> <ISPARENT><![CDATA[Y]]></ISPARENT> @@ -300755,6 +300756,7 @@ <!--828EE0AE80255FA1E040007F010067C7--> <COLUMNNAME><![CDATA[FIN_Paymentmethod_ID]]></COLUMNNAME> <!--828EE0AE80255FA1E040007F010067C7--> <AD_TABLE_ID><![CDATA[203]]></AD_TABLE_ID> <!--828EE0AE80255FA1E040007F010067C7--> <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID> +<!--828EE0AE80255FA1E040007F010067C7--> <AD_VAL_RULE_ID><![CDATA[34A2733B41B04DC19B3E54F764753D19]]></AD_VAL_RULE_ID> <!--828EE0AE80255FA1E040007F010067C7--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> <!--828EE0AE80255FA1E040007F010067C7--> <ISKEY><![CDATA[N]]></ISKEY> <!--828EE0AE80255FA1E040007F010067C7--> <ISPARENT><![CDATA[N]]></ISPARENT> @@ -300787,6 +300789,7 @@ <!--828EE0AE802B5FA1E040007F010067C7--> <COLUMNNAME><![CDATA[FIN_Paymentmethod_ID]]></COLUMNNAME> <!--828EE0AE802B5FA1E040007F010067C7--> <AD_TABLE_ID><![CDATA[800003]]></AD_TABLE_ID> <!--828EE0AE802B5FA1E040007F010067C7--> <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID> +<!--828EE0AE802B5FA1E040007F010067C7--> <AD_VAL_RULE_ID><![CDATA[34A2733B41B04DC19B3E54F764753D19]]></AD_VAL_RULE_ID> <!--828EE0AE802B5FA1E040007F010067C7--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> <!--828EE0AE802B5FA1E040007F010067C7--> <ISKEY><![CDATA[N]]></ISKEY> <!--828EE0AE802B5FA1E040007F010067C7--> <ISPARENT><![CDATA[N]]></ISPARENT> @@ -300819,6 +300822,7 @@ <!--828EE0AE802C5FA1E040007F010067C7--> <COLUMNNAME><![CDATA[FIN_Paymentmethod_ID]]></COLUMNNAME> <!--828EE0AE802C5FA1E040007F010067C7--> <AD_TABLE_ID><![CDATA[259]]></AD_TABLE_ID> <!--828EE0AE802C5FA1E040007F010067C7--> <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID> +<!--828EE0AE802C5FA1E040007F010067C7--> <AD_VAL_RULE_ID><![CDATA[34A2733B41B04DC19B3E54F764753D19]]></AD_VAL_RULE_ID> <!--828EE0AE802C5FA1E040007F010067C7--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> <!--828EE0AE802C5FA1E040007F010067C7--> <ISKEY><![CDATA[N]]></ISKEY> <!--828EE0AE802C5FA1E040007F010067C7--> <ISPARENT><![CDATA[N]]></ISPARENT> @@ -300853,6 +300857,7 @@ <!--828EE0AE802D5FA1E040007F010067C7--> <AD_TABLE_ID><![CDATA[291]]></AD_TABLE_ID> <!--828EE0AE802D5FA1E040007F010067C7--> <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID> <!--828EE0AE802D5FA1E040007F010067C7--> <AD_REFERENCE_VALUE_ID><![CDATA[EED0EF97D4A7421687F3B365D009E7A6]]></AD_REFERENCE_VALUE_ID> +<!--828EE0AE802D5FA1E040007F010067C7--> <AD_VAL_RULE_ID><![CDATA[34A2733B41B04DC19B3E54F764753D19]]></AD_VAL_RULE_ID> <!--828EE0AE802D5FA1E040007F010067C7--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> <!--828EE0AE802D5FA1E040007F010067C7--> <ISKEY><![CDATA[N]]></ISKEY> <!--828EE0AE802D5FA1E040007F010067C7--> <ISPARENT><![CDATA[N]]></ISPARENT> @@ -300886,6 +300891,7 @@ <!--828EE0AE802E5FA1E040007F010067C7--> <AD_TABLE_ID><![CDATA[291]]></AD_TABLE_ID> <!--828EE0AE802E5FA1E040007F010067C7--> <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID> <!--828EE0AE802E5FA1E040007F010067C7--> <AD_REFERENCE_VALUE_ID><![CDATA[EED0EF97D4A7421687F3B365D009E7A6]]></AD_REFERENCE_VALUE_ID> +<!--828EE0AE802E5FA1E040007F010067C7--> <AD_VAL_RULE_ID><![CDATA[34A2733B41B04DC19B3E54F764753D19]]></AD_VAL_RULE_ID> <!--828EE0AE802E5FA1E040007F010067C7--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> <!--828EE0AE802E5FA1E040007F010067C7--> <ISKEY><![CDATA[N]]></ISKEY> <!--828EE0AE802E5FA1E040007F010067C7--> <ISPARENT><![CDATA[N]]></ISPARENT> @@ -300987,6 +300993,7 @@ <!--828EE0AE80385FA1E040007F010067C7--> <COLUMNNAME><![CDATA[FIN_Paymentmethod_ID]]></COLUMNNAME> <!--828EE0AE80385FA1E040007F010067C7--> <AD_TABLE_ID><![CDATA[318]]></AD_TABLE_ID> <!--828EE0AE80385FA1E040007F010067C7--> <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID> +<!--828EE0AE80385FA1E040007F010067C7--> <AD_VAL_RULE_ID><![CDATA[34A2733B41B04DC19B3E54F764753D19]]></AD_VAL_RULE_ID> <!--828EE0AE80385FA1E040007F010067C7--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> <!--828EE0AE80385FA1E040007F010067C7--> <ISKEY><![CDATA[N]]></ISKEY> <!--828EE0AE80385FA1E040007F010067C7--> <ISPARENT><![CDATA[N]]></ISPARENT> @@ -301020,6 +301027,7 @@ <!--828EE0AE80395FA1E040007F010067C7--> <COLUMNNAME><![CDATA[FIN_Paymentmethod_ID]]></COLUMNNAME> <!--828EE0AE80395FA1E040007F010067C7--> <AD_TABLE_ID><![CDATA[800058]]></AD_TABLE_ID> <!--828EE0AE80395FA1E040007F010067C7--> <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID> +<!--828EE0AE80395FA1E040007F010067C7--> <AD_VAL_RULE_ID><![CDATA[34A2733B41B04DC19B3E54F764753D19]]></AD_VAL_RULE_ID> <!--828EE0AE80395FA1E040007F010067C7--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> <!--828EE0AE80395FA1E040007F010067C7--> <ISKEY><![CDATA[N]]></ISKEY> <!--828EE0AE80395FA1E040007F010067C7--> <ISPARENT><![CDATA[N]]></ISPARENT> diff -r a2bb7e6fb443 -r d0357aced767 src-db/database/sourcedata/AD_MODULE.xml --- a/src-db/database/sourcedata/AD_MODULE.xml Thu Oct 07 16:53:30 2010 +0200 +++ b/src-db/database/sourcedata/AD_MODULE.xml Sat Oct 09 12:43:47 2010 +0000 @@ -6,7 +6,7 @@ <!--0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--0--> <NAME><![CDATA[Core]]></NAME> -<!--0--> <VERSION><![CDATA[2.50.18452]]></VERSION> +<!--0--> <VERSION><![CDATA[2.50.18511]]></VERSION> <!--0--> <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION> <!--0--> <HELP><![CDATA[Core module is the base one, all developments in core are included as part of the standard Openbravo ERP.]]></HELP> <!--0--> <URL><![CDATA[www.openbravo.com]]></URL> @@ -22,7 +22,7 @@ <!--0--> <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE> <!--0--> <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA> <!--0--> <REFERENCEDATAINFO><![CDATA[Standard document types for orders, invoices, etc. and settings]]></REFERENCEDATAINFO> -<!--0--> <VERSION_LABEL><![CDATA[dev]]></VERSION_LABEL> +<!--0--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL> <!--0--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL> <!--0--></AD_MODULE> diff -r a2bb7e6fb443 -r d0357aced767 src-db/database/sourcedata/AD_VAL_RULE.xml --- a/src-db/database/sourcedata/AD_VAL_RULE.xml Thu Oct 07 16:53:30 2010 +0200 +++ b/src-db/database/sourcedata/AD_VAL_RULE.xml Sat Oct 09 12:43:47 2010 +0000 @@ -1292,6 +1292,18 @@ <!--324A9767D9B94A8A8154DEB3ACA6E063--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--324A9767D9B94A8A8154DEB3ACA6E063--></AD_VAL_RULE> +<!--34A2733B41B04DC19B3E54F764753D19--><AD_VAL_RULE> +<!--34A2733B41B04DC19B3E54F764753D19--> <AD_VAL_RULE_ID><![CDATA[34A2733B41B04DC19B3E54F764753D19]]></AD_VAL_RULE_ID> +<!--34A2733B41B04DC19B3E54F764753D19--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--34A2733B41B04DC19B3E54F764753D19--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--34A2733B41B04DC19B3E54F764753D19--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--34A2733B41B04DC19B3E54F764753D19--> <NAME><![CDATA[FIN_PaymentMethodsWithAccount]]></NAME> +<!--34A2733B41B04DC19B3E54F764753D19--> <DESCRIPTION><![CDATA[Filters only the payment methods that belong to a financial account]]></DESCRIPTION> +<!--34A2733B41B04DC19B3E54F764753D19--> <TYPE><![CDATA[S]]></TYPE> +<!--34A2733B41B04DC19B3E54F764753D19--> <CODE><![CDATA[EXISTS (SELECT 1 FROM FIN_FinAcc_PaymentMethod fapm WHERE FIN_PaymentMethod.FIN_PaymentMethod_ID=fapm.FIN_PaymentMethod_ID AND (AD_ISORGINCLUDED(FIN_PaymentMethod.AD_Org_ID, @AD_Org_ID@, @#AD_Client_ID@) <> '-1' or AD_ISORGINCLUDED(@AD_Org_ID@, FIN_PaymentMethod.AD_Org_ID, @#AD_Client_ID@) <> '-1'))]]></CODE> +<!--34A2733B41B04DC19B3E54F764753D19--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--34A2733B41B04DC19B3E54F764753D19--></AD_VAL_RULE> + <!--412A6B4D1F2E4A6B930262AE30F07775--><AD_VAL_RULE> <!--412A6B4D1F2E4A6B930262AE30F07775--> <AD_VAL_RULE_ID><![CDATA[412A6B4D1F2E4A6B930262AE30F07775]]></AD_VAL_RULE_ID> <!--412A6B4D1F2E4A6B930262AE30F07775--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -1515,6 +1527,18 @@ <!--9C6989B15CEA4987A502C0F5FF02B171--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--9C6989B15CEA4987A502C0F5FF02B171--></AD_VAL_RULE> +<!--9D87FCD2F19D4CB7AA55F15F5A6C0FBA--><AD_VAL_RULE> +<!--9D87FCD2F19D4CB7AA55F15F5A6C0FBA--> <AD_VAL_RULE_ID><![CDATA[9D87FCD2F19D4CB7AA55F15F5A6C0FBA]]></AD_VAL_RULE_ID> +<!--9D87FCD2F19D4CB7AA55F15F5A6C0FBA--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--9D87FCD2F19D4CB7AA55F15F5A6C0FBA--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--9D87FCD2F19D4CB7AA55F15F5A6C0FBA--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--9D87FCD2F19D4CB7AA55F15F5A6C0FBA--> <NAME><![CDATA[FIN_PaymentMethodsInSameTree]]></NAME> +<!--9D87FCD2F19D4CB7AA55F15F5A6C0FBA--> <DESCRIPTION><![CDATA[Filters the payment methods available in the same organization tree.]]></DESCRIPTION> +<!--9D87FCD2F19D4CB7AA55F15F5A6C0FBA--> <TYPE><![CDATA[S]]></TYPE> +<!--9D87FCD2F19D4CB7AA55F15F5A6C0FBA--> <CODE><![CDATA[AD_ISORGINCLUDED(FIN_PaymentMethod.AD_Org_ID, @AD_Org_ID@, @#AD_Client_ID@) <> '-1' or AD_ISORGINCLUDED(@AD_Org_ID@, FIN_PaymentMethod.AD_Org_ID, @#AD_Client_ID@) <> '-1']]></CODE> +<!--9D87FCD2F19D4CB7AA55F15F5A6C0FBA--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--9D87FCD2F19D4CB7AA55F15F5A6C0FBA--></AD_VAL_RULE> + <!--9FC2173799A04679A6D2CBFF5FD84435--><AD_VAL_RULE> <!--9FC2173799A04679A6D2CBFF5FD84435--> <AD_VAL_RULE_ID><![CDATA[9FC2173799A04679A6D2CBFF5FD84435]]></AD_VAL_RULE_ID> <!--9FC2173799A04679A6D2CBFF5FD84435--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> ------------------------------------------------------------------------------ Beautiful is writing same markup. Internet Explorer 9 supports standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3. Spend less time writing and rewriting code and more time creating great experiences on the web. Be a part of the beta today. http://p.sf.net/sfu/beautyoftheweb _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
