details: https://code.openbravo.com/erp/devel/pi/rev/b4367a3c856c
changeset: 21927:b4367a3c856c
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Fri Feb 07 12:31:59 2014 +0100
summary: Fixes bug 25683: trigger performance improvement
diffstat:
modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_BANKSTATEMENT.xml
| 4 +
modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml
| 4 +
modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_BNKSTM_LINE_CHECK_TRG.xml
| 20 +
modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_RECON_CHECK_TRG.xml
| 2 -
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_AUXILIARINPUT.xml
| 11 +
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
| 78 +++++++-
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml
| 24 ++
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
| 57 +++++-
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MENU.xml
| 12 +
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml
| 12 +
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODEL_OBJECT.xml
| 24 ++
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
| 10 +
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS.xml
| 82 +++++++
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml
| 21 ++
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TREENODE.xml
| 11 +
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
| 37 ++-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/MatchTransactionDao.java
| 104 +++++++++-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_BankStatementProcess.java
| 104 ++++++++-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ReconciliationProcess.java
| 64 ++---
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java
| 4 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js
| 1 +
src-db/database/model/tables/FACT_ACCT.xml
| 13 +
src-db/database/model/triggers/C_ORDER_TRG.xml
| 13 +-
src-db/database/sourcedata/AD_AUXILIARINPUT.xml
| 25 ++
src-db/database/sourcedata/AD_COLUMN.xml
| 45 +++-
src-db/database/sourcedata/AD_ELEMENT.xml
| 14 +
26 files changed, 712 insertions(+), 84 deletions(-)
diffs (truncated from 1359 to 300 lines):
diff -r 8d694f6a34a3 -r b4367a3c856c
modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_BANKSTATEMENT.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_BANKSTATEMENT.xml
Thu Feb 06 15:52:22 2014 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_BANKSTATEMENT.xml
Fri Feb 07 12:31:59 2014 +0100
@@ -5,5 +5,9 @@
<default><![CDATA[P]]></default>
<onCreateDefault/>
</column>
+ <column name="EM_APRM_PROCESS_BS_FORCE" primaryKey="false"
required="false" type="VARCHAR" size="60" autoIncrement="false">
+ <default><![CDATA[P]]></default>
+ <onCreateDefault/>
+ </column>
</table>
</database>
diff -r 8d694f6a34a3 -r b4367a3c856c
modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml
Thu Feb 06 15:52:22 2014 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml
Fri Feb 07 12:31:59 2014 +0100
@@ -17,5 +17,9 @@
<default/>
<onCreateDefault/>
</column>
+ <column name="EM_APRM_MATCHTRANS_FORCE" primaryKey="false"
required="false" type="CHAR" size="1" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
</table>
</database>
diff -r 8d694f6a34a3 -r b4367a3c856c
modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_BNKSTM_LINE_CHECK_TRG.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_BNKSTM_LINE_CHECK_TRG.xml
Thu Feb 06 15:52:22 2014 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_BNKSTM_LINE_CHECK_TRG.xml
Fri Feb 07 12:31:59 2014 +0100
@@ -62,6 +62,26 @@
IF((DELETING OR INSERTING) AND v_Processed='Y') THEN
RAISE_APPLICATION_ERROR(-20000, '@20501@');
END IF;
+ IF(DELETING AND :OLD.FIN_FINACC_TRANSACTION_ID IS NOT NULL) THEN
+ RAISE_APPLICATION_ERROR(-20000, '@APRM_BSTLine_Matched@');
+ END IF;
+ IF (UPDATING) THEN
+ IF (:OLD.FIN_FINACC_TRANSACTION_ID IS NOT NULL) THEN
+ IF(((COALESCE(:OLD.AD_ORG_ID, '0') <> COALESCE(:NEW.AD_ORG_ID, '0'))
+ OR(COALESCE(:OLD.ISACTIVE, '0') <> COALESCE(:NEW.ISACTIVE, '0'))
+ OR(COALESCE(:OLD.FIN_BANKSTATEMENT_ID, '0') <>
COALESCE(:NEW.FIN_BANKSTATEMENT_ID, '0'))
+ OR(COALESCE(:OLD.LINE, 0) <> COALESCE(:NEW.LINE, 0))
+ OR(COALESCE(:OLD.BPARTNERNAME, '0') <> COALESCE(:NEW.BPARTNERNAME, '0'))
+ OR(COALESCE(:OLD.DATETRX, v_DateNull) <> COALESCE(:NEW.DATETRX,
v_DateNull))
+ OR(COALESCE(:OLD.CRAMOUNT, 0) <> COALESCE(:NEW.CRAMOUNT, 0))
+ OR(COALESCE(:OLD.DRAMOUNT, 0) <> COALESCE(:NEW.DRAMOUNT, 0))
+ OR(COALESCE(:OLD.REFERENCENO, '0') <> COALESCE(:NEW.REFERENCENO, '0'))
+ )) THEN
+ RAISE_APPLICATION_ERROR(-20000, '@APRM_BSTLine_Matched@');
+ END IF;
+
+ END IF;
+ END IF;
END APRM_FIN_BNKSTM_LINE_CHECK_TRG
]]></body>
</trigger>
diff -r 8d694f6a34a3 -r b4367a3c856c
modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_RECON_CHECK_TRG.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_RECON_CHECK_TRG.xml
Thu Feb 06 15:52:22 2014 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_RECON_CHECK_TRG.xml
Fri Feb 07 12:31:59 2014 +0100
@@ -34,8 +34,6 @@
OR(COALESCE(:OLD.C_DOCTYPE_ID, '0') <> COALESCE(:NEW.C_DOCTYPE_ID, '0'))
OR(COALESCE(:OLD.DATETO, v_DateNull) <> COALESCE(:NEW.DATETO,
v_DateNull))
OR(COALESCE(:OLD.STATEMENTDATE, v_DateNull) <>
COALESCE(:NEW.STATEMENTDATE, v_DateNull))
- OR(COALESCE(:OLD.ENDINGBALANCE, 0) <> COALESCE(:NEW.ENDINGBALANCE, 0))
- OR(COALESCE(:OLD.STARTINGBALANCE, 0) <> COALESCE(:NEW.STARTINGBALANCE,
0))
OR(COALESCE(:OLD.DOCSTATUS, '0') <> COALESCE(:NEW.DOCSTATUS, '0')))) THEN
RAISE_APPLICATION_ERROR(-20000, '@20501@');
END IF;
diff -r 8d694f6a34a3 -r b4367a3c856c
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_AUXILIARINPUT.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_AUXILIARINPUT.xml
Thu Feb 06 15:52:22 2014 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_AUXILIARINPUT.xml
Fri Feb 07 12:31:59 2014 +0100
@@ -44,6 +44,17 @@
<!--9D630C9E4C734361BFB09B153EEE3BCB-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--9D630C9E4C734361BFB09B153EEE3BCB--></AD_AUXILIARINPUT>
+<!--B1C25B989C164EDFB7F9B26CB799DDAA--><AD_AUXILIARINPUT>
+<!--B1C25B989C164EDFB7F9B26CB799DDAA-->
<AD_AUXILIARINPUT_ID><![CDATA[B1C25B989C164EDFB7F9B26CB799DDAA]]></AD_AUXILIARINPUT_ID>
+<!--B1C25B989C164EDFB7F9B26CB799DDAA-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B1C25B989C164EDFB7F9B26CB799DDAA--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B1C25B989C164EDFB7F9B26CB799DDAA--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B1C25B989C164EDFB7F9B26CB799DDAA-->
<AD_TAB_ID><![CDATA[C56E698100314ABBBBD3A89626CA551C]]></AD_TAB_ID>
+<!--B1C25B989C164EDFB7F9B26CB799DDAA-->
<NAME><![CDATA[APRM_ISRECONCILED]]></NAME>
+<!--B1C25B989C164EDFB7F9B26CB799DDAA--> <CODE><![CDATA[@SQL=SELECT 1 FROM
DUAL WHERE EXISTS (SELECT 1 FROM FIN_BANKSTATEMENTLINE WHERE
FIN_FINACC_TRANSACTION_ID IS NOT NULL AND FIN_BANKSTATEMENT_ID =
@FIN_BankStatement_ID@) ]]></CODE>
+<!--B1C25B989C164EDFB7F9B26CB799DDAA-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--B1C25B989C164EDFB7F9B26CB799DDAA--></AD_AUXILIARINPUT>
+
<!--D08EBACB459849488F49089EA28F96D9--><AD_AUXILIARINPUT>
<!--D08EBACB459849488F49089EA28F96D9-->
<AD_AUXILIARINPUT_ID><![CDATA[D08EBACB459849488F49089EA28F96D9]]></AD_AUXILIARINPUT_ID>
<!--D08EBACB459849488F49089EA28F96D9-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 8d694f6a34a3 -r b4367a3c856c
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
Thu Feb 06 15:52:22 2014 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
Fri Feb 07 12:31:59 2014 +0100
@@ -2466,6 +2466,42 @@
<!--68C853FD393C4620A3947EC34C416B9A-->
<ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
<!--68C853FD393C4620A3947EC34C416B9A--></AD_COLUMN>
+<!--6B5C965B623748689A689838835C0AC2--><AD_COLUMN>
+<!--6B5C965B623748689A689838835C0AC2-->
<AD_COLUMN_ID><![CDATA[6B5C965B623748689A689838835C0AC2]]></AD_COLUMN_ID>
+<!--6B5C965B623748689A689838835C0AC2-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6B5C965B623748689A689838835C0AC2--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6B5C965B623748689A689838835C0AC2--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6B5C965B623748689A689838835C0AC2--> <NAME><![CDATA[EM_APRM_Process Bank
Statement Force]]></NAME>
+<!--6B5C965B623748689A689838835C0AC2-->
<COLUMNNAME><![CDATA[EM_APRM_Process_BS_Force]]></COLUMNNAME>
+<!--6B5C965B623748689A689838835C0AC2-->
<AD_TABLE_ID><![CDATA[D4C23A17190649E7B78F55A05AF3438C]]></AD_TABLE_ID>
+<!--6B5C965B623748689A689838835C0AC2-->
<AD_REFERENCE_ID><![CDATA[28]]></AD_REFERENCE_ID>
+<!--6B5C965B623748689A689838835C0AC2-->
<AD_REFERENCE_VALUE_ID><![CDATA[EC75B6F5A9504DB6B3F3356EA85F15EE]]></AD_REFERENCE_VALUE_ID>
+<!--6B5C965B623748689A689838835C0AC2-->
<FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--6B5C965B623748689A689838835C0AC2-->
<DEFAULTVALUE><![CDATA[P]]></DEFAULTVALUE>
+<!--6B5C965B623748689A689838835C0AC2--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--6B5C965B623748689A689838835C0AC2--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--6B5C965B623748689A689838835C0AC2-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--6B5C965B623748689A689838835C0AC2-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--6B5C965B623748689A689838835C0AC2-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--6B5C965B623748689A689838835C0AC2--> <SEQNO><![CDATA[220]]></SEQNO>
+<!--6B5C965B623748689A689838835C0AC2-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--6B5C965B623748689A689838835C0AC2-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6B5C965B623748689A689838835C0AC2-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--6B5C965B623748689A689838835C0AC2-->
<AD_ELEMENT_ID><![CDATA[D42C1F18622F4773989190BB8C2C8436]]></AD_ELEMENT_ID>
+<!--6B5C965B623748689A689838835C0AC2-->
<AD_PROCESS_ID><![CDATA[2DDE7D3618034C38A4462B7F3456C28D]]></AD_PROCESS_ID>
+<!--6B5C965B623748689A689838835C0AC2-->
<ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--6B5C965B623748689A689838835C0AC2-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--6B5C965B623748689A689838835C0AC2-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--6B5C965B623748689A689838835C0AC2-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--6B5C965B623748689A689838835C0AC2-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--6B5C965B623748689A689838835C0AC2--> <POSITION><![CDATA[22]]></POSITION>
+<!--6B5C965B623748689A689838835C0AC2-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--6B5C965B623748689A689838835C0AC2--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--6B5C965B623748689A689838835C0AC2-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--6B5C965B623748689A689838835C0AC2-->
<IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--6B5C965B623748689A689838835C0AC2-->
<ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--6B5C965B623748689A689838835C0AC2--></AD_COLUMN>
+
<!--6BBCB749C7C640A08F573BF86D270171--><AD_COLUMN>
<!--6BBCB749C7C640A08F573BF86D270171-->
<AD_COLUMN_ID><![CDATA[6BBCB749C7C640A08F573BF86D270171]]></AD_COLUMN_ID>
<!--6BBCB749C7C640A08F573BF86D270171-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -5377,6 +5413,40 @@
<!--9D382AE31EFB4496B0A531A0FD72E73B-->
<ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
<!--9D382AE31EFB4496B0A531A0FD72E73B--></AD_COLUMN>
+<!--9DC8500B414640E09BF61A3D14FE13D1--><AD_COLUMN>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->
<AD_COLUMN_ID><![CDATA[9DC8500B414640E09BF61A3D14FE13D1]]></AD_COLUMN_ID>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9DC8500B414640E09BF61A3D14FE13D1--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9DC8500B414640E09BF61A3D14FE13D1--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->
<NAME><![CDATA[EM_APRM_MatchTransactions_Force]]></NAME>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->
<COLUMNNAME><![CDATA[EM_APRM_MatchTrans_Force]]></COLUMNNAME>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->
<AD_TABLE_ID><![CDATA[B129E53BC0E747879F7BA17F0AECEC32]]></AD_TABLE_ID>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->
<AD_REFERENCE_ID><![CDATA[28]]></AD_REFERENCE_ID>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->
<FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--9DC8500B414640E09BF61A3D14FE13D1--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--9DC8500B414640E09BF61A3D14FE13D1--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--9DC8500B414640E09BF61A3D14FE13D1--> <SEQNO><![CDATA[450]]></SEQNO>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->
<AD_ELEMENT_ID><![CDATA[F79620AE1CC041308045C23E661BD907]]></AD_ELEMENT_ID>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->
<AD_PROCESS_ID><![CDATA[19EEA22FCA464979B3ADAD3A967ADA52]]></AD_PROCESS_ID>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--9DC8500B414640E09BF61A3D14FE13D1--> <POSITION><![CDATA[39]]></POSITION>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--9DC8500B414640E09BF61A3D14FE13D1--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->
<IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->
<ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--9DC8500B414640E09BF61A3D14FE13D1--></AD_COLUMN>
+
<!--9DE9E45A80994A969AC623FA97A3C0E8--><AD_COLUMN>
<!--9DE9E45A80994A969AC623FA97A3C0E8-->
<AD_COLUMN_ID><![CDATA[9DE9E45A80994A969AC623FA97A3C0E8]]></AD_COLUMN_ID>
<!--9DE9E45A80994A969AC623FA97A3C0E8-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -5511,7 +5581,7 @@
<!--A028C07508878CB9E040007F01007210-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
<!--A028C07508878CB9E040007F01007210-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
<!--A028C07508878CB9E040007F01007210-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--A028C07508878CB9E040007F01007210--> <POSITION><![CDATA[30]]></POSITION>
+<!--A028C07508878CB9E040007F01007210--> <POSITION><![CDATA[35]]></POSITION>
<!--A028C07508878CB9E040007F01007210-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
<!--A028C07508878CB9E040007F01007210--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
<!--A028C07508878CB9E040007F01007210-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -5545,7 +5615,7 @@
<!--A04179EAC69DF848E040007F01004523-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
<!--A04179EAC69DF848E040007F01004523-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
<!--A04179EAC69DF848E040007F01004523-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--A04179EAC69DF848E040007F01004523--> <POSITION><![CDATA[31]]></POSITION>
+<!--A04179EAC69DF848E040007F01004523--> <POSITION><![CDATA[36]]></POSITION>
<!--A04179EAC69DF848E040007F01004523-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
<!--A04179EAC69DF848E040007F01004523--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
<!--A04179EAC69DF848E040007F01004523-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -5579,7 +5649,7 @@
<!--A04179EAC69EF848E040007F01004523-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
<!--A04179EAC69EF848E040007F01004523-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
<!--A04179EAC69EF848E040007F01004523-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--A04179EAC69EF848E040007F01004523--> <POSITION><![CDATA[32]]></POSITION>
+<!--A04179EAC69EF848E040007F01004523--> <POSITION><![CDATA[37]]></POSITION>
<!--A04179EAC69EF848E040007F01004523-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
<!--A04179EAC69EF848E040007F01004523--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
<!--A04179EAC69EF848E040007F01004523-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -5614,7 +5684,7 @@
<!--A04179EAC69FF848E040007F01004523-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
<!--A04179EAC69FF848E040007F01004523-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
<!--A04179EAC69FF848E040007F01004523-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--A04179EAC69FF848E040007F01004523--> <POSITION><![CDATA[33]]></POSITION>
+<!--A04179EAC69FF848E040007F01004523--> <POSITION><![CDATA[38]]></POSITION>
<!--A04179EAC69FF848E040007F01004523-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
<!--A04179EAC69FF848E040007F01004523--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
<!--A04179EAC69FF848E040007F01004523-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
diff -r 8d694f6a34a3 -r b4367a3c856c
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml
Thu Feb 06 15:52:22 2014 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml
Fri Feb 07 12:31:59 2014 +0100
@@ -677,6 +677,18 @@
<!--D2AC3F75FCDC4BC187A1F492C46D68D1--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
<!--D2AC3F75FCDC4BC187A1F492C46D68D1--></AD_ELEMENT>
+<!--D42C1F18622F4773989190BB8C2C8436--><AD_ELEMENT>
+<!--D42C1F18622F4773989190BB8C2C8436-->
<AD_ELEMENT_ID><![CDATA[D42C1F18622F4773989190BB8C2C8436]]></AD_ELEMENT_ID>
+<!--D42C1F18622F4773989190BB8C2C8436-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D42C1F18622F4773989190BB8C2C8436--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D42C1F18622F4773989190BB8C2C8436--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D42C1F18622F4773989190BB8C2C8436-->
<COLUMNNAME><![CDATA[EM_APRM_Process_BS_Force]]></COLUMNNAME>
+<!--D42C1F18622F4773989190BB8C2C8436--> <NAME><![CDATA[EM_APRM_Process Bank
Statement Force]]></NAME>
+<!--D42C1F18622F4773989190BB8C2C8436--> <PRINTNAME><![CDATA[EM_APRM_Process
Bank Statement Force]]></PRINTNAME>
+<!--D42C1F18622F4773989190BB8C2C8436-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--D42C1F18622F4773989190BB8C2C8436--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--D42C1F18622F4773989190BB8C2C8436--></AD_ELEMENT>
+
<!--DB85AA94D6DF4D7CB29CE7999B15F9C7--><AD_ELEMENT>
<!--DB85AA94D6DF4D7CB29CE7999B15F9C7-->
<AD_ELEMENT_ID><![CDATA[DB85AA94D6DF4D7CB29CE7999B15F9C7]]></AD_ELEMENT_ID>
<!--DB85AA94D6DF4D7CB29CE7999B15F9C7-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -719,6 +731,18 @@
<!--EDB9CF491555465382F828F48291A0C0--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
<!--EDB9CF491555465382F828F48291A0C0--></AD_ELEMENT>
+<!--F79620AE1CC041308045C23E661BD907--><AD_ELEMENT>
+<!--F79620AE1CC041308045C23E661BD907-->
<AD_ELEMENT_ID><![CDATA[F79620AE1CC041308045C23E661BD907]]></AD_ELEMENT_ID>
+<!--F79620AE1CC041308045C23E661BD907-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F79620AE1CC041308045C23E661BD907--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F79620AE1CC041308045C23E661BD907--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F79620AE1CC041308045C23E661BD907-->
<COLUMNNAME><![CDATA[EM_APRM_MatchTrans_Force]]></COLUMNNAME>
+<!--F79620AE1CC041308045C23E661BD907-->
<NAME><![CDATA[EM_APRM_MatchTransactions_Force]]></NAME>
+<!--F79620AE1CC041308045C23E661BD907-->
<PRINTNAME><![CDATA[EM_APRM_MatchTransactions_Force]]></PRINTNAME>
+<!--F79620AE1CC041308045C23E661BD907-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--F79620AE1CC041308045C23E661BD907--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--F79620AE1CC041308045C23E661BD907--></AD_ELEMENT>
+
<!--FC780C136EFA4D98B2435A9448FA44AD--><AD_ELEMENT>
<!--FC780C136EFA4D98B2435A9448FA44AD-->
<AD_ELEMENT_ID><![CDATA[FC780C136EFA4D98B2435A9448FA44AD]]></AD_ELEMENT_ID>
<!--FC780C136EFA4D98B2435A9448FA44AD-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 8d694f6a34a3 -r b4367a3c856c
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
Thu Feb 06 15:52:22 2014 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
Fri Feb 07 12:31:59 2014 +0100
@@ -5516,6 +5516,33 @@
<!--56C9A3AC73DC456293EB5E18A7E88048-->
<EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--56C9A3AC73DC456293EB5E18A7E88048--></AD_FIELD>
+<!--573AAAA411BD4BB5B6A155A820199184--><AD_FIELD>
+<!--573AAAA411BD4BB5B6A155A820199184-->
<AD_FIELD_ID><![CDATA[573AAAA411BD4BB5B6A155A820199184]]></AD_FIELD_ID>
+<!--573AAAA411BD4BB5B6A155A820199184-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--573AAAA411BD4BB5B6A155A820199184--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--573AAAA411BD4BB5B6A155A820199184--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--573AAAA411BD4BB5B6A155A820199184--> <NAME><![CDATA[Bank Statement Process
Force]]></NAME>
+<!--573AAAA411BD4BB5B6A155A820199184-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--573AAAA411BD4BB5B6A155A820199184-->
<AD_TAB_ID><![CDATA[C56E698100314ABBBBD3A89626CA551C]]></AD_TAB_ID>
+<!--573AAAA411BD4BB5B6A155A820199184-->
<AD_COLUMN_ID><![CDATA[6B5C965B623748689A689838835C0AC2]]></AD_COLUMN_ID>
+<!--573AAAA411BD4BB5B6A155A820199184-->
<IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--573AAAA411BD4BB5B6A155A820199184-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--573AAAA411BD4BB5B6A155A820199184-->
<DISPLAYLOGIC><![CDATA[@APRM_ISRECONCILED@!'']]></DISPLAYLOGIC>
+<!--573AAAA411BD4BB5B6A155A820199184-->
<DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
+<!--573AAAA411BD4BB5B6A155A820199184--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--573AAAA411BD4BB5B6A155A820199184--> <SEQNO><![CDATA[130]]></SEQNO>
+<!--573AAAA411BD4BB5B6A155A820199184--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--573AAAA411BD4BB5B6A155A820199184-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--573AAAA411BD4BB5B6A155A820199184-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--573AAAA411BD4BB5B6A155A820199184-->
<SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--573AAAA411BD4BB5B6A155A820199184-->
<ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--573AAAA411BD4BB5B6A155A820199184-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--573AAAA411BD4BB5B6A155A820199184-->
<STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--573AAAA411BD4BB5B6A155A820199184-->
<STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--573AAAA411BD4BB5B6A155A820199184-->
<ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--573AAAA411BD4BB5B6A155A820199184-->
<EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--573AAAA411BD4BB5B6A155A820199184--></AD_FIELD>
+
<!--573C4BEE22054AAEA437A3EEA5A03E70--><AD_FIELD>
<!--573C4BEE22054AAEA437A3EEA5A03E70-->
<AD_FIELD_ID><![CDATA[573C4BEE22054AAEA437A3EEA5A03E70]]></AD_FIELD_ID>
<!--573C4BEE22054AAEA437A3EEA5A03E70-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -12416,7 +12443,7 @@
<!--A0417A0E9255CA28E040007F01003C18-->
<AD_COLUMN_ID><![CDATA[A04179EAC69DF848E040007F01004523]]></AD_COLUMN_ID>
<!--A0417A0E9255CA28E040007F01003C18-->
<IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
<!--A0417A0E9255CA28E040007F01003C18-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--A0417A0E9255CA28E040007F01003C18-->
<DISPLAYLOGIC><![CDATA[@Type@='B'&@FIN_Matching_Algorithm_ID@!'']]></DISPLAYLOGIC>
+<!--A0417A0E9255CA28E040007F01003C18-->
<DISPLAYLOGIC><![CDATA[@Type@='B'&@FIN_Matching_Algorithm_ID@!''&(@LASTRECON@=@DRAFTRECONCILIATION@|@DRAFTRECONCILIATION@='')]]></DISPLAYLOGIC>
<!--A0417A0E9255CA28E040007F01003C18-->
<DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
<!--A0417A0E9255CA28E040007F01003C18--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--A0417A0E9255CA28E040007F01003C18--> <SEQNO><![CDATA[240]]></SEQNO>
@@ -12638,6 +12665,7 @@
------------------------------------------------------------------------------
Managing the Performance of Cloud-Based Applications
Take advantage of what the Cloud has to offer - Avoid Common Pitfalls.
Read the Whitepaper.
http://pubads.g.doubleclick.net/gampad/clk?id=121051231&iu=/4140/ostg.clktrk
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
