[Erp5-report] r28794 - /erp5/trunk/products/ERP5/Document/

[nobody at svn.erp5.org]

Author: luke
Date: Thu Sep  3 17:08:03 2009
New Revision: 28794

URL: http://svn.erp5.org?rev=28794&view=rev
Log:
 - there is no need to use use category of resource to recognise if movements are put by user or by system, empty base_application suggest that movement is set by user

Modified:
    erp5/trunk/products/ERP5/Document/TradeCondition.py
    erp5/trunk/products/ERP5/Document/TradeModelLine.py

Modified: erp5/trunk/products/ERP5/Document/TradeCondition.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/TradeCondition.py?rev=28794&r1=28793&r2=28794&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/TradeCondition.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/TradeCondition.py [utf8] Thu Sep  3 17:08:03 2009
@@ -85,18 +85,13 @@
       aggregated_amount_list = self.getAggregatedAmountList(context=context,
           movement_list=movement_list, **kw)
       modified_reference_list = []
-      normal_use_list = self.getPortalObject().portal_preferences\
-              .getPreferredNormalResourceUseCategoryList()
       # check if the existing movements are in aggregated movements
       movement_to_delete_list = []
       for movement in existing_movement_list:
         keep_movement = False
         # check if the movement is a generated one or entered by the user.
         # If it has been entered by user, keep it.
-        resource = movement.getResourceValue()
-        if resource is not None and \
-            len(set(normal_use_list).intersection(set(resource\
-            .getUseList()))):
+        if not movement.getBaseApplicationList():
           keep_movement = True
           continue
         for amount in aggregated_amount_list:

Modified: erp5/trunk/products/ERP5/Document/TradeModelLine.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/TradeModelLine.py?rev=28794&r1=28793&r2=28794&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/TradeModelLine.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/TradeModelLine.py [utf8] Thu Sep  3 17:08:03 2009
@@ -116,12 +116,6 @@
     if current_aggregated_amount_list is None:
       current_aggregated_amount_list = []
 
-    normal_resource_use_category_list = self.\
-        portal_preferences.getPreferredNormalResourceUseCategoryList()
-    if normal_resource_use_category_list is None:
-      raise ValueError('preferred_normal_resource_use_category is not ' + \
-          'configured in System Preferences')
-
     # if movement_list is passed as parameter, it shall be used,
     # otherwise it is needed to look up for movements
     if len(movement_list) == 0:
@@ -137,11 +131,8 @@
           # add only movement which are input (i.e. resource use category
           # is in the normal resource use preference list). Output will
           # be recalculated
-          movement_resource = movement.getResourceValue()
-          if movement_resource is not None:
-            if movement_resource.getUse() in \
-                normal_resource_use_category_list:
-              movement_list.append(movement)
+          if not movement.getBaseApplication():
+            movement_list.append(movement)
 
     aggregated_amount_list = AggregatedAmountList()
     base_application_list = self.getBaseApplicationList()