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

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Apr 24 21:34:04 2007
New Revision: 14198

URL: http://svn.erp5.org?rev=14198&view=rev
Log:
InvoiceTransactionRule_asCellRange should not use catalog, but simply contentValues otherwise you have strange behaviour when you are faster than catalogging

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

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceTransactionRule_asCellRange.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceTransactionRule_asCellRange.xml?rev=14198&r1=14197&r2=14198&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceTransactionRule_asCellRange.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceTransactionRule_asCellRange.xml Tue Apr 24 21:34:04 2007
@@ -82,8 +82,10 @@
 \n
 for dimension in dimension_list:\n
   if dimension is not None:\n
-    predicate_list = context.searchFolder(string_index=dimension,\n
-                                          sort_on=\'int_index\')\n
+    predicate_list = [x for x in context.contentValues(portal_type=\'Predicate\')\n
+                       if x.getProperty(\'string_index\') == dimension ]\n
+    predicate_list.sort(lambda a,b: cmp(a.getProperty(\'int_index\', 0),\n
+                                        b.getProperty(\'int_index\', 1)))\n
     if len(predicate_list):\n
       dimension_result_list.append(predicate_list)\n
 \n
@@ -156,11 +158,11 @@
                             <string>dimension_result_list</string>
                             <string>dimension</string>
                             <string>None</string>
+                            <string>x</string>
                             <string>predicate_list</string>
                             <string>len</string>
                             <string>dimension_ids_list</string>
                             <string>dimension_result</string>
-                            <string>x</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=14198&r1=14197&r2=14198&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Tue Apr 24 21:34:04 2007
@@ -1,1 +1,1 @@
-281
+282