[Erp5-report] r24749 - in /erp5/trunk/bt5/erp5_trade: WorkflowTemplateItem/portal_workflow/...

[nobody at svn.erp5.org]

Author: jerome
Date: Sat Nov 29 11:44:25 2008
New Revision: 24749

URL: http://svn.erp5.org?rev=24749&view=rev
Log:
use tag/after_tag so that invoice tax builders operates after invoice builder

Modified:
    erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PurchasePackingList_buildInvoice.xml
    erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/SalePackingList_buildInvoice.xml
    erp5/trunk/bt5/erp5_trade/bt/revision

Modified: erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PurchasePackingList_buildInvoice.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PurchasePackingList_buildInvoice.xml?rev=24749&r1=24748&r2=24749&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PurchasePackingList_buildInvoice.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PurchasePackingList_buildInvoice.xml [utf8] Sat Nov 29 11:44:25 2008
@@ -59,6 +59,9 @@
 \n
 if packing_list.getPortalType() == \'Purchase Packing List\':\n
   tag = \'build_invoice_%s\' % packing_list.getRelativeUrl()\n
+  # WARNING: this tag is also used in InvoiceTransaction_postGeneration script\n
+  tax_tag = \'build_invoice_tax_%s\' % packing_list.getRelativeUrl()\n
+\n
   invoice_line_builder = getattr(delivery_tool, \'purchase_invoice_builder\', None)\n
   if invoice_line_builder is not None:\n
     invoice_line_builder.activate(\n
@@ -75,7 +78,8 @@
   invoice_tax_builder = getattr(delivery_tool, \'purchase_invoice_tax_builder\', None)\n
   if invoice_tax_builder is not None:\n
     invoice_tax_builder.activate(\n
-          tag=tag,\n
+          tag=tax_tag,\n
+          after_tag=tag,\n
           after_method_id = [ \'expand\', \n
                               \'recursiveImmediateReindexObject\',\n
                               \'updateAppliedRule\',\n
@@ -127,6 +131,7 @@
                             <string>_getattr_</string>
                             <string>delivery_tool</string>
                             <string>tag</string>
+                            <string>tax_tag</string>
                             <string>getattr</string>
                             <string>None</string>
                             <string>invoice_line_builder</string>

Modified: erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/SalePackingList_buildInvoice.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/SalePackingList_buildInvoice.xml?rev=24749&r1=24748&r2=24749&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/SalePackingList_buildInvoice.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/SalePackingList_buildInvoice.xml [utf8] Sat Nov 29 11:44:25 2008
@@ -58,6 +58,9 @@
 delivery_tool = sci.getPortal().portal_deliveries\n
 if packing_list.getPortalType() == \'Sale Packing List\':\n
   tag = \'build_invoice_%s\' % packing_list.getRelativeUrl()\n
+  # WARNING: this tag is also used in InvoiceTransaction_postGeneration script\n
+  tax_tag = \'build_invoice_tax_%s\' % packing_list.getRelativeUrl()\n
+\n
   invoice_line_builder = getattr(delivery_tool, \'sale_invoice_builder\', None)\n
   if invoice_line_builder is not None:\n
     invoice_line_builder.activate(\n
@@ -74,7 +77,8 @@
   invoice_tax_builder = getattr(delivery_tool, \'sale_invoice_tax_builder\', None)\n
   if invoice_tax_builder is not None:\n
     invoice_tax_builder.activate(\n
-          tag=tag,\n
+          tag=tax_tag,\n
+          after_tag=tag,\n
           after_method_id = [ \'expand\', \n
                               \'recursiveImmediateReindexObject\',\n
                               \'updateAppliedRule\',\n
@@ -126,6 +130,7 @@
                             <string>_getattr_</string>
                             <string>delivery_tool</string>
                             <string>tag</string>
+                            <string>tax_tag</string>
                             <string>getattr</string>
                             <string>None</string>
                             <string>invoice_line_builder</string>

Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=24749&r1=24748&r2=24749&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision [utf8] Sat Nov 29 11:44:25 2008
@@ -1,1 +1,1 @@
-531
+534