2009-06-19 tatuya

* Fix workflow scripts to enable to create  Sale Invoices and Purchase Invoices when using erp5_advanced_invoicing

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27670 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PurchasePackingList_buildInvoice.xml

@@ -67,7 +67,13 @@ if packing_list.getPortalType() == \'Purchase Packing List\':\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
+  invoice_builder_name = \'purchase_invoice_builder\'\n
+  invoice_tax_builder_name = \'purchase_invoice_tax_builder\'\n
+  if \'Purchase Invoice Module\' in context.getPortalModuleTypeList():\n
+    invoice_builder_name = \'advanced_purchase_invoice_builder\'\n
+    invoice_tax_builder_name = \'advanced_purchase_invoice_tax_builder\'\n
+\n
+  invoice_line_builder = getattr(delivery_tool,  invoice_builder_name , None)\n
   if invoice_line_builder is not None:\n
     invoice_line_builder.activate(\n
           activity=\'SQLQueue\',\n
@@ -80,7 +86,7 @@ if packing_list.getPortalType() == \'Purchase Packing List\':\n
   else:\n
     log(\'no purchase_invoice_builder found\')\n
 \n
-  invoice_tax_builder = getattr(delivery_tool, \'purchase_invoice_tax_builder\', None)\n
+  invoice_tax_builder = getattr(delivery_tool, invoice_tax_builder_name, None)\n
   if invoice_tax_builder is not None:\n
     invoice_tax_builder.activate(\n
           activity=\'SQLQueue\',\n
@@ -140,6 +146,9 @@ if packing_list.getPortalType() == \'Purchase Packing List\':\n
                             <string>None</string>
                             <string>tag</string>
                             <string>tax_tag</string>
+                            <string>invoice_builder_name</string>
+                            <string>invoice_tax_builder_name</string>
+                            <string>context</string>
                             <string>getattr</string>
                             <string>invoice_line_builder</string>
                             <string>dict</string>

bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/SalePackingList_buildInvoice.xml

@@ -67,7 +67,13 @@ if packing_list.getPortalType() == \'Sale Packing List\':\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
+  invoice_builder_name = \'sale_invoice_builder\'\n
+  invoice_tax_builder_name = \'sale_invoice_tax_builder\'\n
+  if \'Sale Invoice Module\' in context.getPortalModuleTypeList():\n
+    invoice_builder_name = \'advanced_sale_invoice_builder\'\n
+    invoice_tax_builder_name = \'advanced_sale_invoice_tax_builder\'\n
+ \n
+  invoice_line_builder = getattr(delivery_tool, invoice_builder_name, None)\n
   if invoice_line_builder is not None:\n
     invoice_line_builder.activate(\n
           activity=\'SQLQueue\',\n
@@ -80,7 +86,7 @@ if packing_list.getPortalType() == \'Sale Packing List\':\n
   else:\n
     log(\'no sale_invoice_builder found\')\n
 \n
-  invoice_tax_builder = getattr(delivery_tool, \'sale_invoice_tax_builder\', None)\n
+  invoice_tax_builder = getattr(delivery_tool, invoice_tax_builder_name, None)\n
   if invoice_tax_builder is not None:\n
     invoice_tax_builder.activate(\n
           activity=\'SQLQueue\',\n
@@ -140,6 +146,9 @@ if packing_list.getPortalType() == \'Sale Packing List\':\n
                             <string>None</string>
                             <string>tag</string>
                             <string>tax_tag</string>
+                            <string>invoice_builder_name</string>
+                            <string>invoice_tax_builder_name</string>
+                            <string>context</string>
                             <string>getattr</string>
                             <string>invoice_line_builder</string>
                             <string>dict</string>

bt5/erp5_trade/bt/change_log

+2009-06-19 tatuya
+* Fix workflow scripts to enable to create  Sale Invoices and Purchase Invoices when using erp5_advanced_invoicing
+
 2009-05-19 yusei
 * Fix some proxy fields. count_method should not be inherited from template field and proxy_listbox_ids had to be copied to new proxified fields but it was not copied.
 

bt5/erp5_trade/bt/revision

-669
\ No newline at end of file
+681
\ No newline at end of file