details: https://code.openbravo.com/erp/devel/pi/rev/388c18db9da5 changeset: 33167:388c18db9da5 user: Atul Gaware <atul.gaware <at> openbravo.com> date: Thu Nov 30 01:57:38 2017 +0530 summary: Fixes Issue 37239:Negative quantity is invoiced if Credit Memo is used for invoicing Return From Customer and Return Material Receipt
** Return document type cannot be configured with Credit Memo as document type for invoice. ** Create Line From button not shown in Sales/Purchase Invoice when Credit Memo document type is used. details: https://code.openbravo.com/erp/devel/pi/rev/d22996575a61 changeset: 33168:d22996575a61 user: David Miguelez <david.miguelez <at> openbravo.com> date: Fri Dec 01 11:59:57 2017 +0100 summary: Related to Issue 37239. Code Review changes: * Display logic of fields changed to filter only documents that are set as isReversal = Y * Created Auxiliary inputs for display logics * Changed Validation Rule. ARC and APC document types should not be used to generate invoices from other processes regardless of the return flag of the document diffstat: src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 24 ++++++++++++++++++++++++ src-db/database/sourcedata/AD_COLUMN.xml | 2 +- src-db/database/sourcedata/AD_FIELD.xml | 4 ++-- src-db/database/sourcedata/AD_VAL_RULE.xml | 11 +++++++++++ 4 files changed, 38 insertions(+), 3 deletions(-) diffs (95 lines): diff -r 3bc0a27d7a33 -r d22996575a61 src-db/database/sourcedata/AD_AUXILIARINPUT.xml --- a/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Wed Jan 03 11:37:19 2018 +0000 +++ b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Fri Dec 01 11:59:57 2017 +0100 @@ -1430,6 +1430,18 @@ <!--2F68ED80A1824966845A6CED4A2B5B45--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--2F68ED80A1824966845A6CED4A2B5B45--></AD_AUXILIARINPUT> +<!--2FD1AE5689D342FF94A2704690CEE517--><AD_AUXILIARINPUT> +<!--2FD1AE5689D342FF94A2704690CEE517--> <AD_AUXILIARINPUT_ID><![CDATA[2FD1AE5689D342FF94A2704690CEE517]]></AD_AUXILIARINPUT_ID> +<!--2FD1AE5689D342FF94A2704690CEE517--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--2FD1AE5689D342FF94A2704690CEE517--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--2FD1AE5689D342FF94A2704690CEE517--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--2FD1AE5689D342FF94A2704690CEE517--> <AD_TAB_ID><![CDATA[263]]></AD_TAB_ID> +<!--2FD1AE5689D342FF94A2704690CEE517--> <NAME><![CDATA[IsReversalDocument]]></NAME> +<!--2FD1AE5689D342FF94A2704690CEE517--> <CODE><![CDATA[@SQL=select isreversal +from c_doctype where c_doctype_id = @c_doctypetarget_id@]]></CODE> +<!--2FD1AE5689D342FF94A2704690CEE517--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--2FD1AE5689D342FF94A2704690CEE517--></AD_AUXILIARINPUT> + <!--311BE34CB1684926877B28AFE1939C26--><AD_AUXILIARINPUT> <!--311BE34CB1684926877B28AFE1939C26--> <AD_AUXILIARINPUT_ID><![CDATA[311BE34CB1684926877B28AFE1939C26]]></AD_AUXILIARINPUT_ID> <!--311BE34CB1684926877B28AFE1939C26--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -2293,6 +2305,18 @@ <!--5C17038A0D494AF591B907104586C9B6--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--5C17038A0D494AF591B907104586C9B6--></AD_AUXILIARINPUT> +<!--5D10E446E9ED4DB7B94A83792C9F42CC--><AD_AUXILIARINPUT> +<!--5D10E446E9ED4DB7B94A83792C9F42CC--> <AD_AUXILIARINPUT_ID><![CDATA[5D10E446E9ED4DB7B94A83792C9F42CC]]></AD_AUXILIARINPUT_ID> +<!--5D10E446E9ED4DB7B94A83792C9F42CC--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--5D10E446E9ED4DB7B94A83792C9F42CC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--5D10E446E9ED4DB7B94A83792C9F42CC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--5D10E446E9ED4DB7B94A83792C9F42CC--> <AD_TAB_ID><![CDATA[290]]></AD_TAB_ID> +<!--5D10E446E9ED4DB7B94A83792C9F42CC--> <NAME><![CDATA[IsReversalDocument]]></NAME> +<!--5D10E446E9ED4DB7B94A83792C9F42CC--> <CODE><![CDATA[@SQL=select isreversal +from c_doctype where c_doctype_id = @c_doctypetarget_id@]]></CODE> +<!--5D10E446E9ED4DB7B94A83792C9F42CC--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--5D10E446E9ED4DB7B94A83792C9F42CC--></AD_AUXILIARINPUT> + <!--5EE498F6C1484535A77A8CE36D96C77B--><AD_AUXILIARINPUT> <!--5EE498F6C1484535A77A8CE36D96C77B--> <AD_AUXILIARINPUT_ID><![CDATA[5EE498F6C1484535A77A8CE36D96C77B]]></AD_AUXILIARINPUT_ID> <!--5EE498F6C1484535A77A8CE36D96C77B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 3bc0a27d7a33 -r d22996575a61 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Wed Jan 03 11:37:19 2018 +0000 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Fri Dec 01 11:59:57 2017 +0100 @@ -69516,7 +69516,7 @@ <!--3916--> <AD_TABLE_ID><![CDATA[217]]></AD_TABLE_ID> <!--3916--> <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID> <!--3916--> <AD_REFERENCE_VALUE_ID><![CDATA[170]]></AD_REFERENCE_VALUE_ID> -<!--3916--> <AD_VAL_RULE_ID><![CDATA[124]]></AD_VAL_RULE_ID> +<!--3916--> <AD_VAL_RULE_ID><![CDATA[CBA25061F3834619B0401E0834F43B2D]]></AD_VAL_RULE_ID> <!--3916--> <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH> <!--3916--> <ISKEY><![CDATA[N]]></ISKEY> <!--3916--> <ISPARENT><![CDATA[N]]></ISPARENT> diff -r 3bc0a27d7a33 -r d22996575a61 src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml Wed Jan 03 11:37:19 2018 +0000 +++ b/src-db/database/sourcedata/AD_FIELD.xml Fri Dec 01 11:59:57 2017 +0100 @@ -56093,7 +56093,7 @@ <!--4244--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> <!--4244--> <AD_FIELDGROUP_ID><![CDATA[101]]></AD_FIELDGROUP_ID> <!--4244--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> -<!--4244--> <DISPLAYLOGIC><![CDATA[@Processed@='N']]></DISPLAYLOGIC> +<!--4244--> <DISPLAYLOGIC><![CDATA[@Processed@='N' & @IsReversalDocument@='N']]></DISPLAYLOGIC> <!--4244--> <DISPLAYLENGTH><![CDATA[23]]></DISPLAYLENGTH> <!--4244--> <ISREADONLY><![CDATA[N]]></ISREADONLY> <!--4244--> <SEQNO><![CDATA[357]]></SEQNO> @@ -56149,7 +56149,7 @@ <!--4246--> <AD_COLUMN_ID><![CDATA[5351]]></AD_COLUMN_ID> <!--4246--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> <!--4246--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> -<!--4246--> <DISPLAYLOGIC><![CDATA[@Processed@='N']]></DISPLAYLOGIC> +<!--4246--> <DISPLAYLOGIC><![CDATA[@Processed@='N' & @IsReversalDocument@='N']]></DISPLAYLOGIC> <!--4246--> <DISPLAYLENGTH><![CDATA[23]]></DISPLAYLENGTH> <!--4246--> <ISREADONLY><![CDATA[N]]></ISREADONLY> <!--4246--> <SEQNO><![CDATA[560]]></SEQNO> diff -r 3bc0a27d7a33 -r d22996575a61 src-db/database/sourcedata/AD_VAL_RULE.xml --- a/src-db/database/sourcedata/AD_VAL_RULE.xml Wed Jan 03 11:37:19 2018 +0000 +++ b/src-db/database/sourcedata/AD_VAL_RULE.xml Fri Dec 01 11:59:57 2017 +0100 @@ -2254,6 +2254,17 @@ <!--CB5E64F7BDBA4A51AEEBC48E317A6F0E--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--CB5E64F7BDBA4A51AEEBC48E317A6F0E--></AD_VAL_RULE> +<!--CBA25061F3834619B0401E0834F43B2D--><AD_VAL_RULE> +<!--CBA25061F3834619B0401E0834F43B2D--> <AD_VAL_RULE_ID><![CDATA[CBA25061F3834619B0401E0834F43B2D]]></AD_VAL_RULE_ID> +<!--CBA25061F3834619B0401E0834F43B2D--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--CBA25061F3834619B0401E0834F43B2D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--CBA25061F3834619B0401E0834F43B2D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--CBA25061F3834619B0401E0834F43B2D--> <NAME><![CDATA[Document Type for Invoice]]></NAME> +<!--CBA25061F3834619B0401E0834F43B2D--> <TYPE><![CDATA[S]]></TYPE> +<!--CBA25061F3834619B0401E0834F43B2D--> <CODE><![CDATA[C_DocType.DocBaseType IN ('ARI', 'API', 'ARI_RM') AND C_DocType.IsSOTrx='@IsSOTrx@' AND (AD_ISORGINCLUDED(@AD_Org_ID@,C_DocType.AD_Org_ID, @#AD_Client_ID@) <> '-1' OR COALESCE(@AD_Org_ID@,'-1')='-1')]]></CODE> +<!--CBA25061F3834619B0401E0834F43B2D--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--CBA25061F3834619B0401E0834F43B2D--></AD_VAL_RULE> + <!--CCE7193FD3BF470E8155135B591F3ADE--><AD_VAL_RULE> <!--CCE7193FD3BF470E8155135B591F3ADE--> <AD_VAL_RULE_ID><![CDATA[CCE7193FD3BF470E8155135B591F3ADE]]></AD_VAL_RULE_ID> <!--CCE7193FD3BF470E8155135B591F3ADE--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
