details: /erp/devel/pi/rev/c4a8d1ac4bd7
changeset: 8543:c4a8d1ac4bd7
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Thu Oct 14 23:52:37 2010 +0200
summary: Fixes bug 0014508
diffstat:
src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT_ACCT.xml | 6 +++---
src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 12 ++++++++++++
src-db/database/sourcedata/AD_COLUMN.xml | 6 +++---
src-db/database/sourcedata/AD_FIELD.xml | 3 +++
src-db/database/sourcedata/AD_MESSAGE.xml | 11 +++++++++++
5 files changed, 32 insertions(+), 6 deletions(-)
diffs (122 lines):
diff -r 8f1e3114223e -r c4a8d1ac4bd7
src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT_ACCT.xml
--- a/src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT_ACCT.xml Thu Oct
14 19:34:11 2010 +0200
+++ b/src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT_ACCT.xml Thu Oct
14 23:52:37 2010 +0200
@@ -65,15 +65,15 @@
<default/>
<onCreateDefault/>
</column>
- <column name="FIN_BANKFEE_ACCT" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <column name="FIN_BANKFEE_ACCT" primaryKey="false" required="false"
type="VARCHAR" size="32" autoIncrement="false">
<default/>
<onCreateDefault/>
</column>
- <column name="FIN_BANKREVALUATIONGAIN_ACCT" primaryKey="false"
required="true" type="VARCHAR" size="32" autoIncrement="false">
+ <column name="FIN_BANKREVALUATIONGAIN_ACCT" primaryKey="false"
required="false" type="VARCHAR" size="32" autoIncrement="false">
<default/>
<onCreateDefault/>
</column>
- <column name="FIN_BANKREVALUATIONLOSS_ACCT" primaryKey="false"
required="true" type="VARCHAR" size="32" autoIncrement="false">
+ <column name="FIN_BANKREVALUATIONLOSS_ACCT" primaryKey="false"
required="false" type="VARCHAR" size="32" autoIncrement="false">
<default/>
<onCreateDefault/>
</column>
diff -r 8f1e3114223e -r c4a8d1ac4bd7
src-db/database/sourcedata/AD_AUXILIARINPUT.xml
--- a/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Thu Oct 14 19:34:11
2010 +0200
+++ b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Thu Oct 14 23:52:37
2010 +0200
@@ -1156,6 +1156,18 @@
<!--51568B79156646C8966F49F82EE51CB7-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--51568B79156646C8966F49F82EE51CB7--></AD_AUXILIARINPUT>
+<!--52AAC076AFF84DB58F19D32FBCE8F678--><AD_AUXILIARINPUT>
+<!--52AAC076AFF84DB58F19D32FBCE8F678-->
<AD_AUXILIARINPUT_ID><![CDATA[52AAC076AFF84DB58F19D32FBCE8F678]]></AD_AUXILIARINPUT_ID>
+<!--52AAC076AFF84DB58F19D32FBCE8F678-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--52AAC076AFF84DB58F19D32FBCE8F678--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--52AAC076AFF84DB58F19D32FBCE8F678--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--52AAC076AFF84DB58F19D32FBCE8F678-->
<AD_TAB_ID><![CDATA[8391062D5C6A47EA94A83A304AD720BE]]></AD_TAB_ID>
+<!--52AAC076AFF84DB58F19D32FBCE8F678--> <NAME><![CDATA[isBank]]></NAME>
+<!--52AAC076AFF84DB58F19D32FBCE8F678--> <CODE><![cda...@sql=select CASE WHEN
TYPE='B' THE 'Y' ELSE 'N' END FROM FIN_FINANCIAL_ACCOUNT WHERE
FIN_FINANCIAL_ACCOUNT_ID = @FIN_FINANCIAL_ACCOUNT_ID@
+]]></CODE>
+<!--52AAC076AFF84DB58F19D32FBCE8F678-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--52AAC076AFF84DB58F19D32FBCE8F678--></AD_AUXILIARINPUT>
+
<!--52BCE83D589C498B9803D32847553A8D--><AD_AUXILIARINPUT>
<!--52BCE83D589C498B9803D32847553A8D-->
<AD_AUXILIARINPUT_ID><![CDATA[52BCE83D589C498B9803D32847553A8D]]></AD_AUXILIARINPUT_ID>
<!--52BCE83D589C498B9803D32847553A8D-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 8f1e3114223e -r c4a8d1ac4bd7 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Thu Oct 14 19:34:11 2010 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Thu Oct 14 23:52:37 2010 +0200
@@ -300228,7 +300228,7 @@
<!--828EE0AE80025FA1E040007F010067C7-->
<FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
<!--828EE0AE80025FA1E040007F010067C7--> <ISKEY><![CDATA[N]]></ISKEY>
<!--828EE0AE80025FA1E040007F010067C7--> <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--828EE0AE80025FA1E040007F010067C7-->
<ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--828EE0AE80025FA1E040007F010067C7-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
<!--828EE0AE80025FA1E040007F010067C7-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
<!--828EE0AE80025FA1E040007F010067C7-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
<!--828EE0AE80025FA1E040007F010067C7--> <SEQNO><![CDATA[170]]></SEQNO>
@@ -300260,7 +300260,7 @@
<!--828EE0AE80035FA1E040007F010067C7-->
<FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
<!--828EE0AE80035FA1E040007F010067C7--> <ISKEY><![CDATA[N]]></ISKEY>
<!--828EE0AE80035FA1E040007F010067C7--> <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--828EE0AE80035FA1E040007F010067C7-->
<ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--828EE0AE80035FA1E040007F010067C7-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
<!--828EE0AE80035FA1E040007F010067C7-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
<!--828EE0AE80035FA1E040007F010067C7-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
<!--828EE0AE80035FA1E040007F010067C7--> <SEQNO><![CDATA[180]]></SEQNO>
@@ -300292,7 +300292,7 @@
<!--828EE0AE80045FA1E040007F010067C7-->
<FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
<!--828EE0AE80045FA1E040007F010067C7--> <ISKEY><![CDATA[N]]></ISKEY>
<!--828EE0AE80045FA1E040007F010067C7--> <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--828EE0AE80045FA1E040007F010067C7-->
<ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--828EE0AE80045FA1E040007F010067C7-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
<!--828EE0AE80045FA1E040007F010067C7-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
<!--828EE0AE80045FA1E040007F010067C7-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
<!--828EE0AE80045FA1E040007F010067C7--> <SEQNO><![CDATA[190]]></SEQNO>
diff -r 8f1e3114223e -r c4a8d1ac4bd7 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Thu Oct 14 19:34:11 2010 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml Thu Oct 14 23:52:37 2010 +0200
@@ -182559,6 +182559,7 @@
<!--1FDCBB4CB99E4F268395F71CA08DA589-->
<AD_COLUMN_ID><![CDATA[828EE0AE80025FA1E040007F010067C7]]></AD_COLUMN_ID>
<!--1FDCBB4CB99E4F268395F71CA08DA589-->
<AD_FIELDGROUP_ID><![CDATA[113]]></AD_FIELDGROUP_ID>
<!--1FDCBB4CB99E4F268395F71CA08DA589-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--1FDCBB4CB99E4F268395F71CA08DA589-->
<DISPLAYLOGIC><![cda...@isbank@='Y']]></DISPLAYLOGIC>
<!--1FDCBB4CB99E4F268395F71CA08DA589-->
<DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--1FDCBB4CB99E4F268395F71CA08DA589--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--1FDCBB4CB99E4F268395F71CA08DA589--> <SEQNO><![CDATA[60]]></SEQNO>
@@ -190011,6 +190012,7 @@
<!--58B6888DCF874A9EA3ABBDD43854503C-->
<AD_TAB_ID><![CDATA[8391062D5C6A47EA94A83A304AD720BE]]></AD_TAB_ID>
<!--58B6888DCF874A9EA3ABBDD43854503C-->
<AD_COLUMN_ID><![CDATA[828EE0AE80035FA1E040007F010067C7]]></AD_COLUMN_ID>
<!--58B6888DCF874A9EA3ABBDD43854503C-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--58B6888DCF874A9EA3ABBDD43854503C-->
<DISPLAYLOGIC><![cda...@isbank@='Y']]></DISPLAYLOGIC>
<!--58B6888DCF874A9EA3ABBDD43854503C-->
<DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--58B6888DCF874A9EA3ABBDD43854503C--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--58B6888DCF874A9EA3ABBDD43854503C--> <SEQNO><![CDATA[70]]></SEQNO>
@@ -204949,6 +204951,7 @@
<!--F9729DBFE7B446D3A96EC15752E0F063-->
<AD_TAB_ID><![CDATA[8391062D5C6A47EA94A83A304AD720BE]]></AD_TAB_ID>
<!--F9729DBFE7B446D3A96EC15752E0F063-->
<AD_COLUMN_ID><![CDATA[828EE0AE80045FA1E040007F010067C7]]></AD_COLUMN_ID>
<!--F9729DBFE7B446D3A96EC15752E0F063-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--F9729DBFE7B446D3A96EC15752E0F063-->
<DISPLAYLOGIC><![cda...@isbank@='Y']]></DISPLAYLOGIC>
<!--F9729DBFE7B446D3A96EC15752E0F063-->
<DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--F9729DBFE7B446D3A96EC15752E0F063--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--F9729DBFE7B446D3A96EC15752E0F063--> <SEQNO><![CDATA[80]]></SEQNO>
diff -r 8f1e3114223e -r c4a8d1ac4bd7 src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Thu Oct 14 19:34:11 2010 +0200
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Thu Oct 14 23:52:37 2010 +0200
@@ -32333,6 +32333,17 @@
<!--A62EAD507C264420B0C20FB9239C9D45-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--A62EAD507C264420B0C20FB9239C9D45--></AD_MESSAGE>
+<!--A6688A1ACA9F47D0B86C54890D41C2E2--><AD_MESSAGE>
+<!--A6688A1ACA9F47D0B86C54890D41C2E2-->
<AD_MESSAGE_ID><![CDATA[A6688A1ACA9F47D0B86C54890D41C2E2]]></AD_MESSAGE_ID>
+<!--A6688A1ACA9F47D0B86C54890D41C2E2-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A6688A1ACA9F47D0B86C54890D41C2E2--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A6688A1ACA9F47D0B86C54890D41C2E2--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A6688A1ACA9F47D0B86C54890D41C2E2-->
<VALUE><![CDATA[APRM_FinancialAccountChk]]></VALUE>
+<!--A6688A1ACA9F47D0B86C54890D41C2E2--> <MSGTEXT><![CDATA[Bank Fee,
Revaluation Gain and Revaluation loss accounts are mandatory and can not be
left empty when financial account is of type Bank.]]></MSGTEXT>
+<!--A6688A1ACA9F47D0B86C54890D41C2E2--> <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--A6688A1ACA9F47D0B86C54890D41C2E2-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A6688A1ACA9F47D0B86C54890D41C2E2--></AD_MESSAGE>
+
<!--A68C3053E180449ABF364A71CBAC9CF0--><AD_MESSAGE>
<!--A68C3053E180449ABF364A71CBAC9CF0-->
<AD_MESSAGE_ID><![CDATA[A68C3053E180449ABF364A71CBAC9CF0]]></AD_MESSAGE_ID>
<!--A68C3053E180449ABF364A71CBAC9CF0-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits