From 411c9d69d183dcc17f7b4cda8b0a277f98cad0a2 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 12 Sep 2012 12:00:53 +0200
Subject: [PATCH] [IMP] mrp: improve labels about serial numbers
 (capitalization and plural use)

bzr revid: rco@openerp.com-20120912100053-svniufltjbgxrb1m
---
 addons/stock/stock_view.xml                      |  6 +++---
 .../wizard/stock_inventory_line_split_view.xml   |  2 +-
 addons/stock/wizard/stock_move.py                |  3 ++-
 addons/stock/wizard/stock_move_view.xml          | 16 ++++++++--------
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 3560b255ab5..154927a2f19 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -164,14 +164,14 @@
                                 <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                 <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
                                 <field name="prodlot_id" groups="stock.group_production_lot"/>
-                                 <button name="%(track_line)d" string="Split in serial numbers" type="action"
+                                <button name="%(track_line)d" string="Split in serial numbers" type="action"
                                     icon="terp-stock_effects-object-colorize"
                                     attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
                                     states="draft,done,cancel"
                                     context="{'inventory_id':parent.id}"
                                     groups="stock.group_production_lot"/>
-                                 <field groups="stock.group_tracking_lot" name="tracking_id"/>
-                                 <button name="%(split_into)d" string="Put in a new pack" type="action"
+                                <field groups="stock.group_tracking_lot" name="tracking_id"/>
+                                <button name="%(split_into)d" string="Put in a new pack" type="action"
                                     groups="stock.group_tracking_lot"
                                     icon="terp-stock_effects-object-colorize"
                                     context="{'inventory_id':parent.id}"
diff --git a/addons/stock/wizard/stock_inventory_line_split_view.xml b/addons/stock/wizard/stock_inventory_line_split_view.xml
index 51cdf133bbf..92c91317e35 100644
--- a/addons/stock/wizard/stock_inventory_line_split_view.xml
+++ b/addons/stock/wizard/stock_inventory_line_split_view.xml
@@ -5,7 +5,7 @@
             <field name="name">Split Inventory Line</field>
             <field name="model">stock.inventory.line.split</field>
             <field name="arch" type="xml">
-                <form string="Split in Serial number" version="7.0">
+                <form string="Split in Serial Numbers" version="7.0">
                     <group>
                         <field name="product_id" colspan="4" readonly="1"/>
                         <label for="qty"/>
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index 1ff60f8eaef..538fa1c9441 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -170,7 +170,8 @@ class split_in_production_lot(osv.osv_memory):
         'product_uom': fields.many2one('product.uom', 'Unit of Measure'),
         'line_ids': fields.one2many('stock.move.split.lines', 'wizard_id', 'Serial Numbers'),
         'line_exist_ids': fields.one2many('stock.move.split.lines', 'wizard_exist_id', 'Serial Numbers'),
-        'use_exist' : fields.boolean('Existing Serial Number', help="Check this option to select existing serial number in the list below, otherwise you should enter new ones line by line."),
+        'use_exist' : fields.boolean('Existing Serial Numbers',
+            help="Check this option to select existing serial numbers in the list below, otherwise you should enter new ones line by line."),
         'location_id': fields.many2one('stock.location', 'Source Location')
      }
 
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index c7eed1cf987..3df336b5e30 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -8,8 +8,7 @@
             <field name="model">stock.move.consume</field>
             <field name="arch" type="xml">
                 <form string="Consume Move" version="7.0">
-                    <seperator string="Consume Products"/>
-                    <group>
+                    <group string="Consume Products">
                         <field name="product_id" readonly="1"/>
                         <label for="product_qty"/>
                         <div>
@@ -49,7 +48,8 @@
                             <field name="product_qty" class="oe_inline"/>
                             <field name="product_uom" class="oe_inline" readonly="1" groups="product.group_uom"/>
                         </div>
-                        <field name="location_id" string="Scrap Location" domain="[('usage','&lt;&gt;','view'),('scrap_location','=',True)]" widget="selection" groups="stock.group_locations"/>
+                        <field name="location_id" string="Scrap Location" widget="selection"
+                            domain="[('usage','!=','view'),('scrap_location','=',True)]" groups="stock.group_locations"/>
                     </group>
                     <footer>
                         <button name="move_scrap" string="Ok" type="object" class="oe_highlight"  />
@@ -73,7 +73,7 @@
                 <field name="name">Split in Serial Numbers</field>
                 <field name="model">stock.move.split</field>
                 <field name="arch" type="xml">
-                <form string="Split in Serial number" version="7.0">
+                <form string="Split in Serial Numbers" version="7.0">
                     <group>
                         <field name="product_id" readonly="1"/>
                         <label for="qty"/>
@@ -86,12 +86,12 @@
                     </group>
                     <field name="line_ids" attrs="{'invisible':[('use_exist','=',True)]}">
                         <tree string="Serial Numbers" editable="bottom">
-                            <field name="name" string="Serial Number"/>
+                            <field name="name"/>
                             <field name="quantity" />
                         </tree>
                         <form string="Serial Number" version="7.0">
                             <group>
-                                <field name="name" string="Lot number"/>
+                                <field name="name"/>
                                 <field name="quantity" />
                             </group>
                         </form>
@@ -103,7 +103,7 @@
                         </tree>
                         <form string="Serial Number" version="7.0">
                             <group>
-                                <field name="prodlot_id" string="Serial Number" domain="[('product_id','=',parent.product_id)]" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom, context)"/>
+                                <field name="prodlot_id" domain="[('product_id','=',parent.product_id)]" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom, context)"/>
                                 <field name="quantity" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom, context)" />
                             </group>
                         </form>
@@ -116,7 +116,7 @@
             </record>
 
             <record id="track_line" model="ir.actions.act_window">
-                <field name="name">Split in serial numbers</field>
+                <field name="name">Split in Serial Numbers</field>
                 <field name="type">ir.actions.act_window</field>
                 <field name="res_model">stock.move.split</field>
                 <field name="view_type">form</field>