diff options
| author | Martin Trigaux <mat@openerp.com> | 2014-08-04 11:42:40 +0200 |
|---|---|---|
| committer | Martin Trigaux <mat@openerp.com> | 2014-08-04 14:43:28 +0200 |
| commit | 4152e99bbdd56f45b24fe71af6e4f58dd33358fb (patch) | |
| tree | d26c28264ac4ab9b7f4496f605e43bb8261deb9e | |
| parent | 6231427f0a14c2ac25836318ee32e17b5b5a8d59 (diff) | |
[FIX] mrp: duplicated find bom buttons
The product_id field is not required on a mrp.bom (while product_tmpl_id is). When searching for BOMs linked to a product.product, we should display the one specific to this product and the ones linked to the template (but not linked to another variant).
| -rw-r--r-- | addons/mrp/mrp_view.xml | 22 | ||||
| -rw-r--r-- | addons/mrp/product.py | 10 |
2 files changed, 13 insertions, 19 deletions
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 73b139605e0..1eb470e8488 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -1055,20 +1055,6 @@ groups="mrp.group_mrp_user" attrs="{'invisible':[('type', '=', 'service')]}" icon="fa-flask"> <field string="Bill of Materials" name="bom_count" widget="statinfo" /> </button> - </div> - </field> - </record> - - <record model="ir.ui.view" id="product_product_form_view_bom_button"> - <field name="name">product.product.procurement</field> - <field name="model">product.product</field> - <field name="inherit_id" ref="product.product_normal_form_view"/> - <field name="arch" type="xml"> - <div name="buttons" position="inside"> - <button class="oe_inline oe_stat_button" name="%(product_open_bom)d" type="action" - groups="mrp.group_mrp_user" attrs="{'invisible':[('type', '=', 'service')]}" icon="fa-flask"> - <field string="Bill of Materials" name="bom_count" widget="statinfo" /> - </button> <button class="oe_inline oe_stat_button" name="action_view_mos" type="object" groups="mrp.group_mrp_user" attrs="{'invisible':[('type', '=', 'service')]}" icon="fa-list-alt"> <field string="Manufacturing" name="mo_count" widget="statinfo" /> @@ -1076,9 +1062,9 @@ </div> </field> </record> - - <record model="ir.ui.view" id="product_normal_form_view_bom_button"> - <field name="name">product.product.mrp.button</field> + + <record model="ir.ui.view" id="product_product_form_view_bom_button"> + <field name="name">product.product.procurement</field> <field name="model">product.product</field> <field name="inherit_id" ref="product.product_normal_form_view"/> <field name="arch" type="xml"> @@ -1094,7 +1080,7 @@ </div> </field> </record> - + <record id="view_warehouse_inherited" model="ir.ui.view"> <field name="name">Stock Warehouse Inherited</field> <field name="model">stock.warehouse</field> diff --git a/addons/mrp/product.py b/addons/mrp/product.py index e767687512e..19c21098736 100644 --- a/addons/mrp/product.py +++ b/addons/mrp/product.py @@ -81,8 +81,16 @@ class product_product(osv.osv): for product in self.browse(cr, uid, ids, context=context): products.add(product.product_tmpl_id.id) result = tmpl_obj._get_act_window_dict(cr, uid, 'mrp.product_open_bom', context=context) + # bom specific to this variant or global to template + domain = [ + '|', + ('product_id', 'in', ids), + '&', + ('product_id', '=', False), + ('product_tmpl_id', 'in', list(products)), + ] result['context'] = "{}" - result['domain'] = "[('product_tmpl_id','in',[" + ','.join(map(str, list(products))) + "])]" + result['domain'] = str(domain) return result # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |