From 2b3b8e576dff67a79b86dbf8e01a781a66feffc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Wed, 28 Jan 2009 17:52:31 +0000 Subject: [PATCH] when building invoice, use order and packing list as explanation uid, to collect also movements coming from the packing list git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25351 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../scripts/PurchasePackingList_buildInvoice.xml | 5 +++-- .../scripts/SalePackingList_buildInvoice.xml | 5 +++-- bt5/erp5_trade/bt/revision | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PurchasePackingList_buildInvoice.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PurchasePackingList_buildInvoice.xml index 5e11778fc1f..a20b4bf64c2 100644 --- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PurchasePackingList_buildInvoice.xml +++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PurchasePackingList_buildInvoice.xml @@ -58,8 +58,9 @@ packing_list = sci[\'object\']\n delivery_tool = sci.getPortal().portal_deliveries\n \n if packing_list.getPortalType() == \'Purchase Packing List\':\n - explanation_uid = packing_list.getCausalityUid(\n - portal_type=\'Purchase Order\') or packing_list.getUid()\n + explanation_uid = packing_list.getCausalityUid(portal_type=\'Purchase Order\')\n + if explanation_uid:\n + explanation_uid = (explanation_uid, packing_list.getUid())\n \n tag = \'build_invoice_%s\' % packing_list.getRelativeUrl()\n # WARNING: this tag is also used in InvoiceTransaction_postGeneration script\n diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/SalePackingList_buildInvoice.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/SalePackingList_buildInvoice.xml index cd4afb43499..170403b3c86 100644 --- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/SalePackingList_buildInvoice.xml +++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/SalePackingList_buildInvoice.xml @@ -58,8 +58,9 @@ packing_list = sci[\'object\']\n delivery_tool = sci.getPortal().portal_deliveries\n \n if packing_list.getPortalType() == \'Sale Packing List\':\n - explanation_uid = packing_list.getCausalityUid(\n - portal_type=\'Sale Order\') or packing_list.getUid()\n + explanation_uid = packing_list.getCausalityUid(portal_type=\'Sale Order\')\n + if explanation_uid:\n + explanation_uid = (explanation_uid, packing_list.getUid())\n \n tag = \'build_invoice_%s\' % packing_list.getRelativeUrl()\n # WARNING: this tag is also used in InvoiceTransaction_postGeneration script\n diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index 72b67e0ede1..55b22b1aa9f 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -579 \ No newline at end of file +580 \ No newline at end of file -- 2.30.9