details: /erp/devel/pi/rev/a4a5eb93e111
changeset: 10045:a4a5eb93e111
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Fri Jan 21 14:40:00 2011 +0100
summary: Adds Accounting configuration fro Bank Statements
details: /erp/devel/pi/rev/03aa5c588ce0
changeset: 10046:03aa5c588ce0
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Fri Jan 21 19:39:16 2011 +0100
summary: Fixes bug 0015734: Payment IN/OUT window displays wrong financial
account values, for organizations not belonging to its natural tree
diffstat:
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
| 12 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
| 10 +
src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT_ACCT.xml
| 6 +
src-db/database/sourcedata/AD_CALLOUT.xml
| 10 +
src-db/database/sourcedata/AD_COLUMN.xml
| 41 ++
src-db/database/sourcedata/AD_ELEMENT.xml
| 31 +-
src-db/database/sourcedata/AD_FIELD.xml
| 46 ++-
src-db/database/sourcedata/AD_MESSAGE.xml
| 23 +
src-db/database/sourcedata/AD_MODEL_OBJECT.xml
| 12 +
src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
| 10 +
src/org/openbravo/erpCommon/ad_actionButton/Posted.java
| 2 +-
src/org/openbravo/erpCommon/ad_callouts/SE_FinancialAccount_BSAccounts.java
| 152 ++++++++++
src/org/openbravo/erpCommon/ad_callouts/SE_PaymentMethod_FinAccount.java
| 2 +
13 files changed, 341 insertions(+), 16 deletions(-)
diffs (truncated from 610 to 300 lines):
diff -r 63b1ff5072af -r 03aa5c588ce0
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
Fri Jan 21 18:01:54 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
Fri Jan 21 19:39:16 2011 +0100
@@ -4905,7 +4905,9 @@
<!--84438C5EA78CD097E040007F01006579-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--84438C5EA78CD097E040007F01006579--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--84438C5EA78CD097E040007F01006579--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--84438C5EA78CD097E040007F01006579--> <NAME><![CDATA[Bank fee
account]]></NAME>
+<!--84438C5EA78CD097E040007F01006579--> <NAME><![CDATA[Bank Fee
Account]]></NAME>
+<!--84438C5EA78CD097E040007F01006579--> <DESCRIPTION><![CDATA[Account used
for posting Bank Fees]]></DESCRIPTION>
+<!--84438C5EA78CD097E040007F01006579--> <HELP><![CDATA[Account used for
posting Bank Fees]]></HELP>
<!--84438C5EA78CD097E040007F01006579-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--84438C5EA78CD097E040007F01006579-->
<AD_TAB_ID><![CDATA[9380E9AFB1074FB98030E5549D7FF346]]></AD_TAB_ID>
<!--84438C5EA78CD097E040007F01006579-->
<AD_COLUMN_ID><![CDATA[828EE0AE80025FA1E040007F010067C7]]></AD_COLUMN_ID>
@@ -4929,7 +4931,9 @@
<!--84438C5EA78DD097E040007F01006579-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--84438C5EA78DD097E040007F01006579--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--84438C5EA78DD097E040007F01006579--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--84438C5EA78DD097E040007F01006579--> <NAME><![CDATA[Bank revaluation gain
account]]></NAME>
+<!--84438C5EA78DD097E040007F01006579--> <NAME><![CDATA[Bank Revaluation Gain
Account]]></NAME>
+<!--84438C5EA78DD097E040007F01006579--> <DESCRIPTION><![CDATA[Account used
for posting currency revaluation gains]]></DESCRIPTION>
+<!--84438C5EA78DD097E040007F01006579--> <HELP><![CDATA[Account used for
posting currency revaluation gains]]></HELP>
<!--84438C5EA78DD097E040007F01006579-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--84438C5EA78DD097E040007F01006579-->
<AD_TAB_ID><![CDATA[9380E9AFB1074FB98030E5549D7FF346]]></AD_TAB_ID>
<!--84438C5EA78DD097E040007F01006579-->
<AD_COLUMN_ID><![CDATA[828EE0AE80035FA1E040007F010067C7]]></AD_COLUMN_ID>
@@ -4953,7 +4957,9 @@
<!--84438C5EA78ED097E040007F01006579-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--84438C5EA78ED097E040007F01006579--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--84438C5EA78ED097E040007F01006579--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--84438C5EA78ED097E040007F01006579--> <NAME><![CDATA[Bank revaluation loss
account]]></NAME>
+<!--84438C5EA78ED097E040007F01006579--> <NAME><![CDATA[Bank Revaluation Loss
Account]]></NAME>
+<!--84438C5EA78ED097E040007F01006579--> <DESCRIPTION><![CDATA[Account used
for posting currency revaluation losses]]></DESCRIPTION>
+<!--84438C5EA78ED097E040007F01006579--> <HELP><![CDATA[Account used for
posting currency revaluation losses]]></HELP>
<!--84438C5EA78ED097E040007F01006579-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--84438C5EA78ED097E040007F01006579-->
<AD_TAB_ID><![CDATA[9380E9AFB1074FB98030E5549D7FF346]]></AD_TAB_ID>
<!--84438C5EA78ED097E040007F01006579-->
<AD_COLUMN_ID><![CDATA[828EE0AE80045FA1E040007F010067C7]]></AD_COLUMN_ID>
diff -r 63b1ff5072af -r 03aa5c588ce0
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
Fri Jan 21 18:01:54 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
Fri Jan 21 19:39:16 2011 +0100
@@ -70,6 +70,16 @@
OBDal.getInstance().save(payment);
OBDal.getInstance().flush();
if (strAction.equals("P") || strAction.equals("D")) {
+ Set<String> documentOrganizations = OBContext.getOBContext()
+
.getOrganizationStructureProvider().getNaturalTree(payment.getOrganization().getId());
+ if
(!documentOrganizations.contains(payment.getAccount().getOrganization().getId()))
{
+ msg.setType("Error");
+ msg.setTitle(Utility.messageBD(conProvider, "Error",
vars.getLanguage()));
+ msg.setMessage(Utility.parseTranslation(conProvider, vars,
vars.getLanguage(),
+ "@APRM_FinancialAccountNotInNaturalTree@"));
+ bundle.setResult(msg);
+ return;
+ }
Set<String> invoiceDocNos = new TreeSet<String>();
Set<String> orderDocNos = new TreeSet<String>();
Set<String> glitems = new TreeSet<String>();
diff -r 63b1ff5072af -r 03aa5c588ce0
src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT_ACCT.xml
--- a/src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT_ACCT.xml Fri Jan
21 18:01:54 2011 +0100
+++ b/src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT_ACCT.xml Fri Jan
21 19:39:16 2011 +0100
@@ -101,6 +101,10 @@
<default/>
<onCreateDefault/>
</column>
+ <column name="ENABLEBANKSTATEMENT" primaryKey="false" required="true"
type="CHAR" size="1" autoIncrement="false">
+ <default><![CDATA[N]]></default>
+ <onCreateDefault/>
+ </column>
<foreign-key foreignTable="AD_CLIENT" name="FIN_FINACC_ACCT_AD_CLIENT">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
@@ -162,6 +166,8 @@
<unique-column name="FIN_FINANCIAL_ACCOUNT_ID"/>
<unique-column name="C_ACCTSCHEMA_ID"/>
</unique>
+ <check
name="FIN_FINACC_ACCT_BSCONFIG_CHECK"><![CDATA[(((ENABLEBANKSTATEMENT = 'Y')
AND (FIN_TRANSITORY_ACCT IS NOT NULL)) AND (FIN_ASSET_ACCT IS NOT NULL)) OR
(ENABLEBANKSTATEMENT <> 'Y')]]></check>
+ <check
name="FIN_FINACC_ACCT_ENABLEBS_CHECK"><![CDATA[ENABLEBANKSTATEMENT IN ('Y',
'N')]]></check>
<check name="FIN_FINACC_ACCT_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y',
'N')]]></check>
</table>
</database>
diff -r 63b1ff5072af -r 03aa5c588ce0 src-db/database/sourcedata/AD_CALLOUT.xml
--- a/src-db/database/sourcedata/AD_CALLOUT.xml Fri Jan 21 18:01:54 2011 +0100
+++ b/src-db/database/sourcedata/AD_CALLOUT.xml Fri Jan 21 19:39:16 2011 +0100
@@ -806,6 +806,16 @@
<!--3585710F23F244D9B179A28D18242583-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--3585710F23F244D9B179A28D18242583--></AD_CALLOUT>
+<!--46349B602D1C4132B9405A97647069AA--><AD_CALLOUT>
+<!--46349B602D1C4132B9405A97647069AA-->
<AD_CALLOUT_ID><![CDATA[46349B602D1C4132B9405A97647069AA]]></AD_CALLOUT_ID>
+<!--46349B602D1C4132B9405A97647069AA-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--46349B602D1C4132B9405A97647069AA--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--46349B602D1C4132B9405A97647069AA--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--46349B602D1C4132B9405A97647069AA-->
<NAME><![CDATA[SE_FinancialAccount_BSAccounts]]></NAME>
+<!--46349B602D1C4132B9405A97647069AA--> <DESCRIPTION><![CDATA[Displays a
warning message to prevent users configuring the accounts in a wrong
way.]]></DESCRIPTION>
+<!--46349B602D1C4132B9405A97647069AA-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--46349B602D1C4132B9405A97647069AA--></AD_CALLOUT>
+
<!--4B3FBD8DE0C045EEB9E540BF4C873B6E--><AD_CALLOUT>
<!--4B3FBD8DE0C045EEB9E540BF4C873B6E-->
<AD_CALLOUT_ID><![CDATA[4B3FBD8DE0C045EEB9E540BF4C873B6E]]></AD_CALLOUT_ID>
<!--4B3FBD8DE0C045EEB9E540BF4C873B6E-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 63b1ff5072af -r 03aa5c588ce0 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Fri Jan 21 18:01:54 2011 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Fri Jan 21 19:39:16 2011 +0100
@@ -265249,6 +265249,40 @@
<!--20685BD0894442B981F48DAB5E8031ED-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
<!--20685BD0894442B981F48DAB5E8031ED--></AD_COLUMN>
+<!--209C6CD23241412F80A346497E8544E0--><AD_COLUMN>
+<!--209C6CD23241412F80A346497E8544E0-->
<AD_COLUMN_ID><![CDATA[209C6CD23241412F80A346497E8544E0]]></AD_COLUMN_ID>
+<!--209C6CD23241412F80A346497E8544E0-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--209C6CD23241412F80A346497E8544E0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--209C6CD23241412F80A346497E8544E0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--209C6CD23241412F80A346497E8544E0-->
<NAME><![CDATA[Enablebankstatement]]></NAME>
+<!--209C6CD23241412F80A346497E8544E0--> <DESCRIPTION><![CDATA[Enable Bank
Statement Accounting]]></DESCRIPTION>
+<!--209C6CD23241412F80A346497E8544E0--> <HELP><![CDATA[This flag enables
accounting for Bank Statements. Some accounts will be required for proper
configuration]]></HELP>
+<!--209C6CD23241412F80A346497E8544E0-->
<COLUMNNAME><![CDATA[EnableBankStatement]]></COLUMNNAME>
+<!--209C6CD23241412F80A346497E8544E0-->
<AD_TABLE_ID><![CDATA[6F98C7AB59D3410CB828DB25D638DE2C]]></AD_TABLE_ID>
+<!--209C6CD23241412F80A346497E8544E0-->
<AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--209C6CD23241412F80A346497E8544E0-->
<FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--209C6CD23241412F80A346497E8544E0-->
<DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--209C6CD23241412F80A346497E8544E0--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--209C6CD23241412F80A346497E8544E0--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--209C6CD23241412F80A346497E8544E0-->
<ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--209C6CD23241412F80A346497E8544E0-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--209C6CD23241412F80A346497E8544E0-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--209C6CD23241412F80A346497E8544E0--> <SEQNO><![CDATA[260]]></SEQNO>
+<!--209C6CD23241412F80A346497E8544E0-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--209C6CD23241412F80A346497E8544E0-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--209C6CD23241412F80A346497E8544E0-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--209C6CD23241412F80A346497E8544E0-->
<AD_ELEMENT_ID><![CDATA[F9E2CAD4BE72454BAEBDBCCE8FF13A77]]></AD_ELEMENT_ID>
+<!--209C6CD23241412F80A346497E8544E0-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--209C6CD23241412F80A346497E8544E0-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--209C6CD23241412F80A346497E8544E0-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--209C6CD23241412F80A346497E8544E0-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--209C6CD23241412F80A346497E8544E0-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--209C6CD23241412F80A346497E8544E0--> <POSITION><![CDATA[26]]></POSITION>
+<!--209C6CD23241412F80A346497E8544E0-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--209C6CD23241412F80A346497E8544E0--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--209C6CD23241412F80A346497E8544E0-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--209C6CD23241412F80A346497E8544E0--></AD_COLUMN>
+
<!--21091EE7A7F347FDB16350A429EBDEB8--><AD_COLUMN>
<!--21091EE7A7F347FDB16350A429EBDEB8-->
<AD_COLUMN_ID><![CDATA[21091EE7A7F347FDB16350A429EBDEB8]]></AD_COLUMN_ID>
<!--21091EE7A7F347FDB16350A429EBDEB8-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -287360,6 +287394,7 @@
<!--71C55A63912B47B29F6B532A398B166C-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
<!--71C55A63912B47B29F6B532A398B166C-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
<!--71C55A63912B47B29F6B532A398B166C-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--71C55A63912B47B29F6B532A398B166C-->
<AD_CALLOUT_ID><![CDATA[46349B602D1C4132B9405A97647069AA]]></AD_CALLOUT_ID>
<!--71C55A63912B47B29F6B532A398B166C-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
<!--71C55A63912B47B29F6B532A398B166C-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--71C55A63912B47B29F6B532A398B166C--> <POSITION><![CDATA[25]]></POSITION>
@@ -301091,6 +301126,8 @@
<!--828EE0AE80025FA1E040007F010067C7--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--828EE0AE80025FA1E040007F010067C7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--828EE0AE80025FA1E040007F010067C7-->
<NAME><![CDATA[FIN_Bankfee_Acct]]></NAME>
+<!--828EE0AE80025FA1E040007F010067C7--> <DESCRIPTION><![CDATA[Account used
for posting Bank Fees]]></DESCRIPTION>
+<!--828EE0AE80025FA1E040007F010067C7--> <HELP><![CDATA[Account used for
posting Bank Fees]]></HELP>
<!--828EE0AE80025FA1E040007F010067C7-->
<COLUMNNAME><![CDATA[FIN_Bankfee_Acct]]></COLUMNNAME>
<!--828EE0AE80025FA1E040007F010067C7-->
<AD_TABLE_ID><![CDATA[6F98C7AB59D3410CB828DB25D638DE2C]]></AD_TABLE_ID>
<!--828EE0AE80025FA1E040007F010067C7-->
<AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
@@ -301123,6 +301160,8 @@
<!--828EE0AE80035FA1E040007F010067C7--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--828EE0AE80035FA1E040007F010067C7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--828EE0AE80035FA1E040007F010067C7-->
<NAME><![CDATA[FIN_Bankrevaluationgain_Acct]]></NAME>
+<!--828EE0AE80035FA1E040007F010067C7--> <DESCRIPTION><![CDATA[Account used
for posting currency revaluation gains]]></DESCRIPTION>
+<!--828EE0AE80035FA1E040007F010067C7--> <HELP><![CDATA[Account used for
posting currency revaluation gains]]></HELP>
<!--828EE0AE80035FA1E040007F010067C7-->
<COLUMNNAME><![CDATA[FIN_Bankrevaluationgain_Acct]]></COLUMNNAME>
<!--828EE0AE80035FA1E040007F010067C7-->
<AD_TABLE_ID><![CDATA[6F98C7AB59D3410CB828DB25D638DE2C]]></AD_TABLE_ID>
<!--828EE0AE80035FA1E040007F010067C7-->
<AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
@@ -301155,6 +301194,8 @@
<!--828EE0AE80045FA1E040007F010067C7--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--828EE0AE80045FA1E040007F010067C7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--828EE0AE80045FA1E040007F010067C7-->
<NAME><![CDATA[FIN_Bankrevaluationloss_Acct]]></NAME>
+<!--828EE0AE80045FA1E040007F010067C7--> <DESCRIPTION><![CDATA[Account used
for posting currency revaluation losses]]></DESCRIPTION>
+<!--828EE0AE80045FA1E040007F010067C7--> <HELP><![CDATA[Account used for
posting currency revaluation losses]]></HELP>
<!--828EE0AE80045FA1E040007F010067C7-->
<COLUMNNAME><![CDATA[FIN_Bankrevaluationloss_Acct]]></COLUMNNAME>
<!--828EE0AE80045FA1E040007F010067C7-->
<AD_TABLE_ID><![CDATA[6F98C7AB59D3410CB828DB25D638DE2C]]></AD_TABLE_ID>
<!--828EE0AE80045FA1E040007F010067C7-->
<AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
diff -r 63b1ff5072af -r 03aa5c588ce0 src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml Fri Jan 21 18:01:54 2011 +0100
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml Fri Jan 21 19:39:16 2011 +0100
@@ -26385,8 +26385,10 @@
<!--828EE0AE80055FA1E040007F010067C7--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--828EE0AE80055FA1E040007F010067C7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--828EE0AE80055FA1E040007F010067C7-->
<COLUMNNAME><![CDATA[FIN_Bankrevaluationloss_Acct]]></COLUMNNAME>
-<!--828EE0AE80055FA1E040007F010067C7--> <NAME><![CDATA[Bank revaluation loss
account]]></NAME>
-<!--828EE0AE80055FA1E040007F010067C7--> <PRINTNAME><![CDATA[Bank revaluation
loss account]]></PRINTNAME>
+<!--828EE0AE80055FA1E040007F010067C7--> <NAME><![CDATA[Bank Revaluation Loss
Account]]></NAME>
+<!--828EE0AE80055FA1E040007F010067C7--> <PRINTNAME><![CDATA[Bank Revaluation
Loss Account]]></PRINTNAME>
+<!--828EE0AE80055FA1E040007F010067C7--> <DESCRIPTION><![CDATA[Account used
for posting currency revaluation losses]]></DESCRIPTION>
+<!--828EE0AE80055FA1E040007F010067C7--> <HELP><![CDATA[Account used for
posting currency revaluation losses]]></HELP>
<!--828EE0AE80055FA1E040007F010067C7-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--828EE0AE80055FA1E040007F010067C7--></AD_ELEMENT>
@@ -26396,8 +26398,10 @@
<!--828EE0AE80065FA1E040007F010067C7--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--828EE0AE80065FA1E040007F010067C7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--828EE0AE80065FA1E040007F010067C7-->
<COLUMNNAME><![CDATA[FIN_Bankfee_Acct]]></COLUMNNAME>
-<!--828EE0AE80065FA1E040007F010067C7--> <NAME><![CDATA[Bank fee
account]]></NAME>
-<!--828EE0AE80065FA1E040007F010067C7--> <PRINTNAME><![CDATA[Bank fee
account]]></PRINTNAME>
+<!--828EE0AE80065FA1E040007F010067C7--> <NAME><![CDATA[Bank Fee
Account]]></NAME>
+<!--828EE0AE80065FA1E040007F010067C7--> <PRINTNAME><![CDATA[Bank Fee
Account]]></PRINTNAME>
+<!--828EE0AE80065FA1E040007F010067C7--> <DESCRIPTION><![CDATA[Account used
for posting Bank Fees]]></DESCRIPTION>
+<!--828EE0AE80065FA1E040007F010067C7--> <HELP><![CDATA[Account used for
posting Bank Fees]]></HELP>
<!--828EE0AE80065FA1E040007F010067C7-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--828EE0AE80065FA1E040007F010067C7--></AD_ELEMENT>
@@ -26407,8 +26411,10 @@
<!--828EE0AE80075FA1E040007F010067C7--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--828EE0AE80075FA1E040007F010067C7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--828EE0AE80075FA1E040007F010067C7-->
<COLUMNNAME><![CDATA[FIN_Bankrevaluationgain_Acct]]></COLUMNNAME>
-<!--828EE0AE80075FA1E040007F010067C7--> <NAME><![CDATA[Bank revaluation gain
account]]></NAME>
-<!--828EE0AE80075FA1E040007F010067C7--> <PRINTNAME><![CDATA[Bank revaluation
gain account]]></PRINTNAME>
+<!--828EE0AE80075FA1E040007F010067C7--> <NAME><![CDATA[Bank Revaluation Gain
Account]]></NAME>
+<!--828EE0AE80075FA1E040007F010067C7--> <PRINTNAME><![CDATA[Bank Revaluation
Gain Account]]></PRINTNAME>
+<!--828EE0AE80075FA1E040007F010067C7--> <DESCRIPTION><![CDATA[Account used
for posting currency revaluation gains]]></DESCRIPTION>
+<!--828EE0AE80075FA1E040007F010067C7--> <HELP><![CDATA[Account used for
posting currency revaluation gains]]></HELP>
<!--828EE0AE80075FA1E040007F010067C7-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--828EE0AE80075FA1E040007F010067C7--></AD_ELEMENT>
@@ -28144,6 +28150,19 @@
<!--F7DA034AB59111DDB8250016D4EE9DB3-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--F7DA034AB59111DDB8250016D4EE9DB3--></AD_ELEMENT>
+<!--F9E2CAD4BE72454BAEBDBCCE8FF13A77--><AD_ELEMENT>
+<!--F9E2CAD4BE72454BAEBDBCCE8FF13A77-->
<AD_ELEMENT_ID><![CDATA[F9E2CAD4BE72454BAEBDBCCE8FF13A77]]></AD_ELEMENT_ID>
+<!--F9E2CAD4BE72454BAEBDBCCE8FF13A77-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F9E2CAD4BE72454BAEBDBCCE8FF13A77--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F9E2CAD4BE72454BAEBDBCCE8FF13A77--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F9E2CAD4BE72454BAEBDBCCE8FF13A77-->
<COLUMNNAME><![CDATA[EnableBankStatement]]></COLUMNNAME>
+<!--F9E2CAD4BE72454BAEBDBCCE8FF13A77--> <NAME><![CDATA[Enable Bank
Statement]]></NAME>
+<!--F9E2CAD4BE72454BAEBDBCCE8FF13A77--> <PRINTNAME><![CDATA[Enable Bank
Statement]]></PRINTNAME>
+<!--F9E2CAD4BE72454BAEBDBCCE8FF13A77--> <DESCRIPTION><![CDATA[Enable Bank
Statement Accounting]]></DESCRIPTION>
+<!--F9E2CAD4BE72454BAEBDBCCE8FF13A77--> <HELP><![CDATA[This flag enables
accounting for Bank Statements. Some accounts will be required for proper
configuration]]></HELP>
+<!--F9E2CAD4BE72454BAEBDBCCE8FF13A77-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F9E2CAD4BE72454BAEBDBCCE8FF13A77--></AD_ELEMENT>
+
<!--FB0D51F86B9A4D8E9976BC1A224075A2--><AD_ELEMENT>
<!--FB0D51F86B9A4D8E9976BC1A224075A2-->
<AD_ELEMENT_ID><![CDATA[FB0D51F86B9A4D8E9976BC1A224075A2]]></AD_ELEMENT_ID>
<!--FB0D51F86B9A4D8E9976BC1A224075A2-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 63b1ff5072af -r 03aa5c588ce0 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Fri Jan 21 18:01:54 2011 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml Fri Jan 21 19:39:16 2011 +0100
@@ -197421,16 +197421,17 @@
<!--1FDCBB4CB99E4F268395F71CA08DA589-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--1FDCBB4CB99E4F268395F71CA08DA589--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--1FDCBB4CB99E4F268395F71CA08DA589--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1FDCBB4CB99E4F268395F71CA08DA589--> <NAME><![CDATA[Bank fee
account]]></NAME>
+<!--1FDCBB4CB99E4F268395F71CA08DA589--> <NAME><![CDATA[Bank Fee
Account]]></NAME>
+<!--1FDCBB4CB99E4F268395F71CA08DA589--> <DESCRIPTION><![CDATA[Account used
for posting Bank Fees]]></DESCRIPTION>
+<!--1FDCBB4CB99E4F268395F71CA08DA589--> <HELP><![CDATA[Account used for
posting Bank Fees]]></HELP>
<!--1FDCBB4CB99E4F268395F71CA08DA589-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--1FDCBB4CB99E4F268395F71CA08DA589-->
<AD_TAB_ID><![CDATA[8391062D5C6A47EA94A83A304AD720BE]]></AD_TAB_ID>
<!--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><![CDATA[@IsBank@='Y']]></DISPLAYLOGIC>
<!--1FDCBB4CB99E4F268395F71CA08DA589-->
<DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--1FDCBB4CB99E4F268395F71CA08DA589--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--1FDCBB4CB99E4F268395F71CA08DA589--> <SEQNO><![CDATA[60]]></SEQNO>
+<!--1FDCBB4CB99E4F268395F71CA08DA589--> <SEQNO><![CDATA[74]]></SEQNO>
<!--1FDCBB4CB99E4F268395F71CA08DA589--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--1FDCBB4CB99E4F268395F71CA08DA589-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--1FDCBB4CB99E4F268395F71CA08DA589-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -198968,6 +198969,32 @@
<!--454C9ED2E00E4ABC9F4FF0389276040C-->
<STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
<!--454C9ED2E00E4ABC9F4FF0389276040C--></AD_FIELD>
+<!--4550C3F056904B2CB50D8CF409917EE7--><AD_FIELD>
+<!--4550C3F056904B2CB50D8CF409917EE7-->
<AD_FIELD_ID><![CDATA[4550C3F056904B2CB50D8CF409917EE7]]></AD_FIELD_ID>
+<!--4550C3F056904B2CB50D8CF409917EE7-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4550C3F056904B2CB50D8CF409917EE7--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4550C3F056904B2CB50D8CF409917EE7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4550C3F056904B2CB50D8CF409917EE7--> <NAME><![CDATA[Enable Bank
Statement]]></NAME>
+<!--4550C3F056904B2CB50D8CF409917EE7--> <DESCRIPTION><![CDATA[Enable Bank
Statement Accounting]]></DESCRIPTION>
+<!--4550C3F056904B2CB50D8CF409917EE7--> <HELP><![CDATA[This flag enables
accounting for Bank Statements. Some accounts will be required for proper
configuration]]></HELP>
+<!--4550C3F056904B2CB50D8CF409917EE7-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--4550C3F056904B2CB50D8CF409917EE7-->
<AD_TAB_ID><![CDATA[8391062D5C6A47EA94A83A304AD720BE]]></AD_TAB_ID>
+<!--4550C3F056904B2CB50D8CF409917EE7-->
<AD_COLUMN_ID><![CDATA[209C6CD23241412F80A346497E8544E0]]></AD_COLUMN_ID>
+<!--4550C3F056904B2CB50D8CF409917EE7-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--4550C3F056904B2CB50D8CF409917EE7-->
<DISPLAYLOGIC><![CDATA[@IsBank@='Y']]></DISPLAYLOGIC>
+<!--4550C3F056904B2CB50D8CF409917EE7-->
<DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--4550C3F056904B2CB50D8CF409917EE7--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--4550C3F056904B2CB50D8CF409917EE7--> <SEQNO><![CDATA[76]]></SEQNO>
+<!--4550C3F056904B2CB50D8CF409917EE7--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--4550C3F056904B2CB50D8CF409917EE7-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--4550C3F056904B2CB50D8CF409917EE7-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--4550C3F056904B2CB50D8CF409917EE7-->
<SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4550C3F056904B2CB50D8CF409917EE7-->
<ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--4550C3F056904B2CB50D8CF409917EE7-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4550C3F056904B2CB50D8CF409917EE7-->
<STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--4550C3F056904B2CB50D8CF409917EE7-->
<STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--4550C3F056904B2CB50D8CF409917EE7--></AD_FIELD>
+
<!--4589C555EBD449258610553F33BC8973--><AD_FIELD>
<!--4589C555EBD449258610553F33BC8973-->
<AD_FIELD_ID><![CDATA[4589C555EBD449258610553F33BC8973]]></AD_FIELD_ID>
<!--4589C555EBD449258610553F33BC8973-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -205609,10 +205636,13 @@
<!--58B6888DCF874A9EA3ABBDD43854503C-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--58B6888DCF874A9EA3ABBDD43854503C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
