[Erp5-report] r24750 - in /erp5/trunk/bt5/erp5_invoicing: SkinTemplateItem/portal_skins/erp...

[nobody at svn.erp5.org]

Author: jerome
Date: Sat Nov 29 11:45:07 2008
New Revision: 24750

URL: http://svn.erp5.org?rev=24750&view=rev
Log:
activate the second script after invoice tax builder operation, otherwise a new
applied rule might be created for the new created invoice


Modified:
    erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.xml
    erp5/trunk/bt5/erp5_invoicing/bt/revision

Modified: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.xml?rev=24750&r1=24749&r2=24750&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.xml [utf8] Sat Nov 29 11:45:07 2008
@@ -62,15 +62,23 @@
 if related_simulation_movement_path_list is None:\n
   raise RuntimeError, \'related_simulation_movement_path_list is missing. Update ERP5 Product.\'\n
 \n
+activate_kw = dict(\n
+      after_path_and_method_id=(related_simulation_movement_path_list,\n
+                                  (\'immediateReindexObject\',\'recursiveImmediateReindexObject\')),)\n
+\n
 invoice = context\n
 packing_list = invoice.getCausalityValue()\n
 if packing_list is not None:\n
   order = packing_list.getCausalityValue()\n
   if order is not None:\n
     invoice.setSpecialise(order.getSpecialise())\n
-  \n
-invoice.activate(after_path_and_method_id=(related_simulation_movement_path_list,\n
-  (\'immediateReindexObject\',\'recursiveImmediateReindexObject\'))).InvoiceTransaction_postGenerationActivity(related_simulation_movement_path_list=related_simulation_movement_path_list, **kw)\n
+  # this is tax tag from packing_list_workflow scripts\n
+  activate_kw[\'after_tag\'] = \'build_invoice_tax_%s\' % packing_list.getRelativeUrl()\n
+\n
+invoice.activate(\n
+        **activate_kw\n
+        ).InvoiceTransaction_postGenerationActivity(\n
+                          related_simulation_movement_path_list=related_simulation_movement_path_list, **kw)\n
 </string> </value>
         </item>
         <item>
@@ -111,11 +119,14 @@
                             <string>kw</string>
                             <string>None</string>
                             <string>RuntimeError</string>
+                            <string>dict</string>
+                            <string>activate_kw</string>
                             <string>context</string>
                             <string>invoice</string>
                             <string>_getattr_</string>
                             <string>packing_list</string>
                             <string>order</string>
+                            <string>_write_</string>
                             <string>_apply_</string>
                           </tuple>
                         </value>

Modified: erp5/trunk/bt5/erp5_invoicing/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/revision?rev=24750&r1=24749&r2=24750&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] Sat Nov 29 11:45:07 2008
@@ -1,1 +1,1 @@
-166
+168