[Erp5-report] r33487 tatuya - in /erp5/trunk/bt5/erp5_invoicing: SkinTemplateItem/portal_sk...

[nobody at svn.erp5.org]

Author: tatuya
Date: Mon Mar  8 08:02:45 2010
New Revision: 33487

URL: http://svn.erp5.org?rev=33487&view=rev
Log:
2010-03-08 tatuya
* Prevent to copy multiple payment conditions at the Delivery After Generation Script of Invoice Transaction. If the payment conditions are multiple, payment transaction builder manage to create too many payment transaction lines.

Modified:
    erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.xml
    erp5/trunk/bt5/erp5_invoicing/bt/change_log
    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=33487&r1=33486&r2=33487&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] Mon Mar  8 08:02:45 2010
@@ -83,17 +83,19 @@
 \n
 # copy payment conditions from packing list\n
 # if missing, try to copy from order (for compatibility)\n
-payment_condition_copy_id_list = related_packing_list.contentIds(filter={\'portal_type\':\'Payment Condition\'})\n
-if len(payment_condition_copy_id_list) > 0:\n
-  clipboard = related_packing_list.manage_copyObjects(\n
-    ids=payment_condition_copy_id_list)\n
-  invoice.manage_pasteObjects(clipboard)\n
-elif related_order is not None:\n
-  payment_condition_copy_id_list = related_order.contentIds(filter={\'portal_type\':\'Payment Condition\'})\n
+if not invoice.contentValues(portal_type=\'Payment Condition\'):\n
+  payment_condition_copy_id_list = []\n
+  if related_packing_list is not None:\n
+    payment_condition_copy_id_list = related_packing_list.contentIds(filter={\'portal_type\':\'Payment Condition\'})\n
   if len(payment_condition_copy_id_list) > 0:\n
-    clipboard = related_order.manage_copyObjects(\n
-      ids=payment_condition_copy_id_list)\n
+    clipboard = related_packing_list.manage_copyObjects(ids=payment_condition_copy_id_list)\n
     invoice.manage_pasteObjects(clipboard)\n
+  elif related_order is not None:\n
+    payment_condition_copy_id_list = related_order.contentIds(\n
+      filter={\'portal_type\':\'Payment Condition\'})\n
+    if len(payment_condition_copy_id_list) > 0:\n
+      clipboard = related_order.manage_copyObjects(ids=payment_condition_copy_id_list)\n
+      invoice.manage_pasteObjects(clipboard)\n
 \n
 if related_order is not None:\n
   # copy trade condition:\n

Modified: erp5/trunk/bt5/erp5_invoicing/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/change_log?rev=33487&r1=33486&r2=33487&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/change_log [utf8] Mon Mar  8 08:02:45 2010
@@ -1,3 +1,6 @@
+2010-03-08 tatuya
+* Prevent to copy multiple payment conditions at the Delivery After Generation Script of Invoice Transaction. If the payment conditions are multiple, payment transaction builder manage to create too many payment transaction lines.
+
 2010-03-02 yusei
 * Remove short title.
 * Fix allowed content type setting.

Modified: erp5/trunk/bt5/erp5_invoicing/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/revision?rev=33487&r1=33486&r2=33487&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] Mon Mar  8 08:02:45 2010
@@ -1,1 +1,1 @@
-347
+350