when building invoice, use order and packing list as explanation uid, to...

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

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

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

bt5/erp5_trade/bt/revision

-579
\ No newline at end of file
+580
\ No newline at end of file