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

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Jan 28 18:52:31 2009
New Revision: 25351

URL: http://svn.erp5.org?rev=25351&view=rev
Log:
when building invoice, use order and packing list as explanation uid, to collect also movements coming from the packing list

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=25351&r1=25350&r2=25351&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] Wed Jan 28 18:52:31 2009
@@ -58,8 +58,9 @@
 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

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=25351&r1=25350&r2=25351&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] Wed Jan 28 18:52:31 2009
@@ -58,8 +58,9 @@
 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

Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=25351&r1=25350&r2=25351&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision [utf8] Wed Jan 28 18:52:31 2009
@@ -1,1 +1,1 @@
-579
+580