From f78e5b1b1bcb59f1397ee3b1c163fe59811f08d2 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Tue, 16 Oct 2012 18:07:41 +0530
Subject: [PATCH] [IMP]mrp : improve string and remove name field from mrp.bom
 object

bzr revid: mma@tinyerp.com-20121016123741-g042zhrmmyfqb0sa
---
 addons/mrp/mrp.py                             | 21 ++++++++--
 addons/mrp/mrp_demo.xml                       | 41 -------------------
 addons/mrp/mrp_view.xml                       | 12 ++----
 .../wizard/stock_fill_inventory_view.xml      |  2 +-
 4 files changed, 22 insertions(+), 54 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 3ae27bf2c41..ca100da6200 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -134,6 +134,20 @@ class mrp_bom(osv.osv):
     _description = 'Bill of Material'
     _inherit = ['mail.thread']
 
+    def name_get(self, cr, uid, ids, context=None):
+        if isinstance(ids, (list, tuple)) and not ids:
+            return []
+        if isinstance(ids, (long, int)):
+            ids = [ids]
+        reads = self.read(cr, uid, ids, ['code','product_id'], context=context)
+        res = []
+        for record in reads:
+            name = self.pool.get('product.product').browse(cr, uid, record['product_id'][0], context=context).name
+            if record['code']: 
+                name = name +' - '+ record['code']
+            res.append((record['id'], name))
+        return res
+
     def _child_compute(self, cr, uid, ids, name, arg, context=None):
         """ Gets child bom.
         @param self: The object pointer
@@ -192,7 +206,6 @@ class mrp_bom(osv.osv):
         return res
 
     _columns = {
-        'name': fields.char('Name', size=64, required=True),
         'code': fields.char('Reference', size=16),
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the bills of material without removing it."),
         'type': fields.selection([('normal','Normal BoM'),('phantom','Sets / Phantom')], 'BoM Type', required=True,
@@ -263,7 +276,7 @@ class mrp_bom(osv.osv):
         (_check_product, 'BoM line product should not be same as BoM product.', ['product_id']),
     ]
 
-    def onchange_product_id(self, cr, uid, ids, product_id, name, context=None):
+    def onchange_product_id(self, cr, uid, ids, product_id, context=None):
         """ Changes UoM and name if product_id changes.
         @param name: Name of the field
         @param product_id: Changed product_id
@@ -271,7 +284,7 @@ class mrp_bom(osv.osv):
         """
         if product_id:
             prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
-            return {'value': {'name': prod.name, 'product_uom': prod.uom_id.id}}
+            return {'value': {'product_uom': prod.uom_id.id}}
         return {}
 
     def onchange_uom(self, cr, uid, ids, product_id, product_uom, context=None):
@@ -371,7 +384,7 @@ class mrp_bom(osv.osv):
         if default is None:
             default = {}
         bom_data = self.read(cr, uid, id, [], context=context)
-        default.update(name=_("%s (copy)") % (bom_data['name']), bom_id=False)
+        default.update(bom_id=False)
         return super(mrp_bom, self).copy_data(cr, uid, id, default, context=context)
 
     def create(self, cr, uid, vals, context=None):
diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml
index 952a5e0e3de..f13d2517460 100644
--- a/addons/mrp/mrp_demo.xml
+++ b/addons/mrp/mrp_demo.xml
@@ -244,7 +244,6 @@
 
 
         <record id="mrp_bom_1" model="mrp.bom">
-            <field name="name">HDD 500GB</field>
             <field name="product_id" ref="product.product_product_18"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -254,7 +253,6 @@
         </record>
 
         <record id="mrp_bom_2" model="mrp.bom">
-            <field name="name">320GB HDD</field>
             <field name="product_id" ref="product.product_product_17"/>
             <field name="product_qty">2</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -264,7 +262,6 @@
         </record>
 
         <record id="mrp_bom_3" model="mrp.bom">
-            <field name="name">HDD 2TB on Demand</field>
             <field name="product_id" ref="product.product_product_19"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -274,7 +271,6 @@
         </record>
 
         <record id="mrp_bom_4" model="mrp.bom">
-            <field name="name">HDD 500GB</field>
             <field name="product_id" ref="product.product_product_18"/>
             <field name="product_qty">4</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -284,7 +280,6 @@
         </record>
 
         <record id="mrp_bom_5" model="mrp.bom">
-            <field name="name">HDD on Demand</field>
             <field name="product_id" ref="product.product_product_19"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -293,7 +288,6 @@
         </record>
 
         <record id="mrp_bom_6" model="mrp.bom">
-            <field name="name">320GB HDD</field>
             <field name="product_id" ref="product.product_product_17"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -303,7 +297,6 @@
         </record>
 
         <record id="mrp_bom_7" model="mrp.bom">
-            <field name="name">Laptop Customized</field>
             <field name="product_id" ref="product.product_product_27"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -313,7 +306,6 @@
         </record>
 
         <record id="mrp_bom_8" model="mrp.bom">
-            <field name="name">Windows 7 Professional</field>
             <field name="product_id" ref="product.product_product_40"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -323,7 +315,6 @@
         </record>
 
         <record id="mrp_bom_9" model="mrp.bom">
-            <field name="name">USB Keyboard, QWERTY</field>
             <field name="product_id" ref="product.product_product_8"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -333,7 +324,6 @@
         </record>
 
         <record id="mrp_bom_10" model="mrp.bom">
-            <field name="name">Mouse, Wireless</field>
             <field name="product_id" ref="product.product_product_12"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -343,7 +333,6 @@
         </record>
 
         <record id="mrp_bom_11" model="mrp.bom">
-            <field name="name">Laptop Customized + Azerty</field>
             <field name="product_id" ref="product.product_product_27"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -352,7 +341,6 @@
         </record>
 
         <record id="mrp_bom_12" model="mrp.bom">
-            <field name="name">Windows 7 Professional</field>
             <field name="product_id" ref="product.product_product_40"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -362,7 +350,6 @@
         </record>
 
         <record id="mrp_bom_13" model="mrp.bom">
-            <field name="name">USB Keyboard, AZERTY</field>
             <field name="product_id" ref="product.product_product_9"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -372,7 +359,6 @@
         </record>
 
         <record id="mrp_bom_14" model="mrp.bom">
-            <field name="name">Mouse, Laser</field>
             <field name="product_id" ref="product.product_product_11"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -382,7 +368,6 @@
         </record>
 
         <record id="mrp_bom_15" model="mrp.bom">
-            <field name="name">Computer Case-1</field>
             <field name="product_id" ref="product.product_product_16"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -391,7 +376,6 @@
         </record>
 
         <record id="mrp_bom_16" model="mrp.bom">
-            <field name="name">Processesor AMD 8-Core</field>
             <field name="product_id" ref="product.product_product_23"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -401,7 +385,6 @@
         </record>
 
         <record id="mrp_bom_17" model="mrp.bom">
-            <field name="name">Motherboard I9P57</field>
             <field name="product_id" ref="product.product_product_20"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -411,7 +394,6 @@
         </record>
 
         <record id="mrp_bom_18" model="mrp.bom">
-            <field name="name">HDD 320GB</field>
             <field name="product_id" ref="product.product_product_17"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -421,7 +403,6 @@
         </record>
 
         <record id="mrp_bom_19" model="mrp.bom">
-            <field name="name">Computer Case-2</field>
             <field name="product_id" ref="product.product_product_16"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -430,7 +411,6 @@
         </record>
 
         <record id="mrp_bom_20" model="mrp.bom">
-            <field name="name">Processor Core i5 2.70 Ghz</field>
             <field name="product_id" ref="product.product_product_22"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -440,7 +420,6 @@
         </record>
 
         <record id="mrp_bom_21" model="mrp.bom">
-            <field name="name">Motherboard A20Z7</field>
             <field name="product_id" ref="product.product_product_21"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -450,7 +429,6 @@
         </record>
 
         <record id="mrp_bom_22" model="mrp.bom">
-            <field name="name">HDD 500GB</field>
             <field name="product_id" ref="product.product_product_18"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -460,7 +438,6 @@
         </record>
 
         <record id="mrp_bom_23" model="mrp.bom">
-            <field name="name">Graphics Card</field>
             <field name="product_id" ref="product.product_product_24"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -470,7 +447,6 @@
         </record>
 
         <record id="mrp_bom_24" model="mrp.bom">
-            <field name="name">PC Assemble + 2GB RAM</field>
             <field name="product_id" ref="product.product_product_4"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -479,7 +455,6 @@
         </record>
 
         <record id="mrp_bom_25" model="mrp.bom">
-            <field name="name">15" LCD Monitor </field>
             <field name="product_id" ref="product.product_product_6"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -489,7 +464,6 @@
         </record>
 
         <record id="mrp_bom_26" model="mrp.bom">
-            <field name="name">Computer Case-1</field>
             <field name="product_id" ref="product.product_product_16"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -499,7 +473,6 @@
         </record>
 
         <record id="mrp_bom_27" model="mrp.bom">
-            <field name="name">Mouse, Laser</field>
             <field name="product_id" ref="product.product_product_11"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -509,7 +482,6 @@
         </record>
 
         <record id="mrp_bom_28" model="mrp.bom">
-            <field name="name">USB Keyboard, QWERTY</field>
             <field name="product_id" ref="product.product_product_8"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -519,7 +491,6 @@
         </record>
 
         <record id="mrp_bom_29" model="mrp.bom">
-            <field name="name">RAM DDR2 1GB</field>
             <field name="product_id" ref="product.product_product_15"/>
             <field name="product_qty">2</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -529,7 +500,6 @@
         </record>
 
         <record id="mrp_bom_30" model="mrp.bom">
-            <field name="name">PC Assemble + 512MB RAM</field>
             <field name="product_id" ref="product.product_product_3"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -539,7 +509,6 @@
         </record>
 
         <record id="mrp_bom_31" model="mrp.bom">
-            <field name="name">17" LCD Monitor</field>
             <field name="product_id" ref="product.product_product_7"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -549,7 +518,6 @@
         </record>
 
         <record id="mrp_bom_32" model="mrp.bom">
-            <field name="name">Computer Case-2</field>
             <field name="product_id" ref="product.product_product_16"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -559,7 +527,6 @@
         </record>
 
         <record id="mrp_bom_33" model="mrp.bom">
-            <field name="name">Mouse, Laser</field>
             <field name="product_id" ref="product.product_product_11"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -569,7 +536,6 @@
         </record>
 
         <record id="mrp_bom_34" model="mrp.bom">
-            <field name="name">USB Keyboard, QWERTY</field>
             <field name="product_id" ref="product.product_product_8"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -579,7 +545,6 @@
         </record>
 
         <record id="mrp_bom_35" model="mrp.bom">
-            <field name="name">RAM DDR 512MB</field>
             <field name="product_id" ref="product.product_product_13"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -589,7 +554,6 @@
         </record>
 
         <record id="mrp_bom_36" model="mrp.bom">
-            <field name="name">PC Assemble + Custom RAM (PC on Demand)</field>
             <field name="product_id" ref="product.product_product_5"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -599,7 +563,6 @@
         </record>
 
         <record id="mrp_bom_37" model="mrp.bom">
-            <field name="name">15" LCD Monitor </field>
             <field name="product_id" ref="product.product_product_6"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -609,7 +572,6 @@
         </record>
 
         <record id="mrp_bom_38" model="mrp.bom">
-            <field name="name">Computer Case-1</field>
             <field name="product_id" ref="product.product_product_16"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -619,7 +581,6 @@
         </record>
 
         <record id="mrp_bom_39" model="mrp.bom">
-            <field name="name">RAM DDR 512MB</field>
             <field name="product_id" ref="product.product_product_13"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -629,7 +590,6 @@
         </record>
 
         <record id="mrp_bom_40" model="mrp.bom">
-            <field name="name">Mouse, Laser</field>
             <field name="product_id" ref="product.product_product_11"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -639,7 +599,6 @@
         </record>
 
         <record id="mrp_bom_41" model="mrp.bom">
-            <field name="name">USB Keyboard, QWERTY</field>
             <field name="product_id" ref="product.product_product_8"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 9d1ae9eae8a..0e47331bcbf 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -347,7 +347,7 @@
                 <form string="Bill of Material" version="7.0">
                     <group>
                         <group>
-                            <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>
+                            <field name="product_id" on_change="onchange_product_id(product_id)" class="oe_inline"/>
                             <label for="product_qty" string="Quantity"/>
                             <div>
                                 <field name="product_qty" class="oe_inline"/>
@@ -366,7 +366,6 @@
                             </div>
                         </group>
                         <group>
-                            <field name="name" class="oe_inline"/>
                             <field name="code" string="Reference"/>
                             <field name="type"/>
                             <p colspan="2" class="oe_grey" attrs="{'invisible': [('type','=','normal')]}">
@@ -380,10 +379,9 @@
                         <page string="Components">
                             <field name="bom_lines" widget="one2many_list">
                                 <tree string="Components" editable="bottom">
-                                    <field name="product_id" on_change="onchange_product_id(product_id, name)"/>
+                                    <field name="product_id" on_change="onchange_product_id(product_id)"/>
                                     <field name="product_qty"/>
                                     <field name="product_uom" on_change="onchange_uom(product_id, product_uom)" groups="product.group_uom"/>
-                                    <field name="name" invisible="1"/>
                                     <field name="date_start"/>
                                     <field name="date_stop"/>
                                 </tree>
@@ -421,7 +419,7 @@
             <field name="model">mrp.bom</field>
             <field name="arch" type="xml">
                 <search string="Search Bill Of Material">
-                    <field name="name" string="Bill Of Material" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
+                    <field name="code" string="Bill Of Material" filter_domain="[('code','ilike',self)]"/>
                     <field name="product_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <group expand="0" string="Group By...">
@@ -442,7 +440,6 @@
             <field name="arch" type="xml">
                 <tree string="Bill of Materials" colors="blue:method">
                     <field name="sequence" invisible="1"/>
-                    <field name="name"/>
                     <field name="code"/>
                     <field name="product_id"/>
                     <field name="product_qty"/>
@@ -462,9 +459,8 @@
             <field name="arch" type="xml">
                 <tree string="BoM Structure" colors="blue:method">
                     <field name="sequence" invisible="1"/>
-                    <field name="name" string="Component Name"/>
                     <field name="code"/>
-                    <field name="product_id" string="Component Product"/>
+                    <field name="product_id" string="Product"/>
                     <field name="bom_id"/>
                     <field name="product_qty"/>
                     <field name="product_uom" groups="product.group_uom"/>
diff --git a/addons/stock/wizard/stock_fill_inventory_view.xml b/addons/stock/wizard/stock_fill_inventory_view.xml
index 5533bf0580e..3f25cd27f86 100644
--- a/addons/stock/wizard/stock_fill_inventory_view.xml
+++ b/addons/stock/wizard/stock_fill_inventory_view.xml
@@ -6,7 +6,7 @@
             <field name="model">stock.fill.inventory</field>
             <field name="arch" type="xml">
               <form string="Import Inventory" version="7.0">
-                  <separator string="Import current product inventory from the following location"/>
+                  <separator string="Import the current inventory"/>
                   <group>
                       <field name="location_id" groups="stock.group_locations"/>
                       <field name="recursive" groups="stock.group_locations"/>