From 48ad382705bf01c8a19a140ba77ddcaacd672354 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 8 Oct 2012 15:44:22 +0530
Subject: [PATCH] [IMP]all : improve string

bzr revid: mma@tinyerp.com-20121008101422-hen3r94996e6pzye
---
 addons/base_calendar/base_calendar.py         |  6 ++---
 addons/base_calendar/crm_meeting_view.xml     |  2 +-
 .../crm_partner_assign/res_partner_view.xml   |  2 +-
 addons/hr_expense/hr_expense.py               |  2 +-
 addons/membership/membership.py               |  2 +-
 addons/product/product_view.xml               |  4 ++--
 addons/sale/sale_view.xml                     | 22 +++++++++++++++++--
 7 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 5b8c41787d4..bcfb9340966 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1016,9 +1016,9 @@ defines the list of date/time exceptions for a recurring calendar component."),
 rule or repeating pattern of time to exclude from the recurring rule."),
         'rrule': fields.function(_get_rulestring, type='char', size=124, \
                     fnct_inv=_rrule_write, store=True, string='Recurrent Rule'),
-        'rrule_type': fields.selection([('none', ''), ('daily', 'Daily'), \
-                            ('weekly', 'Weekly'), ('monthly', 'Monthly'), \
-                            ('yearly', 'Yearly'),],
+        'rrule_type': fields.selection([('none', ''), ('daily', 'Day(s)'), \
+                            ('weekly', 'Week(s)'), ('monthly', 'Month(s)'), \
+                            ('yearly', 'Year(s)'),],
                             'Recurrency', states={'done': [('readonly', True)]},
                             help="Let the event automatically repeat at that interval"),
         'alarm_id': fields.many2one('res.alarm', 'Reminder', states={'done': [('readonly', True)]},
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index adcfc23a520..26c11262a2c 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -86,7 +86,7 @@
                         </h2>
                     </div>
                     <notebook>
-                    <page string="Meeting Detail">
+                    <page string="Meeting Details">
                         <group>
                             <group>
                                 <field name="date" string="Starting at"/>
diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml
index f5a1e9aad25..d1e72432550 100644
--- a/addons/crm_partner_assign/res_partner_view.xml
+++ b/addons/crm_partner_assign/res_partner_view.xml
@@ -77,7 +77,7 @@
         <field name="inherit_id" ref="base.view_partner_tree"/>
         <field name="arch" type="xml">
             <field name="user_id" position="after">
-                <field name="grade_id"/>
+                <field name="grade_id" string="Partner Level"/>
                 <field name="activation"/>
             </field>
         </field>
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 91dc44fed61..a0d133aef86 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -233,7 +233,7 @@ hr_expense_expense()
 class product_product(osv.osv):
     _inherit = "product.product"
     _columns = {
-        'hr_expense_ok': fields.boolean('Can Constitute an Expense', help="Determines if the product can be visible in the list of product within a selection from an HR expense sheet line."),
+        'hr_expense_ok': fields.boolean('Can be Expensed', help="Determines if the product can be visible in the list of product within a selection from an HR expense sheet line."),
     }
 
     def on_change_hr_expense_ok(self, cr, uid, id, hr_expense_ok):
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 87af723f2f9..f3192948afc 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -323,7 +323,7 @@ class Partner(osv.osv):
                     help = 'The price negotiated by the partner'),
         'membership_state': fields.function(
                     __get_membership_state,
-                    string = 'Current Membership State', type = 'selection',
+                    string = 'Current Membership Status', type = 'selection',
                     selection = STATE,
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 10),
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 8c19aee026f..266a70e0fe3 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -144,7 +144,7 @@
                                         <field name="state"/>
                                         <field name="product_manager"/>
                                     </group>
-                                    <group name="store" string="Storage Localisation">
+                                    <group name="store" string="Storage Localization">
                                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                                         <field name="loc_rack" attrs="{'invisible':[('type','=','service')]}"/>
                                         <field name="loc_row" attrs="{'invisible':[('type','=','service')]}"/>
@@ -763,7 +763,7 @@
                                     </div>
                                     <field name="warranty"/>
                                 </group>
-                                <group name="store" string="Storage Localisation">
+                                <group name="store" string="Storage Localization">
                                     <field name="loc_rack"/>
                                     <field name="loc_row"/>
                                     <field name="loc_case"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 5505a6a88b5..920e64d46da 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -131,7 +131,24 @@
             <field name="arch" type="xml">
                 <tree string="Sales Orders" fonts="bold:message_unread==True" colors="grey:state=='cancel';blue:state in ('waiting_date','manual');red:state in ('invoice_except','shipping_except')">
                     <field name="message_unread" invisible="1"/>
-                    <field name="name"/>
+                    <field name="name" string="Order number"/>
+                    <field name="date_order"/>
+                    <field name="partner_id"/>
+                    <field name="user_id"/>
+                    <field name="amount_total" sum="Total Tax Included"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_quotation_tree" model="ir.ui.view">
+            <field name="name">sale.order.tree</field>
+            <field name="model">sale.order</field>
+            <field name="priority">2</field>
+            <field name="arch" type="xml">
+                <tree string="Quotation" fonts="bold:message_unread==True" colors="grey:state=='cancel';blue:state in ('waiting_date','manual');red:state in ('invoice_except','shipping_except')">
+                    <field name="message_unread" invisible="1"/>
+                    <field name="name" string="Quotation Number"/>
                     <field name="date_order"/>
                     <field name="partner_id"/>
                     <field name="user_id"/>
@@ -358,7 +375,7 @@
         </record>
 
         <record id="action_order_form" model="ir.actions.act_window">
-            <field name="name">Sales Orders</field>
+            <field name="name">Sale Orders</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order</field>
             <field name="view_type">form</field>
@@ -405,6 +422,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order</field>
             <field name="view_type">form</field>
+            <field name="view_id" ref="view_quotation_tree"/>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="context">{'show_address': 1}</field>
             <field name="domain">[('state','in',('draft','sent','cancel'))]</field>