From 083b001671368edcdd0b67f31bcbbe86a0357d71 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Tue, 31 Jul 2012 17:27:21 +0530
Subject: [PATCH 1/8] [IMP] improve the general setting wizard

bzr revid: rma@tinyerp.com-20120731115721-vsyyb45w7pr8f4n8
---
 addons/base_setup/res_config.py       | 6 +++---
 addons/base_setup/res_config_view.xml | 2 +-
 addons/signup/res_config.xml          | 9 ++++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 6a73eb786ea..d516b671b46 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -25,12 +25,12 @@ class base_config_settings(osv.osv_memory):
     _name = 'base.config.settings'
     _inherit = 'res.config.settings'
     _columns = {
-        'module_multi_company': fields.boolean('Multi Company',
+        'module_multi_company': fields.boolean('manage multiple companies',
             help="""Work in multi-company environments, with appropriate security access between companies.
                 This installs the module multi_company."""),
-        'module_portal': fields.boolean('Activate Customer Portal',
+        'module_portal': fields.boolean('activate customer portal',
             help="""The portal will give access to a series of documents for your  customers; his quotations, his invoices, his projects, etc."""),
-        'module_share': fields.boolean('Allow Sharing Resources to External Users',
+        'module_share': fields.boolean('allow sharing documents to',
             help="""As an example, you will be able to share a project or some tasks to  your customers, or quotes/sales to several persons at your customer  company, or your agenda availabilities to your contacts."""),
     }
 
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index e2a80e6584f..f8ab0bed547 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -34,7 +34,7 @@
                                 <field name="module_share" class="oe_inline"/>
                                 <label for="module_share"/>
                             </div>
-                            <div>
+                            <div name="portal">
                                 <field name="module_portal" class="oe_inline"/>
                                 <label for="module_portal"/>
                             </div>
diff --git a/addons/signup/res_config.xml b/addons/signup/res_config.xml
index d13f7002d17..7ddd5c39034 100644
--- a/addons/signup/res_config.xml
+++ b/addons/signup/res_config.xml
@@ -6,9 +6,12 @@
             <field name="inherit_id" ref="base_setup.view_general_configuration"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <field name="module_portal" position="after">
-                    <field name="signup_template_user_id"/>
-                </field> 
+                <div name="portal" position="after">
+                    <div name="portal">
+                    	<label for="signup_template_user_id"/>
+                        <field name="signup_template_user_id" class="oe_inline"/>
+                    </div>
+                </div> 
             </field>
         </record>
     </data>

From f9a936f92d844c67ce69c8f6bf3deb01016a83a0 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Tue, 31 Jul 2012 17:36:28 +0530
Subject: [PATCH 2/8] [IMP] improve the knowledge wizard

bzr revid: rma@tinyerp.com-20120731120628-rkfegevch10o1quk
---
 addons/knowledge/res_config.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/knowledge/res_config.py b/addons/knowledge/res_config.py
index ba7e1448831..d3355f14ee9 100644
--- a/addons/knowledge/res_config.py
+++ b/addons/knowledge/res_config.py
@@ -25,18 +25,18 @@ class knowledge_config_settings(osv.osv_memory):
     _name = 'knowledge.config.settings'
     _inherit = 'res.config.settings'
     _columns = {
-        'module_wiki_faq': fields.boolean('Internal FAQ as a Wiki',
+        'module_wiki_faq': fields.boolean('manage internal FAQ as a wiki',
             help="""This installs the module wiki_faq."""), 
-        'module_wiki_quality_manual': fields.boolean('Quality Manual as a Wiki',
+        'module_wiki_quality_manual': fields.boolean('use quality manual as a wiki',
             help="""This installs the module wiki_quality_manual."""),
-        'module_document': fields.boolean('Document Management',
+        'module_document': fields.boolean('manage documents',
             help="""This is a complete document management system, with: user authentication,
                 full document search (but pptx and docx are not supported), and a document dashboard.
                 This installs the module document."""),
-        'module_document_ftp': fields.boolean('Share Repositories (FTP)',
+        'module_document_ftp': fields.boolean('share repositories(FTP)',
             help="""Access your documents in OpenERP through an FTP interface.
                 This installs the module document_ftp."""),
-        'module_document_webdav': fields.boolean('Share Repositories (WebDAV)',
+        'module_document_webdav': fields.boolean('share repositories(WebDAV)',
             help="""Access your documents in OpenERP through WebDAV.
                 This installs the module document_webdav."""),
     }

From 038de0d56009069fdfa3f49e626494b2634efa33 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Tue, 31 Jul 2012 17:59:04 +0530
Subject: [PATCH 3/8] [IMP] improve the project wizard

bzr revid: rma@tinyerp.com-20120731122904-ec9mwww85euzyu8v
---
 addons/project/res_config.py       | 20 ++++++++++----------
 addons/project_issue/res_config.py |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/project/res_config.py b/addons/project/res_config.py
index b112506e073..e5205fe7d37 100644
--- a/addons/project/res_config.py
+++ b/addons/project/res_config.py
@@ -27,38 +27,38 @@ class project_configuration(osv.osv_memory):
     _inherit = 'res.config.settings'
 
     _columns = {
-        'module_project_mrp': fields.boolean('Create Tasks from a Sale Order',
+        'module_project_mrp': fields.boolean('generate tasks from sale orders',
             help ="""This feature automatically creates project tasks from service products in sale orders.
                 More precisely, tasks are created for procurement lines with product of type 'Service',
                 procurement method 'Make to Order', and supply method 'Produce'.
                 This installs the module project_mrp."""),
-        'module_pad': fields.boolean("Use Collaborative Note Pads for Tasks",
+        'module_pad': fields.boolean("use integrated collaborative note pads on task",
             help="""Lets the company customize which Pad installation should be used to link to new pads
                 (by default, http://ietherpad.com/).
                 This installs the module pad."""),
-        'module_project_timesheet': fields.boolean("Timesheets per Task",
+        'module_project_timesheet': fields.boolean("record timesheet lines per tasks",
             help="""This allows you to transfer the entries under tasks defined for Project Management to
                 the timesheet line entries for particular date and user, with the effect of creating,
                 editing and deleting either ways.
                 This installs the module project_timesheet."""),
-        'module_project_long_term': fields.boolean("Manage Gantt and Resource Planning",
+        'module_project_long_term': fields.boolean("manage resources palnning on gantt view",
             help="""A long term project management module that tracks planning, scheduling, and resource allocation.
                 This installs the module project_long_term."""),
-        'module_project_issue': fields.boolean("Issues and Bug Tracking",
+        'module_project_issue': fields.boolean("track issues and bug",
             help="""Provides management of issues/bugs in projects.
                 This installs the module project_issue."""),
-        'time_unit': fields.many2one('product.uom', 'Working Time Unit', required=True,
+        'time_unit': fields.many2one('product.uom', 'working time unit', required=True,
             help="""This will set the unit of measure used in projects and tasks."""),
-        'module_project_issue_sheet': fields.boolean("Track and Invoice Issues Working Time",
+        'module_project_issue_sheet': fields.boolean("invoice working time on issues",
             help="""Provides timesheet support for the issues/bugs management in project.
                 This installs the module project_issue_sheet."""),
-        'group_tasks_work_on_tasks': fields.boolean("Task's Work on Tasks",
+        'group_tasks_work_on_tasks': fields.boolean("compute work activities on tasks",
             implied_group='project.group_tasks_work_on_tasks',
             help="Allows you to compute work on tasks."),
-        'group_time_work_estimation_tasks': fields.boolean("Time Estimation on Tasks",
+        'group_time_work_estimation_tasks': fields.boolean("manage time estimation on tasks",
             implied_group='project.group_time_work_estimation_tasks',
             help="Allows you to compute Time Estimation on tasks."),
-        'group_manage_delegation_task': fields.boolean("Manage Task Delegation",
+        'group_manage_delegation_task': fields.boolean("allow task delegation",
             implied_group='project.group_delegate_task',
             help="Allows you to delegate tasks to other users."),
     }
diff --git a/addons/project_issue/res_config.py b/addons/project_issue/res_config.py
index ec7080708ac..9fdbf502a62 100644
--- a/addons/project_issue/res_config.py
+++ b/addons/project_issue/res_config.py
@@ -26,7 +26,7 @@ class project_issue_settings(osv.osv_memory):
     _inherit = ['project.config.settings', 'fetchmail.config.settings']
 
     _columns = {
-        'fetchmail_issue': fields.boolean("Create Issues from Incoming Mails", 
+        'fetchmail_issue': fields.boolean("create issues from an incoming email account ", 
             fetchmail_model='project.issue', fetchmail_name='Incoming Issues',
             help="""Allows you to configure your incoming mail server, and create issues from incoming emails."""),
     }

From 442b5fce17d1347e8f57888335a35b78d28f79bb Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Tue, 31 Jul 2012 18:21:01 +0530
Subject: [PATCH 4/8] [IMP] improve the mrp wizard

bzr revid: rma@tinyerp.com-20120731125101-wbdspvdq5hu3lgt3
---
 addons/mrp/res_config.py       | 18 ++++++-------
 addons/mrp/res_config_view.xml | 47 +++++++++++++++-------------------
 2 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py
index cbee02cb4a8..c0ea2e8ae9e 100644
--- a/addons/mrp/res_config.py
+++ b/addons/mrp/res_config.py
@@ -28,11 +28,11 @@ class mrp_config_settings(osv.osv_memory):
     _inherit = 'res.config.settings'
 
     _columns = {
-        'module_stock_planning': fields.boolean('Master Production Schedule',
+        'module_stock_planning': fields.boolean('manage master production shedule',
             help ="""This allows to create a manual procurement plan apart of the normal MRP scheduling,
                 which works automatically based on minimum stock rules.
                 This installs the module stock_planning."""),
-        'module_mrp_repair': fields.boolean("Manage Product Repairs",
+        'module_mrp_repair': fields.boolean("manage repairs of products ",
             help="""Allows to manage all product repairs.
                     * Add/remove products in the reparation
                     * Impact for stocks
@@ -41,34 +41,34 @@ class mrp_config_settings(osv.osv_memory):
                     * Repair quotation report
                     * Notes for the technician and for the final customer.
                 This installs the module mrp_repair."""),
-        'module_mrp_operations': fields.boolean("Detailed Planning of Work Orders",
+        'module_mrp_operations': fields.boolean("allow detailed planning of work order",
             help="""This allows to add state, date_start,date_stop in production order operation lines (in the "Work Centers" tab).
                 This installs the module mrp_operations."""),
-        'module_mrp_subproduct': fields.boolean("Produce Several Products from One Manufacturing Order",
+        'module_mrp_subproduct': fields.boolean("produce several prouducts from one manufacturing order",
             help="""You can configure sub-products in the bill of material.
                 Without this module: A + B + C -> D.
                 With this module: A + B + C -> D + E.
                 This installs the module mrp_subproduct."""),
-        'module_mrp_jit': fields.boolean("Real-Time Scheduling",
+        'module_mrp_jit': fields.boolean("generate procurement in real time",
             help="""This allows Just In Time computation of procurement orders.
                 All procurement orders will be processed immediately, which could in some
                 cases entail a small performance impact.
                 This installs the module mrp_jit."""),
-        'module_stock_no_autopicking': fields.boolean("Manual Picking to Fulfill Manufacturing Orders",
+        'module_stock_no_autopicking': fields.boolean("manage manual picking to fulfill manufacturing orders ",
             help="""This module allows an intermediate picking process to provide raw materials to production orders.
                 For example to manage production made by your suppliers (sub-contracting).
                 To achieve this, set the assembled product which is sub-contracted to "No Auto-Picking"
                 and put the location of the supplier in the routing of the assembly operation.
                 This installs the module stock_no_autopicking."""),                
-        'group_mrp_routings': fields.boolean("Manage Routings and Work Orders",
+        'group_mrp_routings': fields.boolean("manage routings and work orders ",
             implied_group='mrp.group_mrp_routings',
             help="""Routings allow you to create and manage the manufacturing operations that should be followed
                 within your work centers in order to produce a product. They are attached to bills of materials
                 that will define the required raw materials."""),
-        'group_mrp_properties': fields.boolean("Allow Several BoMs per Product",
+        'group_mrp_properties': fields.boolean("allow several bill of materials per products",
             implied_group='product.group_mrp_properties',
             help="""The selection of the right Bill of Material to use will depend on the  properties specified on the sale order and the Bill of Material."""),
-        'module_product_manufacturer': fields.boolean("Define Manufacturers on Products",
+        'module_product_manufacturer': fields.boolean("define manufacturers on products ",
             help="""This allows you to define the following for a product:
                     * Manufacturer
                     * Manufacturer Product Name
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 1e6f9ae63f8..257676fe369 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -13,16 +13,8 @@
                     </header>
                     <separator string="Manufacturing Order"/>
                     <group>
-                        <label for="id" string="Order Settings"/>
+                        <label for="id" string="Order"/>
                         <div>
-                            <div>
-                                <field name="module_mrp_operations" class="oe_inline"/>
-                                <label for="module_mrp_operations" />
-                            </div>
-                            <div>
-                                <field name="module_stock_planning" class="oe_inline"/>
-                                <label for="module_stock_planning"/>
-                            </div>    
                             <div>
                                 <field name="module_mrp_subproduct" class="oe_inline"/>
                                 <label for="module_mrp_subproduct"/>                          
@@ -30,41 +22,42 @@
                             <div>
                                 <field name="module_mrp_repair" class="oe_inline"/>
                                 <label for="module_mrp_repair"/>
-                            </div>                            
+                            </div> 
+                             <div>
+                                 <field name="module_stock_no_autopicking" class="oe_inline"/>
+                                 <label for="module_stock_no_autopicking" />
+                            </div>                           
                         </div>
                     </group>
-                    <separator string="Logistics" />
                     <group >
-                        <label for="id" string="Logistics Settings"/>   
+                        <label for="id" string="Planning"/>   
                         <div>
                             <div>
                                 <field name="module_mrp_jit" class="oe_inline"/>
-                               <label for="module_mrp_jit" string="Real-Time"/>
+                               <label for="module_mrp_jit"/>
                             </div>
                             <div>
-                                 <field name="module_stock_no_autopicking" class="oe_inline"/>
-                                 <label for="module_stock_no_autopicking" />
+                                <field name="group_mrp_routings" class="oe_inline"/>
+                                <label for="group_mrp_routings"/>
                             </div>
+                             <div>
+                                <field name="module_mrp_operations" class="oe_inline"/>
+                                <label for="module_mrp_operations" />
+                            </div>
+                            <div>
+                                <field name="module_stock_planning" class="oe_inline"/>
+                                <label for="module_stock_planning"/>
+                            </div>   
                         </div>    
                     </group>
-                    <separator string="Products"/>
+                    <separator string="Master Data"/>
                     <group >
-                        <label for="id" string="Product Settings"/>   
+                        <label for="id" string="Products"/>   
                         <div>
                             <div>
                                 <field name="module_product_manufacturer" class="oe_inline"/>
                                 <label for="module_product_manufacturer"/>
                             </div>
-                        </div>    
-                    </group>                           
-                    <separator string="Bill Of Material" />
-                    <group >
-                        <label for="id" string="BOM Settings"/>   
-                        <div>
-                            <div>
-                                <field name="group_mrp_routings" class="oe_inline"/>
-                                <label for="group_mrp_routings"/>
-                            </div>
                             <div>
                                 <field name="group_mrp_properties" class="oe_inline"/>
                                 <label for="group_mrp_properties" />

From f9620ce5c7e994f1f3de08f503d317a032077421 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Tue, 31 Jul 2012 18:47:01 +0530
Subject: [PATCH 5/8] [IMP] improve the warehouse wizard

bzr revid: rma@tinyerp.com-20120731131701-h62odopwv0256spk
---
 addons/stock/res_config.py       | 26 +++++++++++++-------------
 addons/stock/res_config_view.xml |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py
index 3ad4b8e5914..b6d6ab1b1b6 100644
--- a/addons/stock/res_config.py
+++ b/addons/stock/res_config.py
@@ -26,14 +26,14 @@ class stock_config_settings(osv.osv_memory):
     _inherit = 'res.config.settings'
 
     _columns = {
-        'module_claim_from_delivery': fields.boolean("Allow Claims on Delivery Orders",
+        'module_claim_from_delivery': fields.boolean("allow claim on deliveries",
             help="""Adds a Claim link to the delivery order.
                 This installs the module claim_from_delivery."""),
-        'module_stock_invoice_directly': fields.boolean("Invoice Directly from the Picking",
+        'module_stock_invoice_directly': fields.boolean("generate directly invoice from the picking",
             help="""This allows to automatically launch the invoicing wizard if the delivery is
                 to be invoiced when you send or deliver goods.
                 This installs the module stock_invoice_directly."""),
-        'module_product_expiry': fields.boolean("Expiry Date on Lots",
+        'module_product_expiry': fields.boolean("expiry date on lots",
             help="""Track different dates on products and serial numbers.
                 The following dates can be tracked:
                     - end of life
@@ -41,39 +41,39 @@ class stock_config_settings(osv.osv_memory):
                     - removal date
                     - alert date.
                 This installs the module product_expiry."""),
-        'module_stock_location': fields.boolean("Push/Pull Logistic Rules",
+        'module_stock_location': fields.boolean("create push/pull logistic rules",
             help="""Provide push and pull inventory flows.  Typical uses of this feature are:
                 manage product manufacturing chains, manage default locations per product,
                 define routes within your warehouse according to business needs, etc.
                 This installs the module stock_location."""),
-        'group_uom': fields.boolean("Manage Different Units of Measure for Products",
+        'group_uom': fields.boolean("manage units of measure on products",
             implied_group='product.group_uom',
             help="""Allows you to select and maintain different units of measure for products."""),
-        'group_uos': fields.boolean("Manage Secondary Unit of Measure (for Sale)",
+        'group_uos': fields.boolean("invoice products in a different units of measure then the",
             implied_group='product.group_uos',
             help="""Allows you to sell units of a product, but invoice based on a different unit of measure.
                 For instance, you can sell pieces of meat that you invoice based on their weight."""),
-        'group_stock_packaging': fields.boolean("Manage Product Packaging",
+        'group_stock_packaging': fields.boolean("manage product packaging",
             implied_group='product.group_stock_packaging',
             help="""Allows you to create and manage your packaging dimensions and types you want to be maintained in your system."""),
-        'group_stock_production_lot': fields.boolean("Serial Numbers on Products",
+        'group_stock_production_lot': fields.boolean("track serial number on products",
             implied_group='stock.group_production_lot',
             help="""This allows you to manage products by using serial numbers.
                 When you select a lot, you can get the upstream or downstream traceability of the products contained in lot."""),
-        'group_stock_tracking_lot': fields.boolean("Serial Numbers on Logistic Units (Pallets)",
+        'group_stock_tracking_lot': fields.boolean("track serial number on logistic units(pallets)",
             implied_group='stock.group_tracking_lot',
             help="""Allows you to get the upstream or downstream traceability of the products contained in lot."""),
-        'group_stock_inventory_valuation': fields.boolean("Generate Accounting Entries per Stock Movement",
+        'group_stock_inventory_valuation': fields.boolean("generate accounting entries per stock movement",
             implied_group='stock.group_inventory_valuation',
             help="""Allows to configure inventory valuations on products and product categories."""),
-        'group_stock_multiple_locations': fields.boolean("Manage Multiple Locations and Warehouses",
+        'group_stock_multiple_locations': fields.boolean("manage multiple locations and warehouses",
             implied_group='stock.group_locations',
             help="""This allows to configure and use multiple stock locations and warehouses,
                 instead of having a single default one."""),
-        'group_product_variant': fields.boolean("Support Multiple Variants per Product",
+        'group_product_variant': fields.boolean("support multiple variants per products  ",
             implied_group='product.group_product_variant',
             help="""Allow to manage several variants per product. As an example, if you  sell T-Shirts, for the same "Linux T-Shirt", you may have variants on  sizes or colors; S, M, L, XL, XXL."""),                
-        'decimal_precision': fields.integer('Decimal Precision on Weights', help="As an example, a decimal precision of 2 will allow weights like: 9.99 kg, whereas a decimal precision of 4 will allow weights like:  0.0231 kg."),
+        'decimal_precision': fields.integer('decimal precision on weight', help="As an example, a decimal precision of 2 will allow weights like: 9.99 kg, whereas a decimal precision of 4 will allow weights like:  0.0231 kg."),
     }
 
     def get_default_dp(self, cr, uid, fields, context=None):
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index 20018510708..819384b22e4 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -79,7 +79,7 @@
                             </div>
                             <div>
                                 <field name="group_uos" class="oe_inline"/>
-                                <label for="group_uos" string="Unit of Measure (for Sale)"/>
+                                <label for="group_uos"/>
                             </div>
                             <div>
                                 <field name="group_product_variant" class="oe_inline"/>

From 1ed6a19bca20fa308d94062ae63e939ccf37249e Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Tue, 31 Jul 2012 19:18:16 +0530
Subject: [PATCH 6/8] [IMP] improve the purchase wizard

bzr revid: rma@tinyerp.com-20120731134816-zfmmzk6x807wtky3
---
 addons/purchase/res_config.py                 | 20 +++++++++----------
 .../purchase_double_validation_installer.xml  |  5 +----
 addons/stock/res_config_view.xml              |  2 +-
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index c5e72db9f1a..c88ab0c688d 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -32,34 +32,34 @@ class purchase_config_settings(osv.osv_memory):
             [('manual', 'Based on Purchase Order Lines'),
              ('picking', 'Based on Receptions'),
              ('order', 'Pre-Generate Draft Invoices based on Purchase Orders'),
-            ], 'Default Invoicing Control Method', required=True, default_model='purchase.order'),
-        'group_purchase_pricelist':fields.boolean("Pricelist per Supplier",
+            ], 'default invoicing control method', required=True, default_model='purchase.order'),
+        'group_purchase_pricelist':fields.boolean("manage pricelist per supplier",
             implied_group='product.group_purchase_pricelist',
             help="""Allows to manage different prices based on rules per category of Supplier.
                 Example: 10% for retailers, promotion of 5 EUR on this product, etc."""),
-        'group_uom':fields.boolean("Manage Different Units of Measure for Products",
+        'group_uom':fields.boolean("manage different units of measures for products",
             implied_group='product.group_uom',
             help="""Allows you to select and maintain different units of measure for products."""),
-        'group_purchase_delivery_address': fields.boolean("Allow Different Addresses for Delivery and Invoice",
+        'group_purchase_delivery_address': fields.boolean("allow a different address for incoming products and invoicing",
             implied_group='purchase.group_delivery_invoice_address',
             help="Allows you to specify different delivery and invoice addresses on a purchase order."),
-        'module_purchase_analytic_plans': fields.boolean('Use Multiple Analytic Accounts on Purchases',
+        'module_purchase_analytic_plans': fields.boolean('use multiple analytic accounts on orders',
             help ="""Allows the user to maintain several analysis plans. These let you split
                 lines on a purchase order between several accounts and analytic plans.
                 This installs the module purchase_analytic_plans."""),
-        'module_warning': fields.boolean("Alerts by Products or Supplier",
+        'module_warning': fields.boolean("alerts by products or supllier",
             help="""Allow to configure warnings on products and trigger them when a user wants to purchase a given product or a given supplier.
             Example: Product: this product is deprecated, do not purchase more than 5.
                     Supplier: don't forget to ask for an express delivery."""),
 
-        'module_purchase_double_validation': fields.boolean("Two Levels of Approval",
+        'module_purchase_double_validation': fields.boolean("force two levels of approvals (limit to require a second approval)",
             help="""Provide a double validation mechanism for purchases exceeding minimum amount.
                 This installs the module purchase_double_validation."""),
-        'module_purchase_requisition': fields.boolean("Manage Purchase Requisitions",
+        'module_purchase_requisition': fields.boolean("manage purchase requisitions",
             help="""Purchase Requisitions are used when you want to request quotations from several suppliers for a given set of products.
             You can configure per product if you directly do a Request for Quotation
             to one supplier or if you want a purchase requisition to negotiate with several suppliers."""),
-        'decimal_precision': fields.integer('Decimal Precision on Price',help="As an example, a decimal precision of 2 will allow prices   like: 9.99 EUR, whereas a decimal precision of 4 will allow prices  like:  0.0231 EUR per unit."),
+        'decimal_precision': fields.integer('specify decimal precision on price',help="As an example, a decimal precision of 2 will allow prices   like: 9.99 EUR, whereas a decimal precision of 4 will allow prices  like:  0.0231 EUR per unit."),
     }
 
     _defaults = {
@@ -80,7 +80,7 @@ class purchase_config_settings(osv.osv_memory):
 class account_config_settings(osv.osv_memory):
     _inherit = 'account.config.settings'
     _columns = {
-        'module_purchase_analytic_plans': fields.boolean('Several Analytic Accounts on Purchases',
+        'module_purchase_analytic_plans': fields.boolean('use multiple analytic accounts on orders',
             help="""This allows install module purchase_analytic_plans."""),
         'group_analytic_account_for_purchases': fields.boolean('Analytic Accounting for Purchases',
             implied_group='purchase.group_analytic_accounting',
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml
index c9345694b77..697c690b3ae 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml
@@ -7,11 +7,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="purchase.view_purchase_configuration"/>
             <field name="arch" type="xml">
-                <div name="module_purchase_double_validation" position="before">
-                    <div>
-                        <label for="limit_amount"/>
+                <div name="module_purchase_double_validation" position="inside">
                         <field name="limit_amount" attrs="{'required': [('module_purchase_double_validation','=',True)]}" class="oe_inline"/>
-                    </div>
                 </div>
             </field>
         </record>
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index 819384b22e4..80898be10b0 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -79,7 +79,7 @@
                             </div>
                             <div>
                                 <field name="group_uos" class="oe_inline"/>
-                                <label for="group_uos"/>
+                                <label for="group_uos" />
                             </div>
                             <div>
                                 <field name="group_product_variant" class="oe_inline"/>

From 900f538fdd5a6e82a260490be248bc7d1b0b89a9 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Wed, 1 Aug 2012 10:45:23 +0530
Subject: [PATCH 7/8] [IMP] make changes into purchase,stock,signup wizard

bzr revid: rma@tinyerp.com-20120801051523-gigc598grv6mvy3u
---
 addons/purchase/res_config_view.xml | 2 +-
 addons/signup/res_config.py         | 2 +-
 addons/stock/res_config_view.xml    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index c7eabeec42d..607a6b2cf3b 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -13,7 +13,7 @@
                     </header>
                     <separator string="Invoicing Process"/>
                     <group>
-                        <label for="id" string="Invoicing Setting"/>   
+                        <label for="id" string="Invoicing Settings"/>   
                         <div>
                             <div>
                                 <label for="default_invoice_method"/>
diff --git a/addons/signup/res_config.py b/addons/signup/res_config.py
index 53f0513b234..4679db3de48 100644
--- a/addons/signup/res_config.py
+++ b/addons/signup/res_config.py
@@ -4,7 +4,7 @@ class base_config_settings(osv.TransientModel):
     _inherit = 'base.config.settings'
 
     _columns = {
-        'signup_template_user_id': fields.many2one('res.users', 'Template user for signup')
+        'signup_template_user_id': fields.many2one('res.users', 'template user for signup')
     }
 
     def get_default_signup(self, cr, uid, fields, context=None):
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index 80898be10b0..acf3e9eda10 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -13,7 +13,7 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <separator string="Traceability &amp; Logistics"/>
+                    <separator string="Traceability &amp; Accounting"/>
                     <group>
                         <label for="id" string="Traceability"/>
                         <div>

From 7e00bd4b5cb3c583f682394e1d10ffafc3959d22 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Wed, 1 Aug 2012 12:03:04 +0530
Subject: [PATCH 8/8] [IMP] make changes into the purchase wizard

bzr revid: rma@tinyerp.com-20120801063304-86p105x07yglycxk
---
 addons/purchase/res_config.py                                | 2 +-
 .../purchase_double_validation_installer.py                  | 2 +-
 .../purchase_double_validation_installer.xml                 | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index c88ab0c688d..3cfdd825be9 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -52,7 +52,7 @@ class purchase_config_settings(osv.osv_memory):
             Example: Product: this product is deprecated, do not purchase more than 5.
                     Supplier: don't forget to ask for an express delivery."""),
 
-        'module_purchase_double_validation': fields.boolean("force two levels of approvals (limit to require a second approval)",
+        'module_purchase_double_validation': fields.boolean("force two levels of approvals",
             help="""Provide a double validation mechanism for purchases exceeding minimum amount.
                 This installs the module purchase_double_validation."""),
         'module_purchase_requisition': fields.boolean("manage purchase requisitions",
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.py b/addons/purchase_double_validation/purchase_double_validation_installer.py
index cff984c473f..0fb9290915e 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.py
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.py
@@ -24,7 +24,7 @@ from osv import fields, osv
 class purchase_config_settings(osv.osv_memory):
     _inherit = 'purchase.config.settings'
     _columns = {
-        'limit_amount': fields.integer('Limit to Require a Second Approval',required=True,
+        'limit_amount': fields.integer('Limit to require a second approval',required=True,
             help="Amount after which validation of purchase is required."),
     }
 
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml
index 697c690b3ae..7a8260b9c48 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml
@@ -8,7 +8,10 @@
             <field name="inherit_id" ref="purchase.view_purchase_configuration"/>
             <field name="arch" type="xml">
                 <div name="module_purchase_double_validation" position="inside">
-                        <field name="limit_amount" attrs="{'required': [('module_purchase_double_validation','=',True)]}" class="oe_inline"/>
+                     <label string="("/>
+                     <label for="limit_amount" />
+                     <field name="limit_amount" attrs="{'required': [('module_purchase_double_validation','=',True)]}" class="oe_inline"/>
+                     <label string=")"/>
                 </div>
             </field>
         </record>