Commit 7fd917bd authored by Jean-Paul Smets's avatar Jean-Paul Smets

conflict solved (deliverable added together with more explicit values)

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@435 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 9312c238
No related merge requests found
......@@ -180,8 +180,17 @@ An ERP5 Rule..."""
container=applied_rule,
id=new_id,
delivery_value = c,
order_value = c,
quantity = c.getQuantity(),
target_quantity = c.getTargetQuantity(),
start_date = c.getStartDate(),
stop_date = c.getStopDate(),
target_start_date = c.getTargetStartDate(),
target_stop_date = c.getTargetStopDate(),
deliverable = 1
)
# We must create both order and delivery link in this case
# since our simulation model is based on order and delivery
my_delivery.flushActivity(invoke=1) # Flush since we may need immediately getDeliveryRelatedValueList
else:
if len(delivery_line_object.getDeliveryRelatedValueList()) == 0: # Only create if orphaned movement
......@@ -191,6 +200,13 @@ An ERP5 Rule..."""
container=applied_rule,
id=new_id,
delivery_value = delivery_line_object,
order_value = delivery_line_object,
quantity = delivery_line_object.getQuantity(),
target_quantity = delivery_line_object.getTargetQuantity(),
start_date = delivery_line_object.getStartDate(),
stop_date = delivery_line_object.getStopDate(),
target_start_date = delivery_line_object.getTargetStartDate(),
target_stop_date = delivery_line_object.getTargetStopDate(),
deliverable = 1
)
# Source, Destination, Quantity, Date, etc. are
......
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