From fd3b3c09809694ebc412c807eb592f7e54437b32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Tue, 1 Sep 2009 13:01:17 +0000 Subject: [PATCH] - remove obsoleted commented code git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28722 20353a03-c40f-0410-a6d1-a30d3c3de9de --- product/ERP5/Document/Rule.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/product/ERP5/Document/Rule.py b/product/ERP5/Document/Rule.py index 21ed5c8e6e..a1b170696d 100644 --- a/product/ERP5/Document/Rule.py +++ b/product/ERP5/Document/Rule.py @@ -368,7 +368,7 @@ class Rule(Predicate, XMLObject): # Check the quantity m_quantity = 0.0 for movement in p_matched_list: - m_quantity += movement.getQuantity()#getCorrectedQuantity() + m_quantity += movement.getQuantity() if m_quantity != prevision.get('quantity'): # special case - quantity if movement.isPropertyForced('quantity'): @@ -385,7 +385,6 @@ class Rule(Predicate, XMLObject): + deletable_movement_list): # mark as requiring modification prop_dict = modify_dict.setdefault(movement.getId(), {}) - #prop_dict['quantity'] = movement.getCorrectedQuantity() + \ prop_dict['quantity'] = movement.getQuantity() + \ q_diff break @@ -399,7 +398,6 @@ class Rule(Predicate, XMLObject): prop_dict = modify_dict.setdefault(movement.getId(), {}) for k, v in prevision.items(): if k not in ('quantity',) and v != movement.getProperty(k): - # TODO: acceptance range if movement.isPropertyForced(k): # support compensation if not prevent_compensation LOG('%s:%s' % (self.getRelativeUrl(), movement.getRelativeUrl()), WARNING, @@ -430,6 +428,7 @@ class Rule(Predicate, XMLObject): # with negative quantity raise NotImplementedError("Tried to delete immutable movement %s" % \ movement.getRelativeUrl()) + return (add_list, modify_dict, delete_list) def _getCompensatedMovementList(self, applied_rule, -- 2.30.9