[Erp5-report] r13406 - in /erp5/trunk/bt5/erp5_banking_core: SkinTemplateItem/portal_skins/...

[nobody at svn.erp5.org]

Author: vincent
Date: Tue Mar 13 16:46:21 2007
New Revision: 13406

URL: http://svn.erp5.org?rev=13406&view=rev
Log:
Add support for emission_letter filtering.

Modified:
    erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_getVaultTransactionList.xml
    erp5/trunk/bt5/erp5_banking_core/bt/revision

Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_getVaultTransactionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_getVaultTransactionList.xml?rev=13406&r1=13405&r2=13406&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_getVaultTransactionList.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_getVaultTransactionList.xml Tue Mar 13 16:46:21 2007
@@ -117,8 +117,15 @@
   inventory_kw[\'explanation_uid\'] = kw[\'explanation_uid\']\n
   if len(kw[\'explanation_uid\'])==0:\n
     return total_inventory_list\n
-if kw.has_key("cash_status"):\n
-  inventory_kw[\'variation_text\'] = "%%cash_status/%s%%" % kw[\'cash_status\']\n
+kw_has_cash_status = kw.has_key("cash_status")\n
+kw_has_emission_letter = kw.has_key("emission_letter")\n
+if kw_has_cash_status or kw_has_emission_letter:\n
+  variation_text_list = [\'%\']\n
+  if kw_has_cash_status:\n
+    variation_text_list.append("cash_status/%s%%" % kw[\'cash_status\'])\n
+  if kw_has_emission_letter:\n
+    variation_text_list.append("emission_letter/%s%%" % kw[\'emission_letter\'])\n
+  inventory_kw[\'variation_text\'] = \'\'.join(variation_text_list)\n
 \n
 if at_date is not None:\n
   # XXX this make sure we look at the end of the day\n
@@ -317,6 +324,9 @@
                             <string>_getattr_</string>
                             <string>_getitem_</string>
                             <string>len</string>
+                            <string>kw_has_cash_status</string>
+                            <string>kw_has_emission_letter</string>
+                            <string>variation_text_list</string>
                             <string>column_list</string>
                             <string>_getiter_</string>
                             <string>_apply_</string>

Modified: erp5/trunk/bt5/erp5_banking_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/bt/revision?rev=13406&r1=13405&r2=13406&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_core/bt/revision Tue Mar 13 16:46:21 2007
@@ -1,1 +1,1 @@
-143
+145