[Erp5-report] r25980 - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_skins/er...

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Mar 11 15:14:32 2009
New Revision: 25980

URL: http://svn.erp5.org?rev=25980&view=rev
Log:
- fix wrong condition for skip_invalidated_bank_accounts, and change it's default
value to false, by default we show all bank accounts (we may want to make
reports on old invalidated accounts).
- only consider bank accounts inside organisations, bank account inside a
  person is considered as a personal bank account, even if the person is member
  of the same group.


Modified:
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getBankAccountItemList.xml
    erp5/trunk/bt5/erp5_accounting/bt/revision

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getBankAccountItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getBankAccountItemList.xml?rev=25980&r1=25979&r2=25980&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getBankAccountItemList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getBankAccountItemList.xml [utf8] Wed Mar 11 15:14:32 2009
@@ -53,8 +53,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>from ZTUtils import LazyFilter\n
-portal = context.getPortalObject()\n
+            <value> <string>portal = context.getPortalObject()\n
 \n
 if not organisation:\n
   organisation = portal.portal_preferences\\\n
@@ -70,8 +69,8 @@
   \'portal_type\': portal.getPortalPaymentNodeTypeList(),\n
 }\n
 \n
-if not skip_invalidated_bank_accounts:\n
-  search_kw[\'validation_state\'] = \'!=validated\'\n
+if skip_invalidated_bank_accounts:\n
+  search_kw[\'validation_state\'] = \'!=invalidated\'\n
 \n
 if group_value is None:\n
   search_kw[\'parent_uid\'] = organisation_value.getUid()\n
@@ -81,6 +80,7 @@
     uid_list.append(group_value.getUid())\n
     group_value = group_value.getParentValue()\n
   search_kw[\'parent_strict_group_uid\'] = uid_list\n
+  search_kw[\'parent_portal_type\'] = \'Organisation\'\n
 \n
 item_list = [(\'\', \'\')]\n
 for bank in portal.portal_catalog(**search_kw):\n
@@ -111,7 +111,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>organisation=None, skip_invalidated_bank_accounts=1</string> </value>
+            <value> <string>organisation=None, skip_invalidated_bank_accounts=0</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -139,8 +139,6 @@
                           <tuple>
                             <string>organisation</string>
                             <string>skip_invalidated_bank_accounts</string>
-                            <string>ZTUtils</string>
-                            <string>LazyFilter</string>
                             <string>_getattr_</string>
                             <string>context</string>
                             <string>portal</string>
@@ -167,7 +165,7 @@
             <value>
               <tuple>
                 <none/>
-                <int>1</int>
+                <int>0</int>
               </tuple>
             </value>
         </item>

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=25980&r1=25979&r2=25980&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Wed Mar 11 15:14:32 2009
@@ -1,1 +1,1 @@
-886
+887