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

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Jan 28 11:41:14 2009
New Revision: 25324

URL: http://svn.erp5.org?rev=25324&view=rev
Log:
in the default configuration, we should only build the invoice related to the packing list that have been started/stopped

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=25324&r1=25323&r2=25324&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 11:41:14 2009
@@ -58,6 +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
+\n
   tag = \'build_invoice_%s\' % packing_list.getRelativeUrl()\n
   # WARNING: this tag is also used in InvoiceTransaction_postGeneration script\n
   tax_tag = \'build_invoice_tax_%s\' % packing_list.getRelativeUrl()\n
@@ -71,7 +74,7 @@
                               \'recursiveImmediateReindexObject\',\n
                               \'updateAppliedRule\',\n
                               \'immediateReindexObject\' ],\n
-          ).build()\n
+          ).build(explanation_uid=explanation_uid)\n
   else:\n
     log(\'no purchase_invoice_builder found\')\n
 \n
@@ -84,7 +87,7 @@
                               \'recursiveImmediateReindexObject\',\n
                               \'updateAppliedRule\',\n
                               \'immediateReindexObject\' ],\n
-          ).build()\n
+          ).build(explanation_uid=explanation_uid)\n
   else:\n
     log(\'no purchase_invoice_tax_builder found\')\n
 </string> </value>
@@ -130,6 +133,7 @@
                             <string>packing_list</string>
                             <string>_getattr_</string>
                             <string>delivery_tool</string>
+                            <string>explanation_uid</string>
                             <string>tag</string>
                             <string>tax_tag</string>
                             <string>getattr</string>

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=25324&r1=25323&r2=25324&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 11:41:14 2009
@@ -56,7 +56,11 @@
             <value> <string>from Products.ERP5Type.Log import log\n
 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
+\n
   tag = \'build_invoice_%s\' % packing_list.getRelativeUrl()\n
   # WARNING: this tag is also used in InvoiceTransaction_postGeneration script\n
   tax_tag = \'build_invoice_tax_%s\' % packing_list.getRelativeUrl()\n
@@ -70,7 +74,7 @@
                               \'recursiveImmediateReindexObject\',\n
                               \'updateAppliedRule\',\n
                               \'immediateReindexObject\' ],\n
-          ).build()\n
+          ).build(explanation_uid=explanation_uid)\n
   else:\n
     log(\'no sale_invoice_builder found\')\n
 \n
@@ -83,7 +87,7 @@
                               \'recursiveImmediateReindexObject\',\n
                               \'updateAppliedRule\',\n
                               \'immediateReindexObject\' ],\n
-          ).build()\n
+          ).build(explanation_uid=explanation_uid)\n
   else:\n
     log(\'no sale_invoice_tax_builder found\')\n
 </string> </value>
@@ -129,6 +133,7 @@
                             <string>packing_list</string>
                             <string>_getattr_</string>
                             <string>delivery_tool</string>
+                            <string>explanation_uid</string>
                             <string>tag</string>
                             <string>tax_tag</string>
                             <string>getattr</string>

Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=25324&r1=25323&r2=25324&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision [utf8] Wed Jan 28 11:41:14 2009
@@ -1,1 +1,1 @@
-577
+578