Commit fd3b3c09 authored by Łukasz Nowak's avatar Łukasz Nowak

- remove obsoleted commented code


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28722 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent e7e2384e
...@@ -368,7 +368,7 @@ class Rule(Predicate, XMLObject): ...@@ -368,7 +368,7 @@ class Rule(Predicate, XMLObject):
# Check the quantity # Check the quantity
m_quantity = 0.0 m_quantity = 0.0
for movement in p_matched_list: for movement in p_matched_list:
m_quantity += movement.getQuantity()#getCorrectedQuantity() m_quantity += movement.getQuantity()
if m_quantity != prevision.get('quantity'): if m_quantity != prevision.get('quantity'):
# special case - quantity # special case - quantity
if movement.isPropertyForced('quantity'): if movement.isPropertyForced('quantity'):
...@@ -385,7 +385,6 @@ class Rule(Predicate, XMLObject): ...@@ -385,7 +385,6 @@ class Rule(Predicate, XMLObject):
+ deletable_movement_list): + deletable_movement_list):
# mark as requiring modification # mark as requiring modification
prop_dict = modify_dict.setdefault(movement.getId(), {}) prop_dict = modify_dict.setdefault(movement.getId(), {})
#prop_dict['quantity'] = movement.getCorrectedQuantity() + \
prop_dict['quantity'] = movement.getQuantity() + \ prop_dict['quantity'] = movement.getQuantity() + \
q_diff q_diff
break break
...@@ -399,7 +398,6 @@ class Rule(Predicate, XMLObject): ...@@ -399,7 +398,6 @@ class Rule(Predicate, XMLObject):
prop_dict = modify_dict.setdefault(movement.getId(), {}) prop_dict = modify_dict.setdefault(movement.getId(), {})
for k, v in prevision.items(): for k, v in prevision.items():
if k not in ('quantity',) and v != movement.getProperty(k): if k not in ('quantity',) and v != movement.getProperty(k):
# TODO: acceptance range
if movement.isPropertyForced(k): if movement.isPropertyForced(k):
# support compensation if not prevent_compensation # support compensation if not prevent_compensation
LOG('%s:%s' % (self.getRelativeUrl(), movement.getRelativeUrl()), WARNING, LOG('%s:%s' % (self.getRelativeUrl(), movement.getRelativeUrl()), WARNING,
...@@ -430,6 +428,7 @@ class Rule(Predicate, XMLObject): ...@@ -430,6 +428,7 @@ class Rule(Predicate, XMLObject):
# with negative quantity # with negative quantity
raise NotImplementedError("Tried to delete immutable movement %s" % \ raise NotImplementedError("Tried to delete immutable movement %s" % \
movement.getRelativeUrl()) movement.getRelativeUrl())
return (add_list, modify_dict, delete_list) return (add_list, modify_dict, delete_list)
def _getCompensatedMovementList(self, applied_rule, def _getCompensatedMovementList(self, applied_rule,
......
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