details: /erp/devel/pi/rev/675f5d15388d
changeset: 7045:675f5d15388d
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Wed Apr 14 20:01:17 2010 +0200
summary: Columns modifications for APRM and fixes in Payment status ref list
diffstat:
src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml | 2 +-
src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT.xml | 7 +++
src-db/database/sourcedata/AD_COLUMN.xml | 35 ++++++++++++++++-
src-db/database/sourcedata/AD_VAL_RULE.xml | 2 +-
4 files changed, 42 insertions(+), 4 deletions(-)
diffs (107 lines):
diff -r 6f8665876963 -r 675f5d15388d
src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml
--- a/src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml Wed Apr 14
19:16:02 2010 +0200
+++ b/src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml Wed Apr 14
20:01:17 2010 +0200
@@ -53,7 +53,7 @@
<default/>
<onCreateDefault/>
</column>
- <column name="C_GLITEM_ID" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <column name="C_GLITEM_ID" primaryKey="false" required="false"
type="VARCHAR" size="32" autoIncrement="false">
<default/>
<onCreateDefault/>
</column>
diff -r 6f8665876963 -r 675f5d15388d
src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT.xml
--- a/src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT.xml Wed Apr 14
19:16:02 2010 +0200
+++ b/src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT.xml Wed Apr 14
20:01:17 2010 +0200
@@ -109,6 +109,10 @@
<default><![CDATA[N]]></default>
<onCreateDefault/>
</column>
+ <column name="FIN_MATCHING_ALGORITHM_ID" primaryKey="false"
required="false" type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
<foreign-key foreignTable="AD_CLIENT" name="FIN_AD_CLIENT_ACCOUNT">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
@@ -124,6 +128,9 @@
<foreign-key foreignTable="C_LOCATION" name="FIN_FINACC_LOCATION">
<reference local="C_LOCATION_ID" foreign="C_LOCATION_ID"/>
</foreign-key>
+ <foreign-key foreignTable="FIN_MATCHING_ALGORITHM"
name="FIN_FINACC_MATCH_ALGORITHM">
+ <reference local="FIN_MATCHING_ALGORITHM_ID"
foreign="FIN_MATCHING_ALGORITHM_ID"/>
+ </foreign-key>
<check name="FIN_FINACC_DEFAULT_CHECK"><![CDATA[ISDEFAULT IN ('Y',
'N')]]></check>
</table>
</database>
diff -r 6f8665876963 -r 675f5d15388d src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Wed Apr 14 19:16:02 2010 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Wed Apr 14 20:01:17 2010 +0200
@@ -270661,7 +270661,7 @@
<!--7891269C83E2655DE040007F010155CE-->
<AD_REFERENCE_VALUE_ID><![CDATA[575BCB88A4694C27BC013DE9C73E6FE7]]></AD_REFERENCE_VALUE_ID>
<!--7891269C83E2655DE040007F010155CE-->
<AD_VAL_RULE_ID><![CDATA[B3DF10D5093140319BB2FBD43E5D8C47]]></AD_VAL_RULE_ID>
<!--7891269C83E2655DE040007F010155CE-->
<FIELDLENGTH><![CDATA[40]]></FIELDLENGTH>
-<!--7891269C83E2655DE040007F010155CE--> <DEFAULTVALUE><![cda...@sql=select
CASE '@Isreceipt@' WHEN 'Y' THEN 'RAP' ELSE 'PPP' END]]></DEFAULTVALUE>
+<!--7891269C83E2655DE040007F010155CE--> <DEFAULTVALUE><![cda...@sql=select
(CASE WHEN @isrece...@='Y' THEN 'RAP' ELSE 'PPP' END) FROM
DUAL]]></DEFAULTVALUE>
<!--7891269C83E2655DE040007F010155CE--> <ISKEY><![CDATA[N]]></ISKEY>
<!--7891269C83E2655DE040007F010155CE--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--7891269C83E2655DE040007F010155CE-->
<ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
@@ -271836,7 +271836,7 @@
<!--7891269C841A655DE040007F010155CE-->
<FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
<!--7891269C841A655DE040007F010155CE--> <ISKEY><![CDATA[N]]></ISKEY>
<!--7891269C841A655DE040007F010155CE--> <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--7891269C841A655DE040007F010155CE-->
<ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7891269C841A655DE040007F010155CE-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
<!--7891269C841A655DE040007F010155CE-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
<!--7891269C841A655DE040007F010155CE-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
<!--7891269C841A655DE040007F010155CE--> <SEQNO><![CDATA[130]]></SEQNO>
@@ -285461,6 +285461,37 @@
<!--CEC2AA7C93F4423A97CE96BDD1C4B49F-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
<!--CEC2AA7C93F4423A97CE96BDD1C4B49F--></AD_COLUMN>
+<!--D160BFBF2CD74DAEB9FF7C425874E282--><AD_COLUMN>
+<!--D160BFBF2CD74DAEB9FF7C425874E282-->
<AD_COLUMN_ID><![CDATA[D160BFBF2CD74DAEB9FF7C425874E282]]></AD_COLUMN_ID>
+<!--D160BFBF2CD74DAEB9FF7C425874E282-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D160BFBF2CD74DAEB9FF7C425874E282--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D160BFBF2CD74DAEB9FF7C425874E282--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D160BFBF2CD74DAEB9FF7C425874E282--> <NAME><![CDATA[Matching
Algorithm]]></NAME>
+<!--D160BFBF2CD74DAEB9FF7C425874E282--> <DESCRIPTION><![CDATA[Identifies the
algorithm used to match the imported bank statement lines]]></DESCRIPTION>
+<!--D160BFBF2CD74DAEB9FF7C425874E282--> <HELP><![CDATA[Identifies the
algorithm used to match the imported bank statement lines]]></HELP>
+<!--D160BFBF2CD74DAEB9FF7C425874E282-->
<COLUMNNAME><![CDATA[FIN_Matching_Algorithm_ID]]></COLUMNNAME>
+<!--D160BFBF2CD74DAEB9FF7C425874E282-->
<AD_TABLE_ID><![CDATA[B129E53BC0E747879F7BA17F0AECEC32]]></AD_TABLE_ID>
+<!--D160BFBF2CD74DAEB9FF7C425874E282-->
<AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--D160BFBF2CD74DAEB9FF7C425874E282-->
<FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--D160BFBF2CD74DAEB9FF7C425874E282--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--D160BFBF2CD74DAEB9FF7C425874E282--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--D160BFBF2CD74DAEB9FF7C425874E282-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--D160BFBF2CD74DAEB9FF7C425874E282-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--D160BFBF2CD74DAEB9FF7C425874E282-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--D160BFBF2CD74DAEB9FF7C425874E282--> <SEQNO><![CDATA[280]]></SEQNO>
+<!--D160BFBF2CD74DAEB9FF7C425874E282-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--D160BFBF2CD74DAEB9FF7C425874E282-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D160BFBF2CD74DAEB9FF7C425874E282-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--D160BFBF2CD74DAEB9FF7C425874E282-->
<AD_ELEMENT_ID><![CDATA[828EE0AE7FE35FA1E040007F010067C7]]></AD_ELEMENT_ID>
+<!--D160BFBF2CD74DAEB9FF7C425874E282-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--D160BFBF2CD74DAEB9FF7C425874E282-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--D160BFBF2CD74DAEB9FF7C425874E282-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--D160BFBF2CD74DAEB9FF7C425874E282-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--D160BFBF2CD74DAEB9FF7C425874E282-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D160BFBF2CD74DAEB9FF7C425874E282--> <POSITION><![CDATA[28]]></POSITION>
+<!--D160BFBF2CD74DAEB9FF7C425874E282-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--D160BFBF2CD74DAEB9FF7C425874E282--></AD_COLUMN>
+
<!--D1B2113CC0504A0C8A29B2EEC76EE22A--><AD_COLUMN>
<!--D1B2113CC0504A0C8A29B2EEC76EE22A-->
<AD_COLUMN_ID><![CDATA[D1B2113CC0504A0C8A29B2EEC76EE22A]]></AD_COLUMN_ID>
<!--D1B2113CC0504A0C8A29B2EEC76EE22A-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 6f8665876963 -r 675f5d15388d src-db/database/sourcedata/AD_VAL_RULE.xml
--- a/src-db/database/sourcedata/AD_VAL_RULE.xml Wed Apr 14 19:16:02
2010 +0200
+++ b/src-db/database/sourcedata/AD_VAL_RULE.xml Wed Apr 14 20:01:17
2010 +0200
@@ -1510,7 +1510,7 @@
<!--B3DF10D5093140319BB2FBD43E5D8C47--> <NAME><![CDATA[FIN_Payment Status
validation]]></NAME>
<!--B3DF10D5093140319BB2FBD43E5D8C47--> <DESCRIPTION><![CDATA[Filter status
in sales and purchase.]]></DESCRIPTION>
<!--B3DF10D5093140319BB2FBD43E5D8C47--> <TYPE><![CDATA[S]]></TYPE>
-<!--B3DF10D5093140319BB2FBD43E5D8C47--> <CODE><![CDATA[(('@Isreceipt@'='Y')
AND Value IN ('RAP','RPR','RDNC','PC')) OR (('@Isreceipt@'='N') AND Value IN
('PWNC','PPM','PPP','PC'))]]></CODE>
+<!--B3DF10D5093140319BB2FBD43E5D8C47--> <CODE><![CDATA[((@isrece...@='Y') AND
Value IN ('RAP','RPR','RDNC','PC')) OR ((@isrece...@='N') AND Value IN
('PWNC','PPM','PPP','PC'))]]></CODE>
<!--B3DF10D5093140319BB2FBD43E5D8C47-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--B3DF10D5093140319BB2FBD43E5D8C47--></AD_VAL_RULE>
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
