[Erp5-report] r24403 - /erp5/trunk/products/ERP5/Document/InvoicingRule.py

[nobody at svn.erp5.org]

Author: mame
Date: Wed Oct 29 18:09:22 2008
New Revision: 24403

URL: http://svn.erp5.org?rev=24403&view=rev
Log:
file modified so that categories delivery_mode and incoterm can be copied on invoice

Modified:
    erp5/trunk/products/ERP5/Document/InvoicingRule.py

Modified: erp5/trunk/products/ERP5/Document/InvoicingRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/InvoicingRule.py?rev=24403&r1=24402&r2=24403&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/InvoicingRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/InvoicingRule.py [utf8] Wed Oct 29 18:09:22 2008
@@ -107,6 +107,8 @@
         'resource': context_movement.getResource(),
         'variation_category_list': context_movement.getVariationCategoryList(),
         'variation_property_dict': context_movement.getVariationPropertyDict(),
+	'delivery_mode':context_movement.getDeliveryMode(),
+	'incoterm':context_movement.getIncoterm(),
         'base_contribution_list': context_movement.getBaseContributionList(),
         'aggregate_list': context_movement.getAggregateList(),
         'quantity': context_movement.getCorrectedQuantity(),
@@ -135,7 +137,10 @@
       if not parent_movement.isFrozen():
         add_list, modify_dict, \
           delete_list = self._getCompensatedMovementList(applied_rule, **kw)
-
+	LOG("KW",0,kw)
+        LOG("Add List",0,add_list)
+	LOG("Delete List",0,delete_list)
+	LOG("Modify Dict",0,modify_dict)
         for movement_id in delete_list:
           applied_rule._delObject(movement_id)
       
@@ -150,6 +155,8 @@
           else:
             new_mvmt = applied_rule.newContent(portal_type=self.movement_type)
           new_mvmt.edit(**movement_dict)
+	  LOG("Movement Dict",0,movement_dict)
+	 
 
     # Pass to base class
     Rule.expand(self, applied_rule, force=force, **kw)