[Erp5-report] r28722 - /erp5/trunk/products/ERP5/Document/Rule.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Sep 1 15:01:17 CEST 2009
Author: luke
Date: Tue Sep 1 15:01:17 2009
New Revision: 28722
URL: http://svn.erp5.org?rev=28722&view=rev
Log:
- remove obsoleted commented code
Modified:
erp5/trunk/products/ERP5/Document/Rule.py
Modified: erp5/trunk/products/ERP5/Document/Rule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Rule.py?rev=28722&r1=28721&r2=28722&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Rule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Rule.py [utf8] Tue Sep 1 15:01:17 2009
@@ -368,7 +368,7 @@
# 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 @@
+ 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 @@
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 @@
# 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,
More information about the Erp5-report
mailing list