From b8863993e1e0b71ed061db6689eebf499dc171fc Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Mon, 15 Nov 2010 12:38:04 +0530
Subject: [PATCH] [IMP] procrument,purchase,stock4 : purhcase improvments :
 Task id:1774

bzr revid: aag@tinyerp.co.in-20101115070804-hmmd0zvuvmwpjs38
---
 .../board_mrp_procurement_view.xml            |  2 +-
 addons/purchase/board_purchase_view.xml       | 42 -------------------
 addons/stock/stock.py                         |  2 +-
 3 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/addons/procurement/board_mrp_procurement_view.xml b/addons/procurement/board_mrp_procurement_view.xml
index 3b18a876f4f..20cc83193a8 100644
--- a/addons/procurement/board_mrp_procurement_view.xml
+++ b/addons/procurement/board_mrp_procurement_view.xml
@@ -17,7 +17,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
       		<xpath expr="/form/hpaned/child1" position="inside"> 
-				<action colspan="4" name="%(procurement_action_board)d" string="Procurement Exceptions" width="510" />
+				<action colspan="4" name="%(procurement_action_board)d" string="Procurement in Exceptions" width="510" />
 			</xpath>
             </field>
         </record>
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index 475873a138e..060382053e2 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -70,47 +70,6 @@
 	            <field name="act_window_id" ref="action_purchase_order_monthly_categ_graph"/>
 	    </record>
 
-        <record model="ir.ui.view" id="view_negotiation_by_supplier_tree">
-            <field name="name">negotiation.by.supplier.tree</field>
-            <field name="model">purchase.report</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Negotiation by Supplier">
-                    <field name="partner_id"/>
-                    <field name="negociation"/>
-                </tree>
-            </field>
-        </record>
-        <record model="ir.ui.view" id="view_negotiation_by_supplier_graph">
-            <field name="name">negotiation.by.supplier.graph</field>
-            <field name="model">purchase.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Negotiation by Supplier" type="bar">
-                    <field name="partner_id"/>
-                    <field name="negociation"/>
-                </graph>
-            </field>
-        </record>
-		<record id="action_negotiation_by_supplier" model="ir.actions.act_window">
-	        <field name="name">Negotiation by Supplier</field>
-	        <field name="res_model">purchase.report</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">graph,tree</field>
-	        <field name="view_id" ref="view_negotiation_by_supplier_graph"/>
-	    </record>
-	    <record id="open_view_negotiation_by_supplier_tree" model="ir.actions.act_window.view">
-            <field eval="2" name="sequence"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_negotiation_by_supplier_tree"/>
-            <field name="act_window_id" ref="action_negotiation_by_supplier"/>
-	    </record>
-	    <record id="open_view_negotiation_by_supplier_graph" model="ir.actions.act_window.view">
-	            <field eval="1" name="sequence"/>
-	            <field name="view_mode">graph</field>
-	            <field name="view_id" ref="view_negotiation_by_supplier_graph"/>
-	            <field name="act_window_id" ref="action_negotiation_by_supplier"/>
-	    </record>
 
         <record id="board_purchase_form" model="ir.ui.view">
             <field name="name">board.purchase.form</field>
@@ -129,7 +88,6 @@
                         </child1>
                         <child2>
                         	<action colspan="4" height="220" name="%(action_purchase_order_monthly_categ_graph)d" string="Monthly Purchase by Category"  />
-                            <action colspan="4" height="220" name="%(action_negotiation_by_supplier)d" string="Negotiation by Supplier"  />
                         <!--
                             <action colspan="4" height="220" name="%(purchase.action_purchase_by_supplier)d" string="Purchase by supplier"  />
                             <action colspan="4" height="220" name="%(purchase.action_total_price_by_product_by_state)d" string="Total price by product by state"  />
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index e6737ae31bb..9c26165568b 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1350,7 +1350,7 @@ class stock_production_lot(osv.osv):
         return ids
 
     _columns = {
-        'name': fields.char('Serial Number', size=64, required=True, help="Unique serial number, will be displayed as: PREFIX/SERIAL [INT_REF]"),
+        'name': fields.char('Production Lot', size=64, required=True, help="Unique production lot, will be displayed as: PREFIX/SERIAL [INT_REF]"),
         'ref': fields.char('Internal Reference', size=256, help="Internal reference number in case it differs from the manufacturer's serial number"),
         'prefix': fields.char('Prefix', size=64, help="Optional prefix to prepend when displaying this serial number: PREFIX/SERIAL [INT_REF]"),
         'product_id': fields.many2one('product.product', 'Product', required=True),