[IMP] stock_account: usability

bzr revid: qdp-launchpad@openerp.com-20130903135711-0ci0cz7n5jld4tyg

diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py
index 51505a3..e8fa4d8 100644 (file)
--- a/addons/stock/res_config.py
+++ b/addons/stock/res_config.py
@@ -71,7 +71,6 @@ This installs the module product_expiry."""),
             implied_group='stock.group_tracking_owner', 
             help="""This way you can receive products attributed to a certain owner. """), 
         'module_stock_account': 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",
             implied_group='stock.group_locations',

diff --git a/addons/stock_account/product.py b/addons/stock_account/product.py
index 046970e..126fbe5 100644 (file)
--- a/addons/stock_account/product.py
+++ b/addons/stock_account/product.py
@@ -169,7 +169,7 @@ class product_product(osv.osv):
     _columns = {
         'valuation':fields.property(type='selection', selection=[('manual_periodic', 'Periodical (manual)'),
                                         ('real_time','Real Time (automated)'),], string = 'Inventory Valuation',
-                                        help="If real-time valuation is enabled for a product, the system will automatically write journal entries corresponding to stock moves." \
+                                        help="If real-time valuation is enabled for a product, the system will automatically write journal entries corresponding to stock moves, with product price as specified by the 'Costing Method'" \
                                              "The inventory variation account set on the product category will represent the current inventory value, and the stock input and stock output account will hold the counterpart moves for incoming and outgoing products."
                                         , required=True),
     }
@@ -184,9 +184,9 @@ class product_template(osv.osv):
     _inherit = 'product.template'
     _columns = {
         'cost_method': fields.property(type='selection', selection=[('standard', 'Standard Price'), ('average', 'Average Price'), ('real', 'Real Price')],
-            help="""Standard Price: The cost price is manually updated at the end of a specific period (usually every year)
-                    Average Price: The cost price is recomputed at each incoming shipment
-                    Real Price: The cost price is calculated as the real price of each outgoing product""",
+            help="""Standard Price: The cost price is manually updated at the end of a specific period (usually every year).
+                    Average Price: The cost price is recomputed at each incoming shipment and used for the product valuation.
+                    Real Price: The cost price displayed is the price of the last outgoing product (will be use in case of inventory loss for example).""",
             string="Costing Method", required=True),
         'property_stock_account_input': fields.property(
             type='many2one',

diff --git a/addons/stock_account/product_view.xml b/addons/stock_account/product_view.xml
index 0c5f59f..2aa7f6d 100644 (file)
--- a/addons/stock_account/product_view.xml
+++ b/addons/stock_account/product_view.xml
@@ -75,7 +75,7 @@
             <field name="priority">26</field>
             <field name="arch" type="xml">
                 <xpath expr="//group[@name='properties']" position="before">
-                    <group groups="stock.group_inventory_valuation">
+                    <group>
                         <separator string="Inventory Valuation" colspan="4"/>
                         <group colspan="2" col="2">
                             <field name="valuation" attrs="{'readonly':[('type', '=', 'service')]}"/>