Commit 0849e7ca authored by Yoshinori Okuji's avatar Yoshinori Okuji

Use getPredicateValueList instead of getVariationCategoryList,

because getVariationCategoryList is used in DeliveryLine but not
DeliveryCell.

Fix a bug in the loop to get a matched cell by inserting break
statement appropriately.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@595 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 5c404a28
...@@ -1167,33 +1167,34 @@ class SimulationTool (Folder, UniqueObject): ...@@ -1167,33 +1167,34 @@ class SimulationTool (Folder, UniqueObject):
# use a picked object as an index instead. # use a picked object as an index instead.
variant_map = {} variant_map = {}
for movement in group.movement_list: for movement in group.movement_list:
variation_category_list = movement.getVariationCategoryList() predicate_list = movement.getPredicateValueList()
variation_category_list.sort() predicate_list.sort()
pickled_variation_category_list = cPickle.dumps(variation_category_list) pickled_predicate_list = cPickle.dumps(predicate_list)
if pickled_variation_category_list in variant_map: if pickled_predicate_list in variant_map:
variant_map[pickled_variation_category_list].append(movement) variant_map[pickled_predicate_list].append(movement)
else: else:
variant_map[pickled_variation_category_list] = [movement] variant_map[pickled_predicate_list] = [movement]
for pickled_variation_category_list,movement_list in variant_map.items(): for pickled_predicate_list,movement_list in variant_map.items():
variation_category_list = cPickle.loads(pickled_variation_category_list) predicate_list = cPickle.loads(pickled_predicate_list)
object_to_update = None object_to_update = None
if len(variation_category_list) == 0: if len(predicate_list) == 0:
object_to_update = delivery_line object_to_update = delivery_line
else: else:
identical = 0 identical = 0
for delivery_cell in delivery_line.contentValues(): for delivery_cell in delivery_line.contentValues():
if len(delivery_cell.getVariationCategoryList()) == len(variation_category_list): if len(delivery_cell.getPredicateValueList()) == len(predicate_list):
for category in delivery_cell.getVariationCategoryList(): for category in delivery_cell.getPredicateValueList():
if category not in variation_category_list: if category not in predicate_list:
break break
else: else:
identical = 1 identical = 1
break
if identical: if identical:
object_to_update = delivery_cell object_to_update = delivery_cell
LOG("mergeDeliveryList", 0, "variation_category_list = %s, movement_list = %s, object_to_update = %s" % (repr(variation_category_list), repr(movement_list), repr(object_to_update))) LOG("mergeDeliveryList", 0, "predicate_list = %s, movement_list = %s, object_to_update = %s" % (repr(predicate_list), repr(movement_list), repr(object_to_update)))
if object_to_update is not None: if object_to_update is not None:
cell_quantity = object_to_update.getQuantity() cell_quantity = object_to_update.getQuantity()
cell_target_quantity = object_to_update.getNetConvertedTargetQuantity() cell_target_quantity = object_to_update.getNetConvertedTargetQuantity()
...@@ -1215,10 +1216,16 @@ class SimulationTool (Folder, UniqueObject): ...@@ -1215,10 +1216,16 @@ class SimulationTool (Folder, UniqueObject):
LOG("mergeDeliveryList", 0, "movement = %s, cell_target_quantity = %s, cell_quantity = %s, cell_total_price = %s, cell_category_list = %s" % (repr(movement), repr(cell_target_quantity), repr(cell_quantity), repr(cell_total_price), repr(cell_category_list))) LOG("mergeDeliveryList", 0, "movement = %s, cell_target_quantity = %s, cell_quantity = %s, cell_total_price = %s, cell_category_list = %s" % (repr(movement), repr(cell_target_quantity), repr(cell_quantity), repr(cell_total_price), repr(cell_category_list)))
# Make sure that simulation movements point to an appropriate delivery line or # Make sure that simulation movements point to an appropriate delivery line or
# delivery cell. # delivery cell.
if hasattr(movement, 'getDeliveryRelatedValueList'):
for simulation_movement in \ for simulation_movement in \
movement.getDeliveryRelatedValueList(portal_type = 'Simulation Movement'): movement.getDeliveryRelatedValueList(portal_type = 'Simulation Movement'):
simulation_movement.setDeliveryValue(object_to_update) simulation_movement.setDeliveryValue(object_to_update)
#simulation_movement.reindexObject() #simulation_movement.reindexObject()
if hasattr(movement, 'getOrderRelatedValueList'):
for simulation_movement in \
movement.getOrderRelatedValueList(portal_type = 'Simulation Movement'):
simulation_movement.setOrderValue(object_to_update)
#simulation_movement.reindexObject()
if cell_target_quantity != 0 and cell_total_price is not None: if cell_target_quantity != 0 and cell_total_price is not None:
average_price = cell_total_price / cell_target_quantity average_price = cell_total_price / cell_target_quantity
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment