details: /erp/devel/pi/rev/0208d57942c9
changeset: 11319:0208d57942c9
user: Ainhoa Pagola <ainhoa.pagola <at> openbravo.com>
date: Mon Mar 21 16:19:08 2011 +0100
summary: Fixes issue 15575. Account Date in GL Journal Line deprecated.
diffstat:
src-db/database/model/tables/GL_JOURNALLINE.xml | 2 +-
src-db/database/model/triggers/GL_JL_CHK_RESTRICTIONS_TRG.xml | 3 +--
src-db/database/model/triggers/GL_JOURNALLINE2_TRG.xml | 9 ++++++---
src-db/database/sourcedata/AD_COLUMN.xml | 2 +-
src-db/database/sourcedata/AD_FIELD.xml | 4 ++--
5 files changed, 11 insertions(+), 9 deletions(-)
diffs (93 lines):
diff -r a0a55746cc85 -r 0208d57942c9
src-db/database/model/tables/GL_JOURNALLINE.xml
--- a/src-db/database/model/tables/GL_JOURNALLINE.xml Mon Mar 21 13:29:28
2011 +0100
+++ b/src-db/database/model/tables/GL_JOURNALLINE.xml Mon Mar 21 16:19:08
2011 +0100
@@ -69,7 +69,7 @@
<default><![CDATA[0]]></default>
<onCreateDefault/>
</column>
- <column name="DATEACCT" primaryKey="false" required="true"
type="TIMESTAMP" size="7" autoIncrement="false">
+ <column name="DATEACCT" primaryKey="false" required="false"
type="TIMESTAMP" size="7" autoIncrement="false">
<default/>
<onCreateDefault/>
</column>
diff -r a0a55746cc85 -r 0208d57942c9
src-db/database/model/triggers/GL_JL_CHK_RESTRICTIONS_TRG.xml
--- a/src-db/database/model/triggers/GL_JL_CHK_RESTRICTIONS_TRG.xml Mon Mar
21 13:29:28 2011 +0100
+++ b/src-db/database/model/triggers/GL_JL_CHK_RESTRICTIONS_TRG.xml Mon Mar
21 16:19:08 2011 +0100
@@ -61,8 +61,7 @@
END IF;
IF(v_Posted='Y'
- AND ((COALESCE(:old.DATEACCT, v_DateNull) <> COALESCE(:new.DATEACCT,
v_DateNull))
- OR(COALESCE(:old.C_VALIDCOMBINATION_ID, '0') <>
COALESCE(:new.C_VALIDCOMBINATION_ID, '0'))
+ AND ((COALESCE(:old.C_VALIDCOMBINATION_ID, '0') <>
COALESCE(:new.C_VALIDCOMBINATION_ID, '0'))
OR(COALESCE(:old.AMTACCTDR, 0) <> COALESCE(:new.AMTACCTDR, 0))
OR(COALESCE(:old.AMTACCTCR, 0) <> COALESCE(:new.AMTACCTCR, 0)))) THEN
RAISE_APPLICATION_ERROR(-20501, 'Document processed/posted') ;
diff -r a0a55746cc85 -r 0208d57942c9
src-db/database/model/triggers/GL_JOURNALLINE2_TRG.xml
--- a/src-db/database/model/triggers/GL_JOURNALLINE2_TRG.xml Mon Mar 21
13:29:28 2011 +0100
+++ b/src-db/database/model/triggers/GL_JOURNALLINE2_TRG.xml Mon Mar 21
16:19:08 2011 +0100
@@ -28,6 +28,7 @@
v_rate NUMBER;
v_CurrencyRate NUMBER;
v_CurrencyRateType VARCHAR(60) ;
+ v_DateAcct DATE;
BEGIN
@@ -42,10 +43,12 @@
END IF;
SELECT C_AcctSchema_ID,
CurrencyRate,
- COALESCE(CurrencyRateType, 'S')
+ COALESCE(CurrencyRateType, 'S'),
+ dateacct
INTO v_AcctSchema_ID,
v_CurrencyRate,
- v_CurrencyRateType
+ v_CurrencyRateType,
+ v_DateAcct
FROM GL_Journal
WHERE GL_Journal_ID=:NEW.GL_Journal_ID;
SELECT COALESCE(MAX(c.C_Currency_ID), '0'),
@@ -56,7 +59,7 @@
C_Currency c
WHERE a.C_Currency_ID=c.C_Currency_ID
AND a.C_AcctSchema_ID=v_AcctSchema_ID;
- v_rate:=C_CURRENCY_RATE(:NEW.C_Currency_ID, v_TargetCurrency_ID,
:NEW.DateAcct, v_CurrencyRateType, :NEW.AD_CLIENT_ID, :NEW.AD_ORG_ID) ;
+ v_rate:=C_CURRENCY_RATE(:NEW.C_Currency_ID, v_TargetCurrency_ID, v_DateAcct,
v_CurrencyRateType, :NEW.AD_CLIENT_ID, :NEW.AD_ORG_ID) ;
IF(v_rate IS NULL) THEN
v_rate:=v_CurrencyRate;
END IF;
diff -r a0a55746cc85 -r 0208d57942c9 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Mon Mar 21 13:29:28 2011 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Mon Mar 21 16:19:08 2011 +0100
@@ -35633,7 +35633,7 @@
<!--2336--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
<!--2336--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
<!--2336--> <AD_CALLOUT_ID><![CDATA[133]]></AD_CALLOUT_ID>
-<!--2336--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--2336--> <DEVELOPMENTSTATUS><![CDATA[DP]]></DEVELOPMENTSTATUS>
<!--2336--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--2336--> <POSITION><![CDATA[18]]></POSITION>
<!--2336--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
diff -r a0a55746cc85 -r 0208d57942c9 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Mon Mar 21 13:29:28 2011 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml Mon Mar 21 16:19:08 2011 +0100
@@ -16680,7 +16680,7 @@
<!--1293--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--1293--> <AD_TAB_ID><![CDATA[161]]></AD_TAB_ID>
<!--1293--> <AD_COLUMN_ID><![CDATA[2336]]></AD_COLUMN_ID>
-<!--1293--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--1293--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
<!--1293-->
<DISPLAYLOGIC><![CDATA[@C_Currency_ID@!@$C_Currency_ID@]]></DISPLAYLOGIC>
<!--1293--> <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
<!--1293--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
@@ -16688,7 +16688,7 @@
<!--1293--> <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
<!--1293--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--1293--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1293--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1293--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
<!--1293--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
<!--1293--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--1293--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
