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

[nobody at svn.erp5.org]

Author: luke
Date: Tue Sep  1 15:36:20 2009
New Revision: 28725

URL: http://svn.erp5.org?rev=28725&view=rev
Log:
 - it is possible, that invoice comes from no order, so related_order is not None is outer condition

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=28725&r1=28724&r2=28725&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 15:36:20 2009
@@ -79,26 +79,26 @@
 related_packing_list = invoice.getDefaultCausalityValue()\n
 \n
 related_order = related_packing_list.getDefaultCausalityValue()\n
-# copy trade condition:\n
-if not context.getSpecialise():\n
-  if related_order is not None:\n
+if related_order is not None:\n
+  # copy trade condition:\n
+  if not context.getSpecialise():\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
+  \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
   invoice.setTitle(related_packing_list.getTitle())\n

Modified: erp5/trunk/bt5/erp5_invoicing/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/revision?rev=28725&r1=28724&r2=28725&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] Tue Sep  1 15:36:20 2009
@@ -1,1 +1,1 @@
-293
+294