details: /erp/devel/pi/rev/a23394d64089
changeset: 12248:a23394d64089
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Thu May 19 17:01:35 2011 +0200
summary: Fixed issue 17209.Fixed status column.Fixed post and delete buttons.
diffstat:
modules/org.openbravo.advpaymentmngt/src-db/database/model/views/APRM_FINACC_TRANSACTION_V.xml
| 4 +-
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
| 40 +++++++++-
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
| 25 ++++++
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml
| 2 -
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/DeleteTransaction.java
| 3 +
5 files changed, 69 insertions(+), 5 deletions(-)
diffs (138 lines):
diff -r eeb3790fec5b -r a23394d64089
modules/org.openbravo.advpaymentmngt/src-db/database/model/views/APRM_FINACC_TRANSACTION_V.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/model/views/APRM_FINACC_TRANSACTION_V.xml
Thu May 19 16:18:14 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/model/views/APRM_FINACC_TRANSACTION_V.xml
Thu May 19 17:01:35 2011 +0200
@@ -4,7 +4,9 @@
CASE trx.status
WHEN 'RPPC' THEN 'Y'
ELSE 'N'
-END AS cleared, p.c_bpartner_id, p.documentno AS paymentdocno,
COALESCE(r.processed, 'N') AS reconciled, 'N' AS delete_btn
+END AS cleared, p.c_bpartner_id, p.documentno AS paymentdocno,
COALESCE(r.processed, 'N') AS reconciled, 'N' AS delete_btn, (SELECT
ad_table.ad_table_id
+FROM ad_table
+WHERE lower(ad_table.tablename) = 'fin_finacc_transaction') AS forced_table_id
FROM fin_finacc_transaction trx
LEFT JOIN fin_payment p ON trx.fin_payment_id = p.fin_payment_id
LEFT JOIN fin_reconciliation r ON trx.fin_reconciliation_id =
r.fin_reconciliation_id]]></view>
diff -r eeb3790fec5b -r a23394d64089
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
Thu May 19 16:18:14 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
Thu May 19 17:01:35 2011 +0200
@@ -3000,7 +3000,7 @@
<!--A37C6F84AA1F3F50E040007F01006E35-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
<!--A37C6F84AA1F3F50E040007F01006E35-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
<!--A37C6F84AA1F3F50E040007F01006E35-->
<AD_ELEMENT_ID><![CDATA[7891269C8421655DE040007F010155CE]]></AD_ELEMENT_ID>
-<!--A37C6F84AA1F3F50E040007F01006E35-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--A37C6F84AA1F3F50E040007F01006E35-->
<ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
<!--A37C6F84AA1F3F50E040007F01006E35-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
<!--A37C6F84AA1F3F50E040007F01006E35-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
<!--A37C6F84AA1F3F50E040007F01006E35-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
@@ -3618,7 +3618,9 @@
<!--A37C6F84AA323F50E040007F01006E35--> <HELP><![CDATA[Current status of a
debt/payment.]]></HELP>
<!--A37C6F84AA323F50E040007F01006E35-->
<COLUMNNAME><![CDATA[Status]]></COLUMNNAME>
<!--A37C6F84AA323F50E040007F01006E35-->
<AD_TABLE_ID><![CDATA[FF8080812FFEC82D012FFECCE3400030]]></AD_TABLE_ID>
-<!--A37C6F84AA323F50E040007F01006E35-->
<AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--A37C6F84AA323F50E040007F01006E35-->
<AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
+<!--A37C6F84AA323F50E040007F01006E35-->
<AD_REFERENCE_VALUE_ID><![CDATA[575BCB88A4694C27BC013DE9C73E6FE7]]></AD_REFERENCE_VALUE_ID>
+<!--A37C6F84AA323F50E040007F01006E35-->
<AD_VAL_RULE_ID><![CDATA[7A86F689FB1C46F19DBE338D6DECD703]]></AD_VAL_RULE_ID>
<!--A37C6F84AA323F50E040007F01006E35-->
<FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
<!--A37C6F84AA323F50E040007F01006E35--> <ISKEY><![CDATA[N]]></ISKEY>
<!--A37C6F84AA323F50E040007F01006E35--> <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -4131,6 +4133,40 @@
<!--A37C6F84AA413F50E040007F01006E35-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
<!--A37C6F84AA413F50E040007F01006E35--></AD_COLUMN>
+<!--A3A1CA451F85C5FBE040007F0100386C--><AD_COLUMN>
+<!--A3A1CA451F85C5FBE040007F0100386C-->
<AD_COLUMN_ID><![CDATA[A3A1CA451F85C5FBE040007F0100386C]]></AD_COLUMN_ID>
+<!--A3A1CA451F85C5FBE040007F0100386C-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A3A1CA451F85C5FBE040007F0100386C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A3A1CA451F85C5FBE040007F0100386C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A3A1CA451F85C5FBE040007F0100386C-->
<NAME><![CDATA[Forced_Table_ID]]></NAME>
+<!--A3A1CA451F85C5FBE040007F0100386C--> <DESCRIPTION><![CDATA[Hidden column
to set the source table id in views.]]></DESCRIPTION>
+<!--A3A1CA451F85C5FBE040007F0100386C--> <HELP><![CDATA[Hidden column to set
the source table id in views. It is needed when creating a tab from a view
which will trigger accounting. In that case the original AD_Table_ID is loaded
through Forced_Table_ID.]]></HELP>
+<!--A3A1CA451F85C5FBE040007F0100386C-->
<COLUMNNAME><![CDATA[Forced_Table_ID]]></COLUMNNAME>
+<!--A3A1CA451F85C5FBE040007F0100386C-->
<AD_TABLE_ID><![CDATA[FF8080812FFEC82D012FFECCE3400030]]></AD_TABLE_ID>
+<!--A3A1CA451F85C5FBE040007F0100386C-->
<AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
+<!--A3A1CA451F85C5FBE040007F0100386C-->
<AD_REFERENCE_VALUE_ID><![CDATA[414E5DD3A1304C7781FB856A6872F428]]></AD_REFERENCE_VALUE_ID>
+<!--A3A1CA451F85C5FBE040007F0100386C-->
<FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--A3A1CA451F85C5FBE040007F0100386C--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--A3A1CA451F85C5FBE040007F0100386C--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--A3A1CA451F85C5FBE040007F0100386C-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--A3A1CA451F85C5FBE040007F0100386C-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--A3A1CA451F85C5FBE040007F0100386C-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--A3A1CA451F85C5FBE040007F0100386C--> <SEQNO><![CDATA[370]]></SEQNO>
+<!--A3A1CA451F85C5FBE040007F0100386C-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--A3A1CA451F85C5FBE040007F0100386C-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A3A1CA451F85C5FBE040007F0100386C-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--A3A1CA451F85C5FBE040007F0100386C-->
<AD_ELEMENT_ID><![CDATA[8448D8212AA95824E040007F01001A1B]]></AD_ELEMENT_ID>
+<!--A3A1CA451F85C5FBE040007F0100386C-->
<ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--A3A1CA451F85C5FBE040007F0100386C-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--A3A1CA451F85C5FBE040007F0100386C-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--A3A1CA451F85C5FBE040007F0100386C-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--A3A1CA451F85C5FBE040007F0100386C-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--A3A1CA451F85C5FBE040007F0100386C--> <POSITION><![CDATA[37]]></POSITION>
+<!--A3A1CA451F85C5FBE040007F0100386C-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--A3A1CA451F85C5FBE040007F0100386C--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--A3A1CA451F85C5FBE040007F0100386C-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--A3A1CA451F85C5FBE040007F0100386C--></AD_COLUMN>
+
<!--A6B405E9791D4BC685220C11CCA916C0--><AD_COLUMN>
<!--A6B405E9791D4BC685220C11CCA916C0-->
<AD_COLUMN_ID><![CDATA[A6B405E9791D4BC685220C11CCA916C0]]></AD_COLUMN_ID>
<!--A6B405E9791D4BC685220C11CCA916C0-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r eeb3790fec5b -r a23394d64089
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
Thu May 19 16:18:14 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
Thu May 19 17:01:35 2011 +0200
@@ -6576,6 +6576,31 @@
<!--A37C70FE6BA6C015E040007F01006DF4-->
<ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
<!--A37C70FE6BA6C015E040007F01006DF4--></AD_FIELD>
+<!--A3A1CDFB1F62D2EAE040007F0100388E--><AD_FIELD>
+<!--A3A1CDFB1F62D2EAE040007F0100388E-->
<AD_FIELD_ID><![CDATA[A3A1CDFB1F62D2EAE040007F0100388E]]></AD_FIELD_ID>
+<!--A3A1CDFB1F62D2EAE040007F0100388E-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A3A1CDFB1F62D2EAE040007F0100388E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A3A1CDFB1F62D2EAE040007F0100388E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A3A1CDFB1F62D2EAE040007F0100388E-->
<NAME><![CDATA[Forced_Table_ID]]></NAME>
+<!--A3A1CDFB1F62D2EAE040007F0100388E--> <DESCRIPTION><![CDATA[Hidden column
to set the source table id in views.]]></DESCRIPTION>
+<!--A3A1CDFB1F62D2EAE040007F0100388E--> <HELP><![CDATA[Hidden column to set
the source table id in views. It is needed when creating a tab from a view
which will trigger accounting. In that case the original AD_Table_ID is loaded
through Forced_Table_ID.]]></HELP>
+<!--A3A1CDFB1F62D2EAE040007F0100388E-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--A3A1CDFB1F62D2EAE040007F0100388E-->
<AD_TAB_ID><![CDATA[FF8080812F213146012F2135BC25000E]]></AD_TAB_ID>
+<!--A3A1CDFB1F62D2EAE040007F0100388E-->
<AD_COLUMN_ID><![CDATA[A3A1CA451F85C5FBE040007F0100386C]]></AD_COLUMN_ID>
+<!--A3A1CDFB1F62D2EAE040007F0100388E-->
<ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--A3A1CDFB1F62D2EAE040007F0100388E-->
<DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--A3A1CDFB1F62D2EAE040007F0100388E--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--A3A1CDFB1F62D2EAE040007F0100388E--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--A3A1CDFB1F62D2EAE040007F0100388E-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--A3A1CDFB1F62D2EAE040007F0100388E-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A3A1CDFB1F62D2EAE040007F0100388E-->
<SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--A3A1CDFB1F62D2EAE040007F0100388E-->
<ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--A3A1CDFB1F62D2EAE040007F0100388E-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--A3A1CDFB1F62D2EAE040007F0100388E-->
<STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--A3A1CDFB1F62D2EAE040007F0100388E-->
<STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--A3A1CDFB1F62D2EAE040007F0100388E-->
<ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--A3A1CDFB1F62D2EAE040007F0100388E--></AD_FIELD>
+
<!--A41471E03DCC4B2081D047EAD9BBB0B6--><AD_FIELD>
<!--A41471E03DCC4B2081D047EAD9BBB0B6-->
<AD_FIELD_ID><![CDATA[A41471E03DCC4B2081D047EAD9BBB0B6]]></AD_FIELD_ID>
<!--A41471E03DCC4B2081D047EAD9BBB0B6-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r eeb3790fec5b -r a23394d64089
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml
Thu May 19 16:18:14 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml
Thu May 19 17:01:35 2011 +0200
@@ -84,8 +84,6 @@
<!--FF8080812FFEC82D012FFECCE3400030-->
<ISDEFAULTACCT><![CDATA[N]]></ISDEFAULTACCT>
<!--FF8080812FFEC82D012FFECCE3400030-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
<!--FF8080812FFEC82D012FFECCE3400030-->
<AD_PACKAGE_ID><![CDATA[AC33B2262748414A816510545755435A]]></AD_PACKAGE_ID>
-<!--FF8080812FFEC82D012FFECCE3400030-->
<ACCTDATE_COLUMN_ID><![CDATA[A37C6F84AA353F50E040007F01006E35]]></ACCTDATE_COLUMN_ID>
-<!--FF8080812FFEC82D012FFECCE3400030-->
<ACCTCLASSNAME><![CDATA[org.openbravo.erpCommon.ad_forms.DocFINFinAccTransaction]]></ACCTCLASSNAME>
<!--FF8080812FFEC82D012FFECCE3400030--></AD_TABLE>
</data>
diff -r eeb3790fec5b -r a23394d64089
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/DeleteTransaction.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/DeleteTransaction.java
Thu May 19 16:18:14 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/DeleteTransaction.java
Thu May 19 17:01:35 2011 +0200
@@ -41,6 +41,9 @@
Map<String, Object> params = bundle.getParams();
String strKey = (String) params.get("Fin_Finacc_Transaction_ID");
+ if (strKey == null) {
+ strKey = (String) params.get("Aprm_Finacc_Transaction_V_ID");
+ }
FIN_FinaccTransaction transaction = OBDal.getInstance()
.get(FIN_FinaccTransaction.class, strKey);
try {
------------------------------------------------------------------------------
What Every C/C++ and Fortran developer Should Know!
Read this article and learn how Intel has extended the reach of its
next-generation tools to help Windows* and Linux* C/C++ and Fortran
developers boost performance applications - including clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
