details: https://code.openbravo.com/erp/devel/pi/rev/46a20957f70c changeset: 26077:46a20957f70c user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Tue Feb 24 14:12:20 2015 +0100 summary: Fixes issue 29041: Period is not automatically populated in G/L Journal window
Defaultvalue from C_Period_ID column in GL_JournalBatch table has been changed to get current date instead of accounting date, which is null when creating a new record. details: https://code.openbravo.com/erp/devel/pi/rev/e72f5b99ab8b changeset: 26078:e72f5b99ab8b user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Mon Feb 23 18:52:28 2015 +0100 summary: Fixes issue 29029: SL_Journal_Period raises a NullPointer Exception AcctSchema will be retrieved only if acctSchemaId is not null (G/L Journal Header tab). In other case (G/L Journal Batch tab) it will not. details: https://code.openbravo.com/erp/devel/pi/rev/83ddad268c60 changeset: 26079:83ddad268c60 user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Tue Feb 24 12:47:00 2015 +0100 summary: Fixes issue 29016: G/L Journal Header dates are not copied from G/L Journal Defaultvalues of document date and accounting date in G/L Journal Header tab have been modified in order to be copied from G/L Journal Batch tab when the window is G/L Journal. If the window is Simple G/L Journal, document date and accounting date will be setted as current date. diffstat: src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 44 ++++++++++ src-db/database/sourcedata/AD_COLUMN.xml | 6 +- src/org/openbravo/erpCommon/ad_callouts/SL_Journal_Period.java | 22 ++-- 3 files changed, 60 insertions(+), 12 deletions(-) diffs (145 lines): diff -r 05e90afd7678 -r 83ddad268c60 src-db/database/sourcedata/AD_AUXILIARINPUT.xml --- a/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Wed Feb 25 18:18:59 2015 +0100 +++ b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Tue Feb 24 12:47:00 2015 +0100 @@ -950,6 +950,17 @@ <!--10444AA4DB1D49D7A621F1EF47787122--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--10444AA4DB1D49D7A621F1EF47787122--></AD_AUXILIARINPUT> +<!--11F547AAB1824D9E84B5D29A0EE20151--><AD_AUXILIARINPUT> +<!--11F547AAB1824D9E84B5D29A0EE20151--> <AD_AUXILIARINPUT_ID><![CDATA[11F547AAB1824D9E84B5D29A0EE20151]]></AD_AUXILIARINPUT_ID> +<!--11F547AAB1824D9E84B5D29A0EE20151--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--11F547AAB1824D9E84B5D29A0EE20151--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--11F547AAB1824D9E84B5D29A0EE20151--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--11F547AAB1824D9E84B5D29A0EE20151--> <AD_TAB_ID><![CDATA[5A6F0ED7230C462BA4010653BA3F816A]]></AD_TAB_ID> +<!--11F547AAB1824D9E84B5D29A0EE20151--> <NAME><![CDATA[HeaderDateDoc]]></NAME> +<!--11F547AAB1824D9E84B5D29A0EE20151--> <CODE><![CDATA[@#Date@]]></CODE> +<!--11F547AAB1824D9E84B5D29A0EE20151--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--11F547AAB1824D9E84B5D29A0EE20151--></AD_AUXILIARINPUT> + <!--1453726EFC4B4E2898296BB44A7172ED--><AD_AUXILIARINPUT> <!--1453726EFC4B4E2898296BB44A7172ED--> <AD_AUXILIARINPUT_ID><![CDATA[1453726EFC4B4E2898296BB44A7172ED]]></AD_AUXILIARINPUT_ID> <!--1453726EFC4B4E2898296BB44A7172ED--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -1056,6 +1067,17 @@ <!--1C970FF3B6D74C7AB018305EFE3868A8--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--1C970FF3B6D74C7AB018305EFE3868A8--></AD_AUXILIARINPUT> +<!--1E6CEFEA7ECC4F8484197810616CCA18--><AD_AUXILIARINPUT> +<!--1E6CEFEA7ECC4F8484197810616CCA18--> <AD_AUXILIARINPUT_ID><![CDATA[1E6CEFEA7ECC4F8484197810616CCA18]]></AD_AUXILIARINPUT_ID> +<!--1E6CEFEA7ECC4F8484197810616CCA18--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--1E6CEFEA7ECC4F8484197810616CCA18--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--1E6CEFEA7ECC4F8484197810616CCA18--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--1E6CEFEA7ECC4F8484197810616CCA18--> <AD_TAB_ID><![CDATA[160]]></AD_TAB_ID> +<!--1E6CEFEA7ECC4F8484197810616CCA18--> <NAME><![CDATA[HeaderDateAcct]]></NAME> +<!--1E6CEFEA7ECC4F8484197810616CCA18--> <CODE><![CDATA[@DateAcct@]]></CODE> +<!--1E6CEFEA7ECC4F8484197810616CCA18--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--1E6CEFEA7ECC4F8484197810616CCA18--></AD_AUXILIARINPUT> + <!--1E9DF98D902347EE8F7D9860C934FDE9--><AD_AUXILIARINPUT> <!--1E9DF98D902347EE8F7D9860C934FDE9--> <AD_AUXILIARINPUT_ID><![CDATA[1E9DF98D902347EE8F7D9860C934FDE9]]></AD_AUXILIARINPUT_ID> <!--1E9DF98D902347EE8F7D9860C934FDE9--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -1532,6 +1554,17 @@ <!--377353A77F7A4876BE4F36592679CD4C--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--377353A77F7A4876BE4F36592679CD4C--></AD_AUXILIARINPUT> +<!--37E391C2395C4DEAB363D51BD609C502--><AD_AUXILIARINPUT> +<!--37E391C2395C4DEAB363D51BD609C502--> <AD_AUXILIARINPUT_ID><![CDATA[37E391C2395C4DEAB363D51BD609C502]]></AD_AUXILIARINPUT_ID> +<!--37E391C2395C4DEAB363D51BD609C502--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--37E391C2395C4DEAB363D51BD609C502--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--37E391C2395C4DEAB363D51BD609C502--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--37E391C2395C4DEAB363D51BD609C502--> <AD_TAB_ID><![CDATA[160]]></AD_TAB_ID> +<!--37E391C2395C4DEAB363D51BD609C502--> <NAME><![CDATA[HeaderDateDoc]]></NAME> +<!--37E391C2395C4DEAB363D51BD609C502--> <CODE><![CDATA[@DateDoc@]]></CODE> +<!--37E391C2395C4DEAB363D51BD609C502--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--37E391C2395C4DEAB363D51BD609C502--></AD_AUXILIARINPUT> + <!--38FA2581642644948132767B5CE448A4--><AD_AUXILIARINPUT> <!--38FA2581642644948132767B5CE448A4--> <AD_AUXILIARINPUT_ID><![CDATA[38FA2581642644948132767B5CE448A4]]></AD_AUXILIARINPUT_ID> <!--38FA2581642644948132767B5CE448A4--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -2319,6 +2352,17 @@ <!--6BDE684AC58045218FAEB2A11221911B--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--6BDE684AC58045218FAEB2A11221911B--></AD_AUXILIARINPUT> +<!--6CDC3757FB5042D4B1DFFF53074687F6--><AD_AUXILIARINPUT> +<!--6CDC3757FB5042D4B1DFFF53074687F6--> <AD_AUXILIARINPUT_ID><![CDATA[6CDC3757FB5042D4B1DFFF53074687F6]]></AD_AUXILIARINPUT_ID> +<!--6CDC3757FB5042D4B1DFFF53074687F6--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--6CDC3757FB5042D4B1DFFF53074687F6--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--6CDC3757FB5042D4B1DFFF53074687F6--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--6CDC3757FB5042D4B1DFFF53074687F6--> <AD_TAB_ID><![CDATA[5A6F0ED7230C462BA4010653BA3F816A]]></AD_TAB_ID> +<!--6CDC3757FB5042D4B1DFFF53074687F6--> <NAME><![CDATA[HeaderDateAcct]]></NAME> +<!--6CDC3757FB5042D4B1DFFF53074687F6--> <CODE><![CDATA[@#Date@]]></CODE> +<!--6CDC3757FB5042D4B1DFFF53074687F6--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--6CDC3757FB5042D4B1DFFF53074687F6--></AD_AUXILIARINPUT> + <!--6DD1F4E5833C453988901A926575130D--><AD_AUXILIARINPUT> <!--6DD1F4E5833C453988901A926575130D--> <AD_AUXILIARINPUT_ID><![CDATA[6DD1F4E5833C453988901A926575130D]]></AD_AUXILIARINPUT_ID> <!--6DD1F4E5833C453988901A926575130D--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 05e90afd7678 -r 83ddad268c60 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Wed Feb 25 18:18:59 2015 +0100 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Tue Feb 24 12:47:00 2015 +0100 @@ -22737,7 +22737,7 @@ <!--1634--> <AD_TABLE_ID><![CDATA[224]]></AD_TABLE_ID> <!--1634--> <AD_REFERENCE_ID><![CDATA[15]]></AD_REFERENCE_ID> <!--1634--> <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH> -<!--1634--> <DEFAULTVALUE><![CDATA[@SQL=SELECT COALESCE((SELECT ENDDATE FROM C_PERIOD WHERE C_PERIOD_ID = @C_PERIOD_ID@ and periodtype = 'A'),to_date(@#Date@)) FROM DUAL]]></DEFAULTVALUE> +<!--1634--> <DEFAULTVALUE><![CDATA[@SQL=SELECT COALESCE((SELECT ENDDATE FROM C_PERIOD WHERE C_PERIOD_ID = @C_PERIOD_ID@ and periodtype = 'A'),to_date(@HeaderDateDoc@)) FROM DUAL]]></DEFAULTVALUE> <!--1634--> <ISKEY><![CDATA[N]]></ISKEY> <!--1634--> <ISPARENT><![CDATA[N]]></ISPARENT> <!--1634--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> @@ -22775,7 +22775,7 @@ <!--1635--> <AD_TABLE_ID><![CDATA[224]]></AD_TABLE_ID> <!--1635--> <AD_REFERENCE_ID><![CDATA[15]]></AD_REFERENCE_ID> <!--1635--> <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH> -<!--1635--> <DEFAULTVALUE><![CDATA[@SQL=SELECT COALESCE((SELECT ENDDATE FROM C_PERIOD WHERE C_PERIOD_ID = @C_PERIOD_ID@ and periodtype = 'A'),to_date(@#Date@))FROM DUAL]]></DEFAULTVALUE> +<!--1635--> <DEFAULTVALUE><![CDATA[@SQL=SELECT COALESCE((SELECT ENDDATE FROM C_PERIOD WHERE C_PERIOD_ID = @C_PERIOD_ID@ and periodtype = 'A'),to_date(@HeaderDateAcct@)) FROM DUAL]]></DEFAULTVALUE> <!--1635--> <ISKEY><![CDATA[N]]></ISKEY> <!--1635--> <ISPARENT><![CDATA[N]]></ISPARENT> <!--1635--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> @@ -23412,7 +23412,7 @@ <!--1654--> <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID> <!--1654--> <AD_REFERENCE_VALUE_ID><![CDATA[233]]></AD_REFERENCE_VALUE_ID> <!--1654--> <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH> -<!--1654--> <DEFAULTVALUE><![CDATA[@SQL= SELECT C_Period_ID FROM C_Period WHERE C_Year_ID IN (SELECT C_Year_ID FROM C_Year WHERE C_Calendar_ID =(SELECT C_Calendar_ID FROM AD_ORG WHERE AD_Client_ID= @AD_Client_ID@ AND AD_ORG_ID=(SELECT AD_ORG_GETCALENDAROWNER( @AD_Org_ID@ ) from dual))) AND to_date( @DateAcct@ ) BETWEEN StartDate AND EndDate AND PeriodType='S' AND exists (select 1 from c_periodcontrol where c_periodcontrol.c_period_id = c_period.c_period_id AND periodstatus = 'O')]]></DEFAULTVALUE> +<!--1654--> <DEFAULTVALUE><![CDATA[@SQL= SELECT C_Period_ID FROM C_Period WHERE C_Year_ID IN (SELECT C_Year_ID FROM C_Year WHERE C_Calendar_ID =(SELECT C_Calendar_ID FROM AD_ORG WHERE AD_Client_ID= @AD_Client_ID@ AND AD_ORG_ID=(SELECT AD_ORG_GETCALENDAROWNER( @AD_Org_ID@ ) from dual))) AND to_date( @#Date@ ) BETWEEN StartDate AND EndDate AND PeriodType='S' AND exists (select 1 from c_periodcontrol where c_periodcontrol.c_period_id = c_period.c_period_id AND periodstatus = 'O')]]></DEFAULTVALUE> <!--1654--> <ISKEY><![CDATA[N]]></ISKEY> <!--1654--> <ISPARENT><![CDATA[N]]></ISPARENT> <!--1654--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> diff -r 05e90afd7678 -r 83ddad268c60 src/org/openbravo/erpCommon/ad_callouts/SL_Journal_Period.java --- a/src/org/openbravo/erpCommon/ad_callouts/SL_Journal_Period.java Wed Feb 25 18:18:59 2015 +0100 +++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Journal_Period.java Tue Feb 24 12:47:00 2015 +0100 @@ -79,16 +79,18 @@ String stradClientId = vars.getClient(); final String stradOrgId = vars.getGlobalVariable("inpadOrgId", "SL_Journal_Period|adOrgId", ""); - AcctSchema acctSchema = OBDal.getInstance().get(AcctSchema.class, strAcctSchemaId); + OBError myMessage = null; String currencyRate = null; - OBError myMessage = null; - try { - currencyRate = SLJournalPeriodData.getCurrencyRate(this, strCurrencyId, acctSchema - .getCurrency().getId(), strDateAcctNew, strCurrencyRateType, stradClientId, stradOrgId, - strAcctSchemaId); - } catch (Exception e) { - myMessage = Utility.translateError(this, vars, vars.getLanguage(), e.getMessage()); - log4j.warn("Currency does not exist. Exception:" + e); + if (strAcctSchemaId != null && !strAcctSchemaId.isEmpty()) { + AcctSchema acctSchema = OBDal.getInstance().get(AcctSchema.class, strAcctSchemaId); + try { + currencyRate = SLJournalPeriodData.getCurrencyRate(this, strCurrencyId, acctSchema + .getCurrency().getId(), strDateAcctNew, strCurrencyRateType, stradClientId, stradOrgId, + strAcctSchemaId); + } catch (Exception e) { + myMessage = Utility.translateError(this, vars, vars.getLanguage(), e.getMessage()); + log4j.warn("Currency does not exist. Exception:" + e); + } } String strDateAcct = strDateAcctNew; @@ -132,6 +134,8 @@ resultado.append("new Array(\"inpcPeriodId\", \"" + strcPeriodId + "\"),"); if (myMessage != null) { resultado.append("new Array('MESSAGE', \"" + myMessage.getMessage() + "\"),"); + } + if (currencyRate == null) { resultado.append("new Array(\"inpcurrencyrate\", \"" + "1" + "\")"); } else { resultado.append("new Array(\"inpcurrencyrate\", \"" + currencyRate.toString() + "\")"); ------------------------------------------------------------------------------ Dive into the World of Parallel Programming The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
