[Erp5-report] r32112 kazuhiko - /erp5/trunk/products/ERP5/mixin/movement_generator.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Feb  1 10:35:01 2010
New Revision: 32112

URL: http://svn.erp5.org?rev=32112&view=rev
Log:
cleanup _getPropertyAndCategoryList().

Modified:
    erp5/trunk/products/ERP5/mixin/movement_generator.py

Modified: erp5/trunk/products/ERP5/mixin/movement_generator.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/mixin/movement_generator.py?rev=32112&r1=32111&r2=32112&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/mixin/movement_generator.py [utf8] (original)
+++ erp5/trunk/products/ERP5/mixin/movement_generator.py [utf8] Mon Feb  1 10:35:01 2010
@@ -96,13 +96,12 @@
     for base_category in \
         business_path.getSourceArrowBaseCategoryList() +\
         business_path.getDestinationArrowBaseCategoryList():
-      # XXX: we need to use _list for categories *always*
       category_url = business_path.getDefaultAcquiredCategoryMembership(
           base_category, context=movement)
       if category_url not in ['', None]:
-        property_dict['%s_list' % base_category] = [category_url]
+        property_dict[base_category] = [category_url]
       else:
-        property_dict['%s_list' % base_category] = []
+        property_dict[base_category] = []
     # Amount
     if business_path.getQuantity():
       property_dict['quantity'] = business_path.getQuantity()
@@ -112,7 +111,9 @@
     else:
       property_dict['quantity'] = movement.getQuantity()
 
-    if movement.getStartDate() == movement.getStopDate():
+    movement_start_date = movement.getStartDate()
+    movement_stop_date = movement.getStopDate()
+    if movement_start_date == movement_stop_date:
       property_dict['start_date'] = business_path.getExpectedStartDate(
           movement)
       property_dict['stop_date'] = business_path.getExpectedStopDate(movement)
@@ -120,13 +121,13 @@
       # XXX: as soon as BPM will be fully operational this hack will not be
       #      needed anymore
       if property_dict['start_date'] is None:
-        property_dict['start_date'] = movement.getStartDate()
+        property_dict['start_date'] = movement_start_date
       if property_dict['stop_date'] is None:
-        property_dict['stop_date'] = movement.getStopDate()
+        property_dict['stop_date'] = movement_stop_date
     else: # XXX shall not be used, but business_path.getExpectedStart/StopDate
           # do not works on second path...
-      property_dict['start_date'] = movement.getStartDate()
-      property_dict['stop_date'] = movement.getStopDate()
+      property_dict['start_date'] = movement_start_date
+      property_dict['stop_date'] = movement_stop_date
 
     # save a relation to business path
     property_dict['causality_list'] = [business_path.getRelativeUrl()]