[IMP] stock and various: labelling

- delivery: rename cost price to shipper price to ease the understanding.
- product_email_template: fixed space issues in help of email_template_id.
- stock: labelling reordering wizard
- stock_account: labelling (inventory at date) + shorter and cleaner help
messages. The main menu for this wizard has been put in technical group.
- stock_landed_costs: fields labels update

5 files changed, 12 insertions, 15 deletions

diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index 630966dcebd..d3ee73b949d 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -229,7 +229,7 @@ class delivery_grid_line(osv.osv):
         'variable_factor': fields.selection([('weight','Weight'),('volume','Volume'),('wv','Weight * Volume'), ('price','Price'), ('quantity','Quantity')], 'Variable Factor', required=True),
         'list_base_price': fields.float('Sale Base Price', digits_compute=dp.get_precision('Product Price'), required=True),
         'list_price': fields.float('Sale Price', digits_compute= dp.get_precision('Product Price'), required=True),
-        'standard_price': fields.float('Cost Price', digits_compute= dp.get_precision('Product Price'), required=True),
+        'standard_price': fields.float('Shipper Price', digits_compute= dp.get_precision('Product Price'), required=True),
     }
 
     _defaults = {
diff --git a/addons/product_email_template/models/product.py b/addons/product_email_template/models/product.py
index c31c0903da2..bd45a1c3f39 100644
--- a/addons/product_email_template/models/product.py
+++ b/addons/product_email_template/models/product.py
@@ -13,7 +13,7 @@ class product_template(osv.Model):
     _columns = {
         'email_template_id': fields.many2one(
             'mail.template', 'Product Email Template',
-            help='When validating an invoice, an email will be sent to the customer'
-                 'based on this template. The customer will receive an email for each'
+            help='When validating an invoice, an email will be sent to the customer '
+                 'based on this template. The customer will receive an email for each '
                  'product linked to an email template.'),
     }
diff --git a/addons/stock/wizard/orderpoint_procurement_view.xml b/addons/stock/wizard/orderpoint_procurement_view.xml
index 21437b3eb86..e2f75253218 100644
--- a/addons/stock/wizard/orderpoint_procurement_view.xml
+++ b/addons/stock/wizard/orderpoint_procurement_view.xml
@@ -5,7 +5,7 @@
         <!--  Compute Stock Minimum Rules Only -->
 
         <record id="view_procurement_compute_wizard" model="ir.ui.view">
-            <field name="name">Run Stock Minimum Rules Only</field>
+            <field name="name">Run Reordering Rules</field>
             <field name="model">procurement.orderpoint.compute</field>
             <field name="arch" type="xml">
                 <form string="Parameters">
@@ -20,7 +20,7 @@
             </field>
         </record>
 
-        <act_window name="Run Stock Minimum Rules Only"
+        <act_window name="Run Reordering Rules"
             res_model="procurement.orderpoint.compute"
             src_model="procurement.order"
             view_mode="form"
diff --git a/addons/stock_account/wizard/stock_valuation_history_view.xml b/addons/stock_account/wizard/stock_valuation_history_view.xml
index 1c0fad78c34..4955e193e9d 100644
--- a/addons/stock_account/wizard/stock_valuation_history_view.xml
+++ b/addons/stock_account/wizard/stock_valuation_history_view.xml
@@ -3,18 +3,15 @@
     <data>
 
         <record id="view_wizard_valuation_history" model="ir.ui.view">
-            <field name="name">Stock Valuation</field>
+            <field name="name">Inventory at Date</field>
             <field name="model">wizard.valuation.history</field>
             <field name="arch" type="xml">
                 <form string="Choose your date">
                     <p class="oe_gray" attrs="{'invisible': [('choose_date', '=', False)]}">
-                        Choose the date for which you want to get the stock valuation of your products.
-
-                        This will filter the stock operation that weren't done at the selected date, to retrieve the quantity
-                        you had, and gives you the inventory value according to the standard price used at that time.
+                        Choose a date in the past to get the inventory at that date.
                     </p>
                     <p class="oe_gray" attrs="{'invisible': [('choose_date', '=', True)]}">
-                        Retrieve the stock valuation of your products at current day
+                        Retrieve the curent stock valuation.
                     </p>
                     <group>
                         <field name="choose_date"/>
@@ -28,14 +25,14 @@
             </field>
         </record>
         <record id="action_wizard_stock_valuation_history" model="ir.actions.act_window">
-            <field name="name">Stock Valuation</field>
+            <field name="name">Inventory at Date</field>
             <field name="res_model">wizard.valuation.history</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="view_wizard_valuation_history"/>
             <field name="target">new</field>
         </record>
-        <menuitem id="menu_action_wizard_valuation_history" action="action_wizard_stock_valuation_history" parent="stock.menu_warehouse_report" sequence="1"/>
+        <menuitem id="menu_action_wizard_valuation_history" action="action_wizard_stock_valuation_history" parent="stock.menu_warehouse_report" sequence="1" groups="base.group_no_one"/>
 
     <record id="view_stock_history_report_tree" model="ir.ui.view">
         <field name="name">Stock Value At Date</field>
diff --git a/addons/stock_landed_costs/product.py b/addons/stock_landed_costs/product.py
index 6d6dd9a55ef..0975ce2e4c3 100644
--- a/addons/stock_landed_costs/product.py
+++ b/addons/stock_landed_costs/product.py
@@ -6,7 +6,7 @@ from openerp.osv import fields, osv
 SPLIT_METHOD = [
     ('equal', 'Equal'),
     ('by_quantity', 'By Quantity'),
-    ('by_current_cost_price', 'By Current Cost Price'),
+    ('by_current_cost_price', 'By Current Cost'),
     ('by_weight', 'By Weight'),
     ('by_volume', 'By Volume'),
 ]
@@ -15,7 +15,7 @@ class product_template(osv.osv):
     _inherit = "product.template"
 
     _columns = {
-        'landed_cost_ok': fields.boolean('Can constitute a landed cost'),
+        'landed_cost_ok': fields.boolean('Landed Costs'),
         'split_method': fields.selection(SPLIT_METHOD, 'Split Method'),
     }