details: /erp/devel/pi/rev/650e5e995461
changeset: 7140:650e5e995461
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Fri Apr 23 17:34:32 2010 +0200
summary: Fixes bug 0013110: Error in code
details: /erp/devel/pi/rev/73e50ed2313e
changeset: 7141:73e50ed2313e
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Fri Apr 23 17:35:08 2010 +0200
summary: Fixes bug 0013108. Fixes bug 0013109
diffstat:
src-db/database/sourcedata/AD_COLUMN.xml | 8 ++++--
src-db/database/sourcedata/AD_VAL_RULE.xml | 12
++++++++++
src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 2 +-
3 files changed, 18 insertions(+), 4 deletions(-)
diffs (66 lines):
diff -r ade5b974f0db -r 73e50ed2313e src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Fri Apr 23 17:32:58 2010 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Fri Apr 23 17:35:08 2010 +0200
@@ -280602,7 +280602,9 @@
<!--7891269C841B655DE040007F010155CE--> <HELP><![CDATA[Current status of a
debt/payment.]]></HELP>
<!--7891269C841B655DE040007F010155CE-->
<COLUMNNAME><![CDATA[Status]]></COLUMNNAME>
<!--7891269C841B655DE040007F010155CE-->
<AD_TABLE_ID><![CDATA[4D8C3B3C31D1410DA046140C9F024D17]]></AD_TABLE_ID>
-<!--7891269C841B655DE040007F010155CE-->
<AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--7891269C841B655DE040007F010155CE-->
<AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
+<!--7891269C841B655DE040007F010155CE-->
<AD_REFERENCE_VALUE_ID><![CDATA[575BCB88A4694C27BC013DE9C73E6FE7]]></AD_REFERENCE_VALUE_ID>
+<!--7891269C841B655DE040007F010155CE-->
<AD_VAL_RULE_ID><![CDATA[7A86F689FB1C46F19DBE338D6DECD703]]></AD_VAL_RULE_ID>
<!--7891269C841B655DE040007F010155CE-->
<FIELDLENGTH><![CDATA[40]]></FIELDLENGTH>
<!--7891269C841B655DE040007F010155CE--> <ISKEY><![CDATA[N]]></ISKEY>
<!--7891269C841B655DE040007F010155CE--> <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -280698,7 +280700,7 @@
<!--7891269C841E655DE040007F010155CE-->
<AD_TABLE_ID><![CDATA[4D8C3B3C31D1410DA046140C9F024D17]]></AD_TABLE_ID>
<!--7891269C841E655DE040007F010155CE-->
<AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
<!--7891269C841E655DE040007F010155CE-->
<FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
-<!--7891269C841E655DE040007F010155CE-->
<DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--7891269C841E655DE040007F010155CE-->
<DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
<!--7891269C841E655DE040007F010155CE--> <ISKEY><![CDATA[N]]></ISKEY>
<!--7891269C841E655DE040007F010155CE--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--7891269C841E655DE040007F010155CE-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
@@ -280731,7 +280733,7 @@
<!--7891269C841F655DE040007F010155CE-->
<AD_TABLE_ID><![CDATA[4D8C3B3C31D1410DA046140C9F024D17]]></AD_TABLE_ID>
<!--7891269C841F655DE040007F010155CE-->
<AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
<!--7891269C841F655DE040007F010155CE-->
<FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
-<!--7891269C841F655DE040007F010155CE-->
<DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--7891269C841F655DE040007F010155CE-->
<DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
<!--7891269C841F655DE040007F010155CE--> <ISKEY><![CDATA[N]]></ISKEY>
<!--7891269C841F655DE040007F010155CE--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--7891269C841F655DE040007F010155CE-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
diff -r ade5b974f0db -r 73e50ed2313e src-db/database/sourcedata/AD_VAL_RULE.xml
--- a/src-db/database/sourcedata/AD_VAL_RULE.xml Fri Apr 23 17:32:58
2010 +0200
+++ b/src-db/database/sourcedata/AD_VAL_RULE.xml Fri Apr 23 17:35:08
2010 +0200
@@ -1375,6 +1375,18 @@
<!--78CBED13BC3F4BF989A90CA75BA8DFCD-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--78CBED13BC3F4BF989A90CA75BA8DFCD--></AD_VAL_RULE>
+<!--7A86F689FB1C46F19DBE338D6DECD703--><AD_VAL_RULE>
+<!--7A86F689FB1C46F19DBE338D6DECD703-->
<AD_VAL_RULE_ID><![CDATA[7A86F689FB1C46F19DBE338D6DECD703]]></AD_VAL_RULE_ID>
+<!--7A86F689FB1C46F19DBE338D6DECD703-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7A86F689FB1C46F19DBE338D6DECD703--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7A86F689FB1C46F19DBE338D6DECD703--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7A86F689FB1C46F19DBE338D6DECD703--> <NAME><![CDATA[FIN_Payment status for
transactons]]></NAME>
+<!--7A86F689FB1C46F19DBE338D6DECD703--> <DESCRIPTION><![CDATA[Payment status
used as transaction status in financila account]]></DESCRIPTION>
+<!--7A86F689FB1C46F19DBE338D6DECD703--> <TYPE><![CDATA[S]]></TYPE>
+<!--7A86F689FB1C46F19DBE338D6DECD703--> <CODE><![CDATA[AND Value IN
('RDNC','RPPC','PWNC','RPPC')]]></CODE>
+<!--7A86F689FB1C46F19DBE338D6DECD703-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7A86F689FB1C46F19DBE338D6DECD703--></AD_VAL_RULE>
+
<!--7BAD557A87B64D5386215D77F79A43D7--><AD_VAL_RULE>
<!--7BAD557A87B64D5386215D77F79A43D7-->
<AD_VAL_RULE_ID><![CDATA[7BAD557A87B64D5386215D77F79A43D7]]></AD_VAL_RULE_ID>
<!--7BAD557A87B64D5386215D77F79A43D7-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r ade5b974f0db -r 73e50ed2313e
src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java Fri Apr
23 17:32:58 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java Fri Apr
23 17:35:08 2010 +0200
@@ -453,7 +453,7 @@
String dateFormat =
OBPropertiesProvider.getInstance().getOpenbravoProperties().getProperty(
"dateFormat.java");
SimpleDateFormat outputFormat = new SimpleDateFormat(dateFormat);
- FieldProviderFactory.setField(data[0], "dateacct",
outputFormat.format(transaction
+ FieldProviderFactory.setField(data[0], "DateAcct",
outputFormat.format(transaction
.getDateAcct()));
FieldProviderFactory.setField(data[0], "trxdate",
outputFormat.format(transaction
.getTransactionDate()));
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
