details: https://code.openbravo.com/erp/devel/pi/rev/74d6dae0ad84 changeset: 19344:74d6dae0ad84 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Thu Jan 17 09:47:46 2013 +0100 summary: Fixes issue 21974: Wrong display logic for Rate file in G/L Journal Header tab.
details: https://code.openbravo.com/erp/devel/pi/rev/d9ebde33bd63 changeset: 19345:d9ebde33bd63 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Thu Jan 17 09:49:44 2013 +0100 summary: Fixes issue 21963: Tax Payment process wrong message. When the GLItem used has no accounting defined. diffstat: src-db/database/model/functions/C_TAXPAYMENT_POST.xml | 4 ++++ src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 11 +++++++++++ src-db/database/sourcedata/AD_FIELD.xml | 2 +- src-db/database/sourcedata/AD_MESSAGE.xml | 11 +++++++++++ 4 files changed, 27 insertions(+), 1 deletions(-) diffs (68 lines): diff -r beee8329d842 -r d9ebde33bd63 src-db/database/model/functions/C_TAXPAYMENT_POST.xml --- a/src-db/database/model/functions/C_TAXPAYMENT_POST.xml Fri Jan 18 10:37:21 2013 +0100 +++ b/src-db/database/model/functions/C_TAXPAYMENT_POST.xml Thu Jan 17 09:49:44 2013 +0100 @@ -312,6 +312,10 @@ where tt.isactive='Y' and gia.isactive='Y' and tt.issotrx= case when v_totalcredit - v_totaldebit > 0 then 'N' else 'Y' end group by tt.issotrx; + if (v_glitem_acct is null) then + RAISE_APPLICATION_ERROR(-20000, '@NoAcctForGLItem@'); + end if; + if v_totalcredit - v_totaldebit > 0 then v_totalcredit := v_totalcredit - v_totaldebit; diff -r beee8329d842 -r d9ebde33bd63 src-db/database/sourcedata/AD_AUXILIARINPUT.xml --- a/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Fri Jan 18 10:37:21 2013 +0100 +++ b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Thu Jan 17 09:49:44 2013 +0100 @@ -2453,6 +2453,17 @@ <!--C35DA2D62DA94A9D9651386D5112070A--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--C35DA2D62DA94A9D9651386D5112070A--></AD_AUXILIARINPUT> +<!--C382CB93EB254FC68DB7D25B34A5A6F0--><AD_AUXILIARINPUT> +<!--C382CB93EB254FC68DB7D25B34A5A6F0--> <AD_AUXILIARINPUT_ID><![CDATA[C382CB93EB254FC68DB7D25B34A5A6F0]]></AD_AUXILIARINPUT_ID> +<!--C382CB93EB254FC68DB7D25B34A5A6F0--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--C382CB93EB254FC68DB7D25B34A5A6F0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--C382CB93EB254FC68DB7D25B34A5A6F0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--C382CB93EB254FC68DB7D25B34A5A6F0--> <AD_TAB_ID><![CDATA[160]]></AD_TAB_ID> +<!--C382CB93EB254FC68DB7D25B34A5A6F0--> <NAME><![CDATA[batchCurrency]]></NAME> +<!--C382CB93EB254FC68DB7D25B34A5A6F0--> <CODE><![CDATA[@SQL=select c_currency_id from gl_journalbatch where gl_journalbatch_id=@gl_journalbatch_id@]]></CODE> +<!--C382CB93EB254FC68DB7D25B34A5A6F0--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--C382CB93EB254FC68DB7D25B34A5A6F0--></AD_AUXILIARINPUT> + <!--C441F89C599549A7B69321E975DB0D4E--><AD_AUXILIARINPUT> <!--C441F89C599549A7B69321E975DB0D4E--> <AD_AUXILIARINPUT_ID><![CDATA[C441F89C599549A7B69321E975DB0D4E]]></AD_AUXILIARINPUT_ID> <!--C441F89C599549A7B69321E975DB0D4E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r beee8329d842 -r d9ebde33bd63 src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml Fri Jan 18 10:37:21 2013 +0100 +++ b/src-db/database/sourcedata/AD_FIELD.xml Thu Jan 17 09:49:44 2013 +0100 @@ -11040,7 +11040,7 @@ <!--883--> <AD_COLUMN_ID><![CDATA[1792]]></AD_COLUMN_ID> <!--883--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> <!--883--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> -<!--883--> <DISPLAYLOGIC><![CDATA[@C_Currency_ID@!@$C_Currency_ID@]]></DISPLAYLOGIC> +<!--883--> <DISPLAYLOGIC><![CDATA[@C_Currency_ID@!@batchCurrency@]]></DISPLAYLOGIC> <!--883--> <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH> <!--883--> <ISREADONLY><![CDATA[N]]></ISREADONLY> <!--883--> <SEQNO><![CDATA[100]]></SEQNO> diff -r beee8329d842 -r d9ebde33bd63 src-db/database/sourcedata/AD_MESSAGE.xml --- a/src-db/database/sourcedata/AD_MESSAGE.xml Fri Jan 18 10:37:21 2013 +0100 +++ b/src-db/database/sourcedata/AD_MESSAGE.xml Thu Jan 17 09:49:44 2013 +0100 @@ -16852,6 +16852,17 @@ <!--4D4E566D206546908DB84B065999789C--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--4D4E566D206546908DB84B065999789C--></AD_MESSAGE> +<!--4D6A63EA1EF84C488D3E03F82C33C54C--><AD_MESSAGE> +<!--4D6A63EA1EF84C488D3E03F82C33C54C--> <AD_MESSAGE_ID><![CDATA[4D6A63EA1EF84C488D3E03F82C33C54C]]></AD_MESSAGE_ID> +<!--4D6A63EA1EF84C488D3E03F82C33C54C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--4D6A63EA1EF84C488D3E03F82C33C54C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--4D6A63EA1EF84C488D3E03F82C33C54C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--4D6A63EA1EF84C488D3E03F82C33C54C--> <VALUE><![CDATA[NoAcctForGLItem]]></VALUE> +<!--4D6A63EA1EF84C488D3E03F82C33C54C--> <MSGTEXT><![CDATA[GL Item defined in Tax Register Type does not have accounting defined]]></MSGTEXT> +<!--4D6A63EA1EF84C488D3E03F82C33C54C--> <MSGTYPE><![CDATA[E]]></MSGTYPE> +<!--4D6A63EA1EF84C488D3E03F82C33C54C--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--4D6A63EA1EF84C488D3E03F82C33C54C--></AD_MESSAGE> + <!--4D9D19A1456149D49B1485BB23861483--><AD_MESSAGE> <!--4D9D19A1456149D49B1485BB23861483--> <AD_MESSAGE_ID><![CDATA[4D9D19A1456149D49B1485BB23861483]]></AD_MESSAGE_ID> <!--4D9D19A1456149D49B1485BB23861483--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> ------------------------------------------------------------------------------ Master HTML5, CSS3, ASP.NET, MVC, AJAX, Knockout.js, Web API and much more. Get web development skills now with LearnDevNow - 350+ hours of step-by-step video tutorials by Microsoft MVPs and experts. SALE $99.99 this month only -- learn more at: http://p.sf.net/sfu/learnmore_122812 _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
