From 12413d0918dc9f1a9e5fe447f62bbc347f3651b2 Mon Sep 17 00:00:00 2001
From: Alexandre Boeglin <alex@nexedi.com>
Date: Wed, 22 Aug 2007 17:08:19 +0000
Subject: [PATCH] dates should be modified based on the delta, not just copied
to other packing lists
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@15792 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../TargetSolver/ResourceBackpropagation.py | 24 ++++++++++---------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/product/ERP5/TargetSolver/ResourceBackpropagation.py b/product/ERP5/TargetSolver/ResourceBackpropagation.py
index 1713a0b3d2..43efdcdc98 100755
--- a/product/ERP5/TargetSolver/ResourceBackpropagation.py
+++ b/product/ERP5/TargetSolver/ResourceBackpropagation.py
@@ -36,8 +36,8 @@ class ResourceBackpropagation(CopyToTarget):
"""
def _generateValueDeltaDict(self, simulation_movement):
"""
- Get interesting values
- XXX: better description is possible. But is it needed ?
+ Get interesting values
+ XXX: better description is possible. But is it needed ?
"""
# Get interesting value
old_quantity = simulation_movement.getQuantity()
@@ -51,16 +51,16 @@ class ResourceBackpropagation(CopyToTarget):
quantity_ratio = 0
if old_quantity not in (None,0.0): # XXX: What if quantity happens to be an integer ?
quantity_ratio = new_quantity / old_quantity
- start_date = None
- stop_date = None
+ start_date_delta = 0
+ stop_date_delta = 0
if new_start_date is not None and old_start_date is not None:
- start_date = new_start_date
+ start_date_delta = new_start_date - old_start_date
if new_stop_date is not None and old_stop_date is not None:
- stop_date = new_stop_date
+ stop_date_delta = new_stop_date - old_stop_date
return {
'quantity_ratio': quantity_ratio,
- 'start_date': start_date,
- 'stop_date': stop_date,
+ 'start_date_delta': start_date_delta,
+ 'stop_date_delta': stop_date_delta,
'resource_list' :
simulation_movement.getDeliveryValue().getResourceList(),
'variation_category_list':
@@ -70,7 +70,7 @@ class ResourceBackpropagation(CopyToTarget):
}
def _generateValueDict(self, simulation_movement, quantity_ratio=1,
- start_date=None, stop_date=None,
+ start_date_delta=0, stop_date_delta=0,
resource_list=[],
variation_category_list=[],
variation_property_dict={},
@@ -80,10 +80,12 @@ class ResourceBackpropagation(CopyToTarget):
"""
value_dict = {}
# Modify quantity, start_date, stop_date
+ start_date = simulation_movement.getStartDate()
if start_date is not None:
- value_dict['start_date'] = start_date
+ value_dict['start_date'] = start_date + start_date_delta
+ stop_date = simulation_movement.getStopDate()
if stop_date is not None:
- value_dict['stop_date'] = stop_date
+ value_dict['stop_date'] = stop_date + stop_date_delta
value_dict['quantity'] = simulation_movement.getQuantity() * quantity_ratio
if resource_list:
value_dict['resource_list'] = resource_list
--
2.30.9