Commit 339e6160 authored by Łukasz Nowak's avatar Łukasz Nowak

- solve method works on simulation_movements, and after refactoring of...

 - solve method works on simulation_movements, and after refactoring of calling class this class definition was plain wrong


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@30210 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 8fe3df84
...@@ -38,20 +38,20 @@ class ProfitAndLoss(CopyToTarget): ...@@ -38,20 +38,20 @@ class ProfitAndLoss(CopyToTarget):
on the parent applied rule. on the parent applied rule.
""" """
def solveMovement(self, movement, new_target=None): def solve(self, simulation_movement):
""" """
Movement difference as a profit (ie. a quantity coming from nowhere) Movement difference as a profit (ie. a quantity coming from nowhere)
Accumulate into delivered movement Accumulate into delivered movement
""" """
delivery_line = movement.getDeliveryValue() delivery_line = simulation_movement.getDeliveryValue()
delivery_line_quantity = delivery_line.getQuantity() delivery_line_quantity = delivery_line.getQuantity()
if delivery_line_quantity is not None: if delivery_line_quantity is not None:
target_quantity = delivery_line_quantity * movement.getDeliveryRatio() target_quantity = delivery_line_quantity * simulation_movement.getDeliveryRatio()
added_quantity = movement.getQuantity() - target_quantity added_quantity = simulation_movement.getQuantity() - target_quantity
movement.edit(profit_quantity=added_quantity) simulation_movement.edit(profit_quantity=added_quantity)
delivery_line.activate( delivery_line.activate(
after_path_and_method_id=( after_path_and_method_id=(
movement.getPath(), simulation_movement.getPath(),
['immediateReindexObject', 'recursiveImmediateReindexObject'] ['immediateReindexObject', 'recursiveImmediateReindexObject']
) )
).edit() ).edit()
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