[Erp5-report] r28158 - in /erp5/trunk/bt5/erp5_banking_check: SkinTemplateItem/portal_skins...

[nobody at svn.erp5.org]

Author: vincent
Date: Thu Jul 23 16:28:32 2009
New Revision: 28158

URL: http://svn.erp5.org?rev=28158&view=rev
Log:
Make it faster (still not perfect) to search in Checkbook Vault Transfer fast input.

Modified:
    erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Delivery_getCheckbookList.xml
    erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/ListBox_countCheckbook.xml
    erp5/trunk/bt5/erp5_banking_check/bt/revision

Modified: erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Delivery_getCheckbookList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Delivery_getCheckbookList.xml?rev=28158&r1=28157&r2=28158&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Delivery_getCheckbookList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Delivery_getCheckbookList.xml [utf8] Thu Jul 23 16:28:32 2009
@@ -105,9 +105,18 @@
     if disable_node:\n
       node=None\n
 \n
-    current_tracking_list = getCurrentTrackingList(to_date=at_date,\n
-                                                   node=node,\n
-                                                   where_expression="item_catalog.portal_type=\'Check\' or item_catalog.portal_type=\'Checkbook\'")\n
+    kw = {}\n
+    if reference not in (None, \'\'):\n
+      kw[\'aggregate_uid\'] = [x.uid for x in context.getPortalObject().portal_catalog(\n
+        destination_payment_internal_bank_account_number=reference,\n
+        portal_type=(\'Check\', \'Checkbook\')\n
+      )]\n
+\n
+    current_tracking_list = getCurrentTrackingList(\n
+      to_date=at_date,\n
+      node=node,\n
+      where_expression="item_catalog.portal_type=\'Check\' or item_catalog.portal_type=\'Checkbook\'",\n
+      **kw)\n
 \n
     if count is True:\n
       return len(current_tracking_list)\n
@@ -146,8 +155,6 @@
           destination_payment_value = item.getDestinationPaymentValue()\n
           if destination_payment_value is not None:\n
             internal_bank_account_number = destination_payment_value.getInternalBankAccountNumber()\n
-            if reference not in (None, \'\') and reference != internal_bank_account_number:\n
-              continue\n
             item_dict[\'internal_bank_account_number\'] = internal_bank_account_number\n
             item_dict[\'account_owner\'] = item.getDestinationPaymentTitle()\n
           item_dict[\'recept_date\'] = item.getStartDate()\n
@@ -244,6 +251,11 @@
                             <string>context</string>
                             <string>item_list</string>
                             <string>getCurrentTrackingList</string>
+                            <string>append</string>
+                            <string>$append0</string>
+                            <string>x</string>
+                            <string>_write_</string>
+                            <string>_apply_</string>
                             <string>current_tracking_list</string>
                             <string>True</string>
                             <string>len</string>
@@ -255,7 +267,6 @@
                             <string>value</string>
                             <string>item_portal_type</string>
                             <string>item_dict</string>
-                            <string>_write_</string>
                             <string>destination_payment_value</string>
                             <string>internal_bank_account_number</string>
                             <string>_inplacevar_</string>

Modified: erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/ListBox_countCheckbook.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/ListBox_countCheckbook.xml?rev=28158&r1=28157&r2=28158&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/ListBox_countCheckbook.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/ListBox_countCheckbook.xml [utf8] Thu Jul 23 16:28:32 2009
@@ -83,11 +83,17 @@
   item_portal_type_list = (\'Check\',)\n
   disable_node = 1\n
 \n
+# retrieve reference field to filter list\n
+reference = getattr(request, \'your_reference\', None)\n
+if reference is None:\n
+  reference = getattr(request, \'field_your_reference\', None)\n
+\n
 nb = context.Delivery_getCheckbookList(\n
                     item_portal_type_list=item_portal_type_list,\n
                     disable_node=disable_node,\n
                     at_date=at_date,\n
                     node=node,\n
+                    reference=reference,\n
                     count=True)\n
 \n
 return [[nb,],]\n
@@ -151,6 +157,7 @@
                             <string>fast_input_type</string>
                             <string>disable_node</string>
                             <string>at_date</string>
+                            <string>reference</string>
                             <string>True</string>
                             <string>nb</string>
                           </tuple>

Modified: erp5/trunk/bt5/erp5_banking_check/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/bt/revision?rev=28158&r1=28157&r2=28158&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_check/bt/revision [utf8] Thu Jul 23 16:28:32 2009
@@ -1,1 +1,1 @@
-431
+432