From 17dc3e7302090af66edcd847db35e1b22a2d5804 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Mon, 12 Oct 2009 23:43:17 +0200
Subject: [PATCH] Remove products and categories in create inventory for
 issue1228 product_ids has been removed from complete_lines

---
 inventory.py  | 20 +-------------------
 inventory.xml | 14 --------------
 2 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/inventory.py b/inventory.py
index 6b2f03f0a2..1b46f29a0e 100644
--- a/inventory.py
+++ b/inventory.py
@@ -16,10 +16,6 @@ class CreateInventoriesInit(ModelView):
     company = fields.Many2One('company.company', 'Company', required=True)
     locations = fields.Many2Many('stock.location', None, None,
             'Locations', required=True, domain=[('type', '=', 'storage')])
-    products = fields.Many2Many('product.product', None, None,
-            'Products', domain=[('type', '=', 'stockable')])
-    categories = fields.Many2Many('product.category', None, None,
-            'Categories')
 
     def default_lost_found(self, cursor, user, context=None):
         location_obj = self.pool.get('stock.location')
@@ -62,25 +58,11 @@ class CreateInventories(Wizard):
 
     def _action_create_inventory(self, cursor, user, data, context=None):
         inventory_obj = self.pool.get('stock.inventory')
-        category_obj = self.pool.get('product.category')
-        product_obj = self.pool.get('product.product')
         model_data_obj = self.pool.get('ir.model.data')
         act_window_obj = self.pool.get('ir.action.act_window')
 
         inventory_ids = []
         location_ids = data['form']['locations'][0][1] or []
-        product_ids = data['form']['products'][0][1] or []
-        category_ids = data['form']['categories'][0][1] or []
-
-        if category_ids:
-            child_category_ids = category_obj.search(cursor, user,
-                    [('parent', 'child_of', category_ids)], context=context)
-            cat_product_ids = product_obj.search(cursor, user, [
-                ('category', 'in', child_category_ids),
-                ('type', '=', 'stockable'),
-                ], context=context)
-            if cat_product_ids:
-                product_ids += cat_product_ids
 
         for location_id in location_ids:
             inventory_ids.append(inventory_obj.create(cursor, user, {
@@ -91,7 +73,7 @@ class CreateInventories(Wizard):
                 }, context=context))
 
         inventory_obj.complete_lines(cursor, user, inventory_ids,
-            product_ids=product_ids, context=context)
+                context=context)
 
         model_data_ids = model_data_obj.search(cursor, user, [
             ('fs_id', '=', 'act_inventory_form'),
diff --git a/inventory.xml b/inventory.xml
index a65bb009b1..7d35e97614 100644
--- a/inventory.xml
+++ b/inventory.xml
@@ -30,20 +30,6 @@ this repository contains the full copyright notices and license terms. -->
                             <field name="code" select="1"/>
                         </tree>
                     </field>
-                    <separator name="categories" colspan="2"/>
-                    <separator name="products" colspan="2"/>
-                    <field name="categories" colspan="2">
-                        <tree string="Categories" fill="1">
-                            <field name="rec_name"/>
-                            <field name="name" select="1" tree_invisible="1"/>
-                        </tree>
-                    </field>
-                    <field name="products" colspan="2">
-                        <tree string="Products" fill="1">
-                            <field name="name" select="1"/>
-                            <field name="code" select="1"/>
-                        </tree>
-                    </field>
                 </form>
                 ]]>
             </field>