Commit 54ef255d authored by Titouan Soulard's avatar Titouan Soulard

erp5_trade: fix tests

It is now needed to precompute inventories. Workflow has a new transition.
parent 31489a8e
......@@ -204,9 +204,12 @@ class TestInventory(TestOrderMixin, ERP5TypeTestCase):
inventory_line.edit(resource_value = resource,
aggregate_value_list = aggregate_value_list)
# Now, quantity is not defined any more automatically.
inventory_line.edit(quantity=sum([x.getQuantity() for x in \
inventory_line.edit(inventory=sum([x.getQuantity() for x in \
aggregate_value_list]))
inventory.Inventory_computeOffsetAction()
self.tic()
inventory.deliver()
self.tic()
inventory_list.append(inventory)
sequence.edit(inventory_list = inventory_list)
......@@ -240,7 +243,10 @@ class TestInventory(TestOrderMixin, ERP5TypeTestCase):
inventory_line.edit(resource_value = sequence.get('resource'),
inventory = 24.
)
inventory.Inventory_computeOffsetAction()
self.tic()
inventory.deliver()
self.tic()
inventory_list.append(inventory)
sequence.edit(inventory_list=inventory_list)
......@@ -255,7 +261,10 @@ class TestInventory(TestOrderMixin, ERP5TypeTestCase):
portal_type = self.inventory_line_portal_type,
resource_value = sequence.get("second_resource"),
inventory = 101)
inventory.Inventory_computeOffsetAction()
self.tic()
inventory.deliver()
self.tic()
inventory_list.append(inventory)
sequence.edit(inventory_list=inventory_list)
......@@ -270,7 +279,10 @@ class TestInventory(TestOrderMixin, ERP5TypeTestCase):
portal_type = self.inventory_line_portal_type,
resource_value = sequence.get("second_resource"),
inventory = 101)
inventory.Inventory_computeOffsetAction()
self.tic()
inventory.deliver()
self.tic()
inventory_list.append(inventory)
sequence.edit(inventory_list=inventory_list)
......@@ -314,17 +326,18 @@ class TestInventory(TestOrderMixin, ERP5TypeTestCase):
variation_category_list=category_list
)
cell = inventory_line.newCell(base_id='movement',*category_list)
quantity=5
cell.edit(
quantity = quantity,
inventory = 5,
predicate_category_list = category_list,
variation_category_list = category_list,
mapped_value_property_list = ['quantity'],
)
# When checking the not full inventory function, quantity must remain the same if
# no inventory line defined for a variation
inventory.Inventory_computeOffsetAction()
self.tic()
inventory.deliver()
self.tic()
def stepCreateFullVariatedInventory(self, sequence=None, sequence_list=None, **kw):
"""
......@@ -347,7 +360,10 @@ class TestInventory(TestOrderMixin, ERP5TypeTestCase):
portal_type = self.inventory_line_portal_type,
resource_value = sequence.get("second_resource"),
inventory = 101)
inventory.Inventory_computeOffsetAction()
self.tic()
inventory.deliver()
self.tic()
def stepCreatePackingListForModule(self, sequence=None,
sequence_list=None, **kw):
......@@ -1892,7 +1908,7 @@ class TestInventory(TestOrderMixin, ERP5TypeTestCase):
aggregate_value_list = [item_list[0],item_list[1], item_list[4]]
inventory_line.edit(
aggregate_value_list=aggregate_value_list,
quantity=sum([x.getQuantity() for x in aggregate_value_list]))
inventory=sum([x.getQuantity() for x in aggregate_value_list]))
def stepCreateNotVariatedSecondResource(self,sequence=None,
......@@ -2072,7 +2088,10 @@ class TestInventory(TestOrderMixin, ERP5TypeTestCase):
portal_type = self.inventory_line_portal_type,
resource_value = resource_value,
inventory = 100)
inventory.Inventory_computeOffsetAction()
self.tic()
inventory.deliver()
self.tic()
inventory_list.append(inventory)
sequence.edit(inventory_list=inventory_list)
......@@ -2276,7 +2295,10 @@ class TestInventory(TestOrderMixin, ERP5TypeTestCase):
portal_type=self.inventory_line_portal_type,
resource_value=resource_value,
inventory=inventory_quantity)
inventory.Inventory_computeOffsetAction()
self.tic()
inventory.deliver()
self.tic()
inventory_list.append(inventory)
sequence.edit(inventory_list=inventory_list)
......@@ -2395,7 +2417,10 @@ class TestInventory(TestOrderMixin, ERP5TypeTestCase):
portal_type = self.inventory_line_portal_type,
resource_value = sequence.get("second_resource"),
inventory = 100)
inventory.Inventory_computeOffsetAction()
self.tic()
inventory.deliver()
self.tic()
inventory_list.append(inventory)
sequence.edit(inventory_list=inventory_list)
......@@ -2428,7 +2453,10 @@ class TestInventory(TestOrderMixin, ERP5TypeTestCase):
portal_type = self.inventory_line_portal_type,
resource_value = sequence.get("second_resource"),
inventory = inventory2)
inventory.Inventory_computeOffsetAction()
self.tic()
inventory.deliver()
self.tic()
inventory_list.append(inventory)
sequence.edit(inventory_list=inventory_list)
......@@ -2736,6 +2764,8 @@ class TestInventory(TestOrderMixin, ERP5TypeTestCase):
resource_uid=product.getUid()),
0)
inventory.Inventory_computeOffsetAction()
self.tic()
inventory.deliver()
self.tic()
......@@ -3274,7 +3304,7 @@ class TestInventory(TestOrderMixin, ERP5TypeTestCase):
for resource_value in resource_value_list:
full_inventory_1.newContent(portal_type='Inventory Line',
resource_value=resource_value,
quantity=123)
inventory=123)
full_inventory_1.deliver()
self.commit()
......@@ -3298,7 +3328,7 @@ class TestInventory(TestOrderMixin, ERP5TypeTestCase):
full_inventory=True)
full_inventory_2.newContent(portal_type='Inventory Line',
resource_value=resource_value_list[0],
quantity=1)
inventory=1)
full_inventory_2.deliver()
self.commit()
......
......@@ -506,6 +506,8 @@ class TestOrderBuilder(TestOrderBuilderMixin, ERP5TypeTestCase):
start_date=DateTime('2018/01/12'),
destination_value=node_1,
full_inventory=1)
inventory.Inventory_computeOffsetAction()
self.tic()
inventory.deliver()
self.tic()
# keep in stock only movements coming from inventory. It is intentional to
......
......@@ -262,7 +262,10 @@ class TestTradeReports(ERP5ReportTestCase):
inventory=quantity)
if simulation_state == 'delivered':
inventory.Inventory_computeOffsetAction()
self.tic()
inventory.deliver()
self.tic()
# sanity check
self.assertEqual(simulation_state, inventory.getSimulationState())
......
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