diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/scripts/PackingList_buildInvoice.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/scripts/PackingList_buildInvoice.xml index f01605919b980ec38ed353bcf8b6d67c54c02edb..93f96e06f2190ac0e2404ac15655e18e80311abc 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/scripts/PackingList_buildInvoice.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/scripts/PackingList_buildInvoice.xml @@ -68,23 +68,23 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>LOG=lambda msg:context.log("PackingList_buildInvoice", msg)\n -LOG=lambda msg:\'DISABLED\'\n + <value> <string>LOG=lambda msg:context.log("TaskReport_buildInvoice", msg)\n \n packing_list = sci.object\n delivery_tool = sci.getPortal().portal_deliveries\n -LOG("packing_list : %s"%packing_list.getPath())\n +LOG("Task Report : %s"%packing_list.getPath())\n \n -if hasattr(delivery_tool, \'task_invoice_builder\') :\n - delivery_tool.task_invoice_builder.activate(\n - after_method_id = [ \'expand\', \n - \'recursiveImmediateReindexObject\',\n - \'immediateReindexObject\' ],\n - ).build()\n -else :\n - packing_list.log("ERP5 Simulation",\n - "Unable to build Invoice from packing list at %s "\\\n - ": no sale_invoice_builder" % packing_list.getPath())\n +if sci.getPortal().getDefaultModule(\'Accounting Module\') is not None:\n + if hasattr(delivery_tool, \'task_invoice_builder\'):\n + delivery_tool.task_invoice_builder.activate(\n + after_method_id = [ \'expand\', \n + \'recursiveImmediateReindexObject\',\n + \'immediateReindexObject\' ],\n + ).build()\n + else :\n + packing_list.log("ERP5 Simulation",\n + "Unable to build Invoice from Task Report at %s "\\\n + ": no task_invoice_builder" % packing_list.getPath())\n </string> </value> </item> <item> @@ -132,6 +132,7 @@ else :\n <string>_getattr_</string> <string>packing_list</string> <string>delivery_tool</string> + <string>None</string> <string>hasattr</string> </tuple> </value> diff --git a/bt5/erp5_project/bt/revision b/bt5/erp5_project/bt/revision index 252b382b33c6c1706b6e9085ce7414f58bf00943..cbd6012bc6f6c4ceb791c8b2ae7ff8d5978d3875 100644 --- a/bt5/erp5_project/bt/revision +++ b/bt5/erp5_project/bt/revision @@ -1 +1 @@ -202 \ No newline at end of file +204 \ No newline at end of file