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

[nobody at svn.erp5.org]

Author: jerome
Date: Fri Nov 27 15:06:25 2009
New Revision: 30886

URL: http://svn.erp5.org?rev=30886&view=rev
Log:
use proper tag / after tags for automatic grouping / ungrouping
This fixes random failures of test_automatically_setting_grouping_reference_same_group and test_automatically_unsetting_grouping_reference_when_cancelling

Modified:
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_guessGroupedLines.xml
    erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/resetGroupingReference.xml
    erp5/trunk/bt5/erp5_accounting/bt/revision

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_guessGroupedLines.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_guessGroupedLines.xml?rev=30886&r1=30885&r2=30886&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_guessGroupedLines.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_guessGroupedLines.xml [utf8] Fri Nov 27 15:06:25 2009
@@ -155,6 +155,7 @@
     for line in line_info_list:\n
       line_obj = portal.restrictedTraverse(line[\'path\'])\n
       line_obj.setGroupingReference(string_reference)\n
+      line_obj.reindexObject(activate_kw=dict(tag=\'accounting_grouping_reference\'))\n
       changed_lines.append(line[\'path\'])\n
 \n
 return changed_lines\n

Modified: erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/resetGroupingReference.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/resetGroupingReference.xml?rev=30886&r1=30885&r2=30886&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/resetGroupingReference.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/resetGroupingReference.xml [utf8] Fri Nov 27 15:06:25 2009
@@ -59,10 +59,9 @@
 for line in transaction.getMovementList(\n
    portal_type=sci.getPortal().getPortalAccountingMovementTypeList()):\n
   if line.getGroupingReference():\n
-    line.activate(after_path_and_method_id=(\n
-                  (transaction.getPath(), (\'recursiveImmediateReindexObject\', \'immediateReindexObject\')),\n
-                  (line.getPath(), (\'recursiveImmediateReindexObject\', \'immediateReindexObject\')),),\n
-    ).AccountingTransactionLine_resetGroupingReference()\n
+    line.activate(\n
+       after_tag=\'accounting_grouping_reference\'\n
+       ).AccountingTransactionLine_resetGroupingReference()\n
 </string> </value>
         </item>
         <item>

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=30886&r1=30885&r2=30886&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Fri Nov 27 15:06:25 2009
@@ -1,1 +1,1 @@
-1067
+1069