[Erp5-report] r16782 - /erp5/trunk/products/ERP5/tests/testInventoryAPI.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Oct 2 17:34:07 CEST 2007
Author: vincent
Date: Tue Oct 2 17:34:07 2007
New Revision: 16782
URL: http://svn.erp5.org?rev=16782&view=rev
Log:
Calculate which values will be in the stock table for inventories.
Add comments when creating initial movements and inventories.
Created movements must be in "delivered" state to correctly impact inventories.
Fix tests which search for individual inventory values in stock table.
Modified:
erp5/trunk/products/ERP5/tests/testInventoryAPI.py
Modified: erp5/trunk/products/ERP5/tests/testInventoryAPI.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testInventoryAPI.py?rev=16782&r1=16781&r2=16782&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testInventoryAPI.py (original)
+++ erp5/trunk/products/ERP5/tests/testInventoryAPI.py Tue Oct 2 17:34:07 2007
@@ -1497,26 +1497,47 @@
self.INVENTORY_QUANTITY_2 = INVENTORY_QUANTITY_2 = 10000
self.INVENTORY_DATE_1 = INVENTORY_DATE_1 = INVENTORY_DATE_2 - 10 # Oldest
self.INVENTORY_QUANTITY_1 = INVENTORY_QUANTITY_1 = 1000
+
+ # "actual" quantities are the quantities which will end up in the stock
+ # table.
+ self.ACTUAL_INVENTORY_QUANTITY_1 = INVENTORY_QUANTITY_1 - \
+ BASE_QUANTITY
+ self.ACTUAL_INVENTORY_QUANTITY_2 = INVENTORY_QUANTITY_2 - \
+ (self.INVENTORY_QUANTITY_1 + BASE_QUANTITY)
+ self.ACTUAL_INVENTORY_QUANTITY_3 = INVENTORY_QUANTITY_3 - \
+ (self.INVENTORY_QUANTITY_2 + BASE_QUANTITY)
+
self.movement_uid_list = movement_uid_list = []
+ # Initial movement of 1
movement = self._makeMovement(quantity=BASE_QUANTITY,
- start_date=INVENTORY_DATE_1 - 1)
+ start_date=INVENTORY_DATE_1 - 1,
+ simulation_state='delivered')
movement_uid_list.append(movement.getUid())
+ # First (partial) inventory of 1 000
partial_inventory = self._createAutomaticInventoryAtDate(
date=INVENTORY_DATE_1, override_inventory=INVENTORY_QUANTITY_1)
+ # Second movement of 1
movement = self._makeMovement(quantity=BASE_QUANTITY,
- start_date=INVENTORY_DATE_2 - 1)
+ start_date=INVENTORY_DATE_2 - 1,
+ simulation_state='delivered')
movement_uid_list.append(movement.getUid())
+ # Second (full) inventory of 10 000
self._createAutomaticInventoryAtDate(date=INVENTORY_DATE_2,
override_inventory=INVENTORY_QUANTITY_2,
full_inventory=True)
+ # Third movement of 1
movement = self._makeMovement(quantity=BASE_QUANTITY,
- start_date=INVENTORY_DATE_3 - 1)
+ start_date=INVENTORY_DATE_3 - 1,
+ simulation_state='delivered')
movement_uid_list.append(movement.getUid())
+ # Third (full) inventory of 100 000
self._createAutomaticInventoryAtDate(date=INVENTORY_DATE_3,
override_inventory=INVENTORY_QUANTITY_3,
full_inventory=True)
+ # Fourth movement of 1
movement = self._makeMovement(quantity=BASE_QUANTITY,
- start_date=INVENTORY_DATE_3 + 1)
+ start_date=INVENTORY_DATE_3 + 1,
+ simulation_state='delivered')
movement_uid_list.append(movement.getUid())
self.tic()
manage_test = self.getPortal().erp5_sql_transactionless_connection.manage_test
@@ -1654,7 +1675,8 @@
self.INVENTORY_QUANTITY_1 * 2 + self.BASE_QUANTITY * 2
would be found.
"""
- self.assertEquals(self.INVENTORY_QUANTITY_1 + self.BASE_QUANTITY * 2,
+ self.assertEquals(self.ACTUAL_INVENTORY_QUANTITY_1 + \
+ self.BASE_QUANTITY * 2,
self.getInventory(node_uid=self.node_uid,
at_date=self.INVENTORY_DATE_2 - 1))
@@ -1717,7 +1739,7 @@
'inventory': self.BASE_QUANTITY,
'node_uid': self.node_uid},
{'date': self.INVENTORY_DATE_1,
- 'inventory': self.INVENTORY_QUANTITY_1,
+ 'inventory': self.ACTUAL_INVENTORY_QUANTITY_1,
'node_uid': self.node_uid},
{'date': self.INVENTORY_DATE_2 - 1,
'inventory': self.BASE_QUANTITY,
@@ -1767,7 +1789,7 @@
'resource_uid': self.resource.getUid(),
'node_uid': self.node_uid,
'date': self.INVENTORY_DATE_3 - 1},
- {'inventory': self.INVENTORY_QUANTITY_3,
+ {'inventory': self.ACTUAL_INVENTORY_QUANTITY_3,
'resource_uid': self.resource.getUid(),
'node_uid': self.node_uid,
'date': self.INVENTORY_DATE_3},
@@ -1794,7 +1816,7 @@
'resource_uid': self.resource.getUid(),
'node_uid': self.node_uid,
'date': self.INVENTORY_DATE_3 - 1},
- {'inventory': self.INVENTORY_QUANTITY_3,
+ {'inventory': self.ACTUAL_INVENTORY_QUANTITY_3,
'resource_uid': self.resource.getUid(),
'node_uid': self.node_uid,
'date': self.INVENTORY_DATE_3},
More information about the Erp5-report
mailing list