From f375570a9cff5347501a347005e2f99adfec2736 Mon Sep 17 00:00:00 2001
From: "Tejas (OpenERP)" <tta@openerp.com>
Date: Mon, 30 May 2011 11:53:09 +0530
Subject: [PATCH 1/2] [Usability] changes with purchase, renaming field name
 and menu name

bzr revid: tta@openerp.com-20110530062309-gp9ltvu3pmhcdk90
---
 addons/purchase/purchase.py       | 2 +-
 addons/purchase/purchase_view.xml | 2 +-
 addons/purchase/stock_view.xml    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 6f6ab0c1b44..01f5c9faf11 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -188,7 +188,7 @@ class purchase_order(osv.osv):
         'shipped_rate': fields.function(_shipped_rate, method=True, string='Received', type='float'),
         'invoiced': fields.function(_invoiced, method=True, string='Invoiced & Paid', type='boolean', help="It indicates that an invoice has been paid"),
         'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'),
-        'invoice_method': fields.selection([('manual','Manual'),('order','From Order'),('picking','From Picking')], 'Invoicing Control', required=True,
+        'invoice_method': fields.selection([('manual','Manual'),('order','From Order'),('picking','From Reception')], 'Invoicing Control', required=True,
             help="From Order: a draft invoice will be pre-generated based on the purchase order. The accountant " \
                 "will just have to validate this invoice for control.\n" \
                 "From Picking: a draft invoice will be pre-generated based on validated receptions.\n" \
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index bc74fc852c1..fc990ecefee 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -455,7 +455,7 @@
 
 
         <record id="purchase_line_form_action2" model="ir.actions.act_window">
-            <field name="name">Purchase Lines Not Invoiced</field>
+            <field name="name">On Purchase Order Line</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order.line</field>
             <field name="domain">[('order_id.invoice_method','&lt;&gt;','picking'), ('state','in',('confirmed','done')), ('invoiced', '=', False)]</field>
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index e3ff3247430..084e8761650 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -103,7 +103,7 @@
         </record>
  
         <record id="action_picking_tree4_picking_to_invoice" model="ir.actions.act_window">
-            <field name="name">Picking to Invoice</field>
+            <field name="name">On Receptions</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>

From dd63d93421160be9e93756f22a0a337514e292f4 Mon Sep 17 00:00:00 2001
From: "Tejas (OpenERP)" <tta@openerp.com>
Date: Mon, 30 May 2011 16:02:02 +0530
Subject: [PATCH 2/2] [Usability] Updated the purchase.pot

bzr revid: tta@openerp.com-20110530103202-r8c5oy3h0e34kl2i
---
 addons/purchase/i18n/purchase.pot | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot
index 5798c30d7d5..b1c3b86aafb 100644
--- a/addons/purchase/i18n/purchase.pot
+++ b/addons/purchase/i18n/purchase.pot
@@ -56,7 +56,7 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
+msgid "From Reception"
 msgstr ""
 
 #. module: purchase
@@ -883,7 +883,13 @@ msgstr ""
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
-msgid "Purchase Lines Not Invoiced"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
 msgstr ""
 
 #. module: purchase