Commit 24b091d3 authored by Aurel's avatar Aurel

do not group by payment_uid as we don't make distinction on it

remove all previous stock quantity if we define sub variation in new inventory


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16270 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 01ed2856
...@@ -109,7 +109,6 @@ class Inventory(Delivery): ...@@ -109,7 +109,6 @@ class Inventory(Delivery):
, group_by_sub_variation = 1 , group_by_sub_variation = 1
, group_by_variation = 1 , group_by_variation = 1
, group_by_resource = 1 , group_by_resource = 1
, group_by_payment = 1
, connection_id = connection_id , connection_id = connection_id
) )
current_inventory_dict = {} current_inventory_dict = {}
...@@ -183,7 +182,6 @@ class Inventory(Delivery): ...@@ -183,7 +182,6 @@ class Inventory(Delivery):
for resource_and_variation_key in not_used_inventory_dict.keys(): for resource_and_variation_key in not_used_inventory_dict.keys():
inventory_by_subvariation_dict = not_used_inventory_dict[resource_and_variation_key] inventory_by_subvariation_dict = not_used_inventory_dict[resource_and_variation_key]
for sub_variation_text in inventory_by_subvariation_dict.keys(): for sub_variation_text in inventory_by_subvariation_dict.keys():
if sub_variation_text not in (None, ""): # XXX maybe also need to removed those one
category_list = self.getCategoryList() category_list = self.getCategoryList()
quantity = inventory_by_subvariation_dict[sub_variation_text] quantity = inventory_by_subvariation_dict[sub_variation_text]
resource_path, variation_text = resource_and_variation_key resource_path, variation_text = resource_and_variation_key
......
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