details: https://code.openbravo.com/erp/devel/pi/rev/6010faa03736 changeset: 19083:6010faa03736 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Tue Dec 18 15:24:01 2012 +0100 summary: Fixed bug 22613 Rename Accounting Schema Currency debit/credit Rename Accounting Schema Currency debit/credit by general ledger currency debit/credit.
details: https://code.openbravo.com/erp/devel/pi/rev/adca7213b9d7 changeset: 19084:adca7213b9d7 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Wed Dec 19 11:10:33 2012 +0100 summary: Fixed bug 22614 Modified behavior to fields AcctSchema Currency Debit/Credit diffstat: src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 11 ++++++++++ src-db/database/sourcedata/AD_COLUMN.xml | 2 +- src-db/database/sourcedata/AD_ELEMENT.xml | 8 +++--- src-db/database/sourcedata/AD_FIELD.xml | 4 +- src/org/openbravo/erpCommon/ad_callouts/SL_JournalLineAmt.java | 5 +-- src/org/openbravo/erpCommon/ad_callouts/SL_JournalLineAmt_data.xsql | 8 +++++++ 6 files changed, 28 insertions(+), 10 deletions(-) diffs (117 lines): diff -r 06f7621a2907 -r adca7213b9d7 src-db/database/sourcedata/AD_AUXILIARINPUT.xml --- a/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Tue Dec 18 13:34:45 2012 +0100 +++ b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Wed Dec 19 11:10:33 2012 +0100 @@ -1177,6 +1177,17 @@ <!--323203DAE86B4C3C863F41066F84F8D7--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--323203DAE86B4C3C863F41066F84F8D7--></AD_AUXILIARINPUT> +<!--3398FFC56C9D48689C928F45C7A3745A--><AD_AUXILIARINPUT> +<!--3398FFC56C9D48689C928F45C7A3745A--> <AD_AUXILIARINPUT_ID><![CDATA[3398FFC56C9D48689C928F45C7A3745A]]></AD_AUXILIARINPUT_ID> +<!--3398FFC56C9D48689C928F45C7A3745A--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--3398FFC56C9D48689C928F45C7A3745A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--3398FFC56C9D48689C928F45C7A3745A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--3398FFC56C9D48689C928F45C7A3745A--> <AD_TAB_ID><![CDATA[161]]></AD_TAB_ID> +<!--3398FFC56C9D48689C928F45C7A3745A--> <NAME><![CDATA[currency]]></NAME> +<!--3398FFC56C9D48689C928F45C7A3745A--> <CODE><![CDATA[@SQL=select c_currency_id from gl_journal where gl_journal_id=@gl_journal_id@]]></CODE> +<!--3398FFC56C9D48689C928F45C7A3745A--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--3398FFC56C9D48689C928F45C7A3745A--></AD_AUXILIARINPUT> + <!--34065C76DEE94FF2950664515FD757BF--><AD_AUXILIARINPUT> <!--34065C76DEE94FF2950664515FD757BF--> <AD_AUXILIARINPUT_ID><![CDATA[34065C76DEE94FF2950664515FD757BF]]></AD_AUXILIARINPUT_ID> <!--34065C76DEE94FF2950664515FD757BF--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 06f7621a2907 -r adca7213b9d7 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Tue Dec 18 13:34:45 2012 +0100 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Wed Dec 19 11:10:33 2012 +0100 @@ -23966,7 +23966,7 @@ <!--1678--> <AD_TABLE_ID><![CDATA[226]]></AD_TABLE_ID> <!--1678--> <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID> <!--1678--> <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH> -<!--1678--> <DEFAULTVALUE><![CDATA[@C_Currency_ID@]]></DEFAULTVALUE> +<!--1678--> <DEFAULTVALUE><![CDATA[@currency@]]></DEFAULTVALUE> <!--1678--> <ISKEY><![CDATA[N]]></ISKEY> <!--1678--> <ISPARENT><![CDATA[N]]></ISPARENT> <!--1678--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> diff -r 06f7621a2907 -r adca7213b9d7 src-db/database/sourcedata/AD_ELEMENT.xml --- a/src-db/database/sourcedata/AD_ELEMENT.xml Tue Dec 18 13:34:45 2012 +0100 +++ b/src-db/database/sourcedata/AD_ELEMENT.xml Wed Dec 19 11:10:33 2012 +0100 @@ -20593,8 +20593,8 @@ <!--0131585AC1F246DBAF6B84E53534F5FA--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--0131585AC1F246DBAF6B84E53534F5FA--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--0131585AC1F246DBAF6B84E53534F5FA--> <COLUMNNAME><![CDATA[AmtAcctCr]]></COLUMNNAME> -<!--0131585AC1F246DBAF6B84E53534F5FA--> <NAME><![CDATA[Accounting Schema Currency Credit]]></NAME> -<!--0131585AC1F246DBAF6B84E53534F5FA--> <PRINTNAME><![CDATA[Accounting Schema Currency Credit]]></PRINTNAME> +<!--0131585AC1F246DBAF6B84E53534F5FA--> <NAME><![CDATA[General Ledger Currency Credit]]></NAME> +<!--0131585AC1F246DBAF6B84E53534F5FA--> <PRINTNAME><![CDATA[General Ledger Currency Credit]]></PRINTNAME> <!--0131585AC1F246DBAF6B84E53534F5FA--> <DESCRIPTION><![CDATA[The amount credited to an account, converted to the organization default currency.]]></DESCRIPTION> <!--0131585AC1F246DBAF6B84E53534F5FA--> <HELP><![CDATA[The Account Credit Amount indicates the transaction amount converted to this organization's accounting currency]]></HELP> <!--0131585AC1F246DBAF6B84E53534F5FA--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> @@ -21196,8 +21196,8 @@ <!--2EB6010EAA174169880C588220EFE7B8--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--2EB6010EAA174169880C588220EFE7B8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--2EB6010EAA174169880C588220EFE7B8--> <COLUMNNAME><![CDATA[AmtAcctDr]]></COLUMNNAME> -<!--2EB6010EAA174169880C588220EFE7B8--> <NAME><![CDATA[Accounting Schema Currency Debit]]></NAME> -<!--2EB6010EAA174169880C588220EFE7B8--> <PRINTNAME><![CDATA[Accounting Schema Currency Debit]]></PRINTNAME> +<!--2EB6010EAA174169880C588220EFE7B8--> <NAME><![CDATA[General Ledger Currency Debit]]></NAME> +<!--2EB6010EAA174169880C588220EFE7B8--> <PRINTNAME><![CDATA[General Ledger Currency Debit]]></PRINTNAME> <!--2EB6010EAA174169880C588220EFE7B8--> <DESCRIPTION><![CDATA[The amount debited to an account, converted to the organization default currency.]]></DESCRIPTION> <!--2EB6010EAA174169880C588220EFE7B8--> <HELP><![CDATA[The Account Debit Amount indicates the transaction amount converted to this organization's accounting currency]]></HELP> <!--2EB6010EAA174169880C588220EFE7B8--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> diff -r 06f7621a2907 -r adca7213b9d7 src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml Tue Dec 18 13:34:45 2012 +0100 +++ b/src-db/database/sourcedata/AD_FIELD.xml Wed Dec 19 11:10:33 2012 +0100 @@ -10455,7 +10455,7 @@ <!--730--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--730--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--730--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--730--> <NAME><![CDATA[Accounting Schema Currency Debit]]></NAME> +<!--730--> <NAME><![CDATA[General Ledger Currency Debit]]></NAME> <!--730--> <DESCRIPTION><![CDATA[The amount debited to an account, converted to the organization default currency.]]></DESCRIPTION> <!--730--> <HELP><![CDATA[The Account Debit Amount indicates the transaction amount converted to this organization's accounting currency]]></HELP> <!--730--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> @@ -10484,7 +10484,7 @@ <!--731--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--731--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--731--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--731--> <NAME><![CDATA[Accounting Schema Currency Credit]]></NAME> +<!--731--> <NAME><![CDATA[General Ledger Currency Credit]]></NAME> <!--731--> <DESCRIPTION><![CDATA[The amount credited to an account, converted to the organization default currency.]]></DESCRIPTION> <!--731--> <HELP><![CDATA[The Account Credit Amount indicates the transaction amount converted to this organization's accounting currency]]></HELP> <!--731--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> diff -r 06f7621a2907 -r adca7213b9d7 src/org/openbravo/erpCommon/ad_callouts/SL_JournalLineAmt.java --- a/src/org/openbravo/erpCommon/ad_callouts/SL_JournalLineAmt.java Tue Dec 18 13:34:45 2012 +0100 +++ b/src/org/openbravo/erpCommon/ad_callouts/SL_JournalLineAmt.java Wed Dec 19 11:10:33 2012 +0100 @@ -59,7 +59,6 @@ String strAmtSourceDr = vars.getNumericParameter("inpamtsourcedr", "0"); String strAmtSourceCr = vars.getNumericParameter("inpamtsourcecr", "0"); String strTabId = vars.getStringParameter("inpTabId"); - try { printPage(response, vars, strGLJournal, strCurrencyRate, strCurrency, strDateAcct, strCurrencyRateType, strWindowId, strAmtSourceDr, strAmtSourceCr, strTabId); @@ -77,8 +76,8 @@ if (log4j.isDebugEnabled()) log4j.debug("Output: dataSheet"); XmlDocument xmlDocument = xmlEngine.readXmlTemplate( - "org/openbravo/erpCommon/ad_callouts/CallOut").createXmlDocument(); - String strAcctSchema = Utility.getContext(this, vars, "$C_ACCTSCHEMA_ID", strWindowId); + "org/openbravo/erpCommon/ad_callouts/CallOut").createXmlDocument(); + String strAcctSchema = SLJournalLineAmtData.selectGeneralLedger(this,strGLJournal); SLJournalLineAmtData[] data = SLJournalLineAmtData.select(this, strAcctSchema); String strPrecision = "2", strTargetCurrencyId = ""; if (data != null && data.length > 0) { diff -r 06f7621a2907 -r adca7213b9d7 src/org/openbravo/erpCommon/ad_callouts/SL_JournalLineAmt_data.xsql --- a/src/org/openbravo/erpCommon/ad_callouts/SL_JournalLineAmt_data.xsql Tue Dec 18 13:34:45 2012 +0100 +++ b/src/org/openbravo/erpCommon/ad_callouts/SL_JournalLineAmt_data.xsql Wed Dec 19 11:10:33 2012 +0100 @@ -58,4 +58,12 @@ <Parameter name="cCurrencyId"/> <Parameter name="currencyRateType"/> </SqlMethod> + <SqlMethod name="selectGeneralLedger" type="preparedStatement" return="String"> + <SqlMethodComment></SqlMethodComment> + <Sql> + select c_acctschema_id from gl_journal + where gl_journal.gl_journal_id=? + </Sql> + <Parameter name="GLJournalId"/> + </SqlMethod> </SqlClass> ------------------------------------------------------------------------------ LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial Remotely access PCs and mobile devices and provide instant support Improve your efficiency, and focus on delivering more value-add services Discover what IT Professionals Know. Rescue delivers http://p.sf.net/sfu/logmein_12329d2d _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
