[Erp5-report] r28712 - in /erp5/trunk/bt5/erp5_invoicing: SkinTemplateItem/portal_skins/erp...

[nobody at svn.erp5.org]

Author: luke
Date: Tue Sep  1 11:57:44 2009
New Revision: 28712

URL: http://svn.erp5.org?rev=28712&view=rev
Log:
 - copy trade model lines from order when building invoice

Modified:
    erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.xml
    erp5/trunk/bt5/erp5_invoicing/bt/revision

Modified: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.xml?rev=28712&r1=28711&r2=28712&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.xml [utf8] Tue Sep  1 11:57:44 2009
@@ -78,11 +78,26 @@
 \n
 related_packing_list = invoice.getDefaultCausalityValue()\n
 \n
+related_order = related_packing_list.getDefaultCausalityValue()\n
 # copy trade condition:\n
 if not context.getSpecialise():\n
-  related_order = related_packing_list.getDefaultCausalityValue()\n
   if related_order is not None:\n
     context.edit(specialise=related_order.getSpecialise())\n
+\n
+# copy order\'s trade model lines\n
+invoice_trade_model_line_reference_list = [document.getReference() \\\n
+    for document in context.contentValues(portal_type=\'Trade Model Line\')]\n
+order_trade_model_line_copy_id_list = []\n
+for order_trade_model_line in related_order.contentValues(\n
+    portal_type=\'Trade Model Line\'):\n
+  if order_trade_model_line.getReference() not in \\\n
+      invoice_trade_model_line_reference_list:\n
+    order_trade_model_line_copy_id_list.append(order_trade_model_line.getId())\n
+\n
+if order_trade_model_line_copy_id_list:\n
+  clipboard = related_order.manage_copyObjects(\n
+    ids=order_trade_model_line_copy_id_list)\n
+  context.manage_pasteObjects(clipboard)\n
 \n
 # copy title, if not updating a new delivery\n
 if not invoice.hasTitle() and related_packing_list.hasTitle():\n
@@ -161,6 +176,14 @@
                             <string>_getattr_</string>
                             <string>related_packing_list</string>
                             <string>related_order</string>
+                            <string>append</string>
+                            <string>$append0</string>
+                            <string>_getiter_</string>
+                            <string>document</string>
+                            <string>invoice_trade_model_line_reference_list</string>
+                            <string>order_trade_model_line_copy_id_list</string>
+                            <string>order_trade_model_line</string>
+                            <string>clipboard</string>
                             <string>e</string>
                           </tuple>
                         </value>

Modified: erp5/trunk/bt5/erp5_invoicing/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/revision?rev=28712&r1=28711&r2=28712&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] Tue Sep  1 11:57:44 2009
@@ -1,1 +1,1 @@
-292
+293