[Erp5-report] r25354 - in /erp5/trunk/bt5/erp5_accounting: WorkflowTemplateItem/portal_work...

nobody at svn.erp5.org nobody at svn.erp5.org
Wed Jan 28 18:54:37 CET 2009


Author: jerome
Date: Wed Jan 28 18:54:37 2009
New Revision: 25354

URL: http://svn.erp5.org?rev=25354&view=rev
Log:
build accounting lines (and payment lines) only for this invoice, packing list and order, by passing explanation_uid (like in order and packing list workflow)

Modified:
    erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_Build.xml
    erp5/trunk/bt5/erp5_accounting/bt/revision

Modified: erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_Build.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_Build.xml?rev=25354&r1=25353&r2=25354&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_Build.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_Build.xml [utf8] Wed Jan 28 18:54:37 2009
@@ -107,14 +107,28 @@
   method_id_list = (\'expand\', \'edit\', \'updateAppliedRule\', \'Delivery_updateAppliedRule\',\n
                     \'immediateReindexObject\', \'recursiveImmediateReindexObject\')\n
 \n
+  explanation_uid_list = [delivery.getUid(), ]\n
+  packing_list = delivery.getCausalityValue(\n
+                             portal_type=(\'Sale Packing List\',\n
+                                          \'Purchase Packing List\'))\n
+  if packing_list is not None:\n
+    explanation_uid_list.append(packing_list.getUid())\n
+    order = packing_list.getCausalityValue(\n
+                             portal_type=(\'Sale Order\',\n
+                                          \'Purchase Order\'))\n
+    if order is not None:\n
+      explanation_uid_list.append(order.getUid())\n
+\n
+\n
   tag = \'invoice_transaction_build_%s\' % delivery.getRelativeUrl()\n
   builder.activate(\n
       after_method_id=method_id_list,\n
       tag=tag,\n
-      activate_kw=dict(tag=tag)).build(activate_kw=dict(tag=tag))\n
+      activate_kw=dict(tag=tag)).build(activate_kw=dict(tag=tag),\n
+                                       explanation_uid=explanation_uid_list)\n
 \n
   # build related payment transactions\n
-  portal_deliveries.payment_transaction_builder.activate(after_method_id=method_id_list).build()\n
+  portal_deliveries.payment_transaction_builder.activate(after_method_id=method_id_list).build(explanation_uid=explanation_uid_list)\n
 \n
   # set the object in building state.\n
   delivery.startBuilding()\n
@@ -173,6 +187,9 @@
                             <string>expand_tag</string>
                             <string>activate_kw</string>
                             <string>method_id_list</string>
+                            <string>explanation_uid_list</string>
+                            <string>packing_list</string>
+                            <string>order</string>
                             <string>tag</string>
                             <string>dict</string>
                           </tuple>

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=25354&r1=25353&r2=25354&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Wed Jan 28 18:54:37 2009
@@ -1,1 +1,1 @@
-852
+853




More information about the Erp5-report mailing list