[MERGE] English typos

bzr revid: fp@openerp.com-20121102173407-umicel4287htim14

diff --cc addons/hr_expense/hr_expense.py
index 439cf68,41f0bd6..d87ccf5
--- 1/addons/hr_expense/hr_expense.py
--- 2/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@@ -233,7 -233,7 +233,7 @@@ hr_expense_expense(
  class product_product(osv.osv):
      _inherit = "product.product"
      _columns = {
-         '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."),
 -        'hr_expense_ok': fields.boolean('Can Constitute an Expense', help="Specify if the product can be selected in an HR expense line."),
++        'hr_expense_ok': fields.boolean('Expense', help="Specify if the product can be selected in an HR expense line."),
      }
  
      def on_change_hr_expense_ok(self, cr, uid, id, hr_expense_ok):

diff --cc addons/point_of_sale/point_of_sale.py
Simple merge

diff --cc addons/procurement/procurement.py
index cb09af7,c1b228a..c166f79
--- 1/addons/procurement/procurement.py
--- 2/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@@ -633,10 -633,11 +633,10 @@@ class product_template(osv.osv)
      _inherit="product.template"
  
      _columns = {
-         'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock, a service is a non-material product provided by a company or an individual."),
-         'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
-         'supply_method': fields.selection([('produce','Manufacture'),('buy','Buy')], 'Supply Method', required=True, help="Produce will generate production order or tasks, according to the product type. Buy will trigger purchase orders when requested."),
+         'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Consumable: Will not imply stock management for this product. \nStockable product: Will imply stock management for this product."),
+         'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', required=True, help="Make to Stock: When needed, the product is taken from the stock or we wait for replenishment. \nMake to Order: When needed, the product is purchased or produced."),
+         'supply_method': fields.selection([('produce','Manufacture'),('buy','Buy')], 'Supply Method', required=True, help="Manufacture: When procuring the product, a manufacturing order or a task will be generated, depending on the product type. \nBuy: When procuring the product, a purchase order will be generated."),
      }
 -
      _defaults = {
          'procure_method': 'make_to_stock',
          'supply_method': 'buy',

diff --cc addons/product/product.py
index 28e3e00,10612af..b6a58fc
--- 1/addons/product/product.py
--- 2/addons/product/product.py
+++ b/addons/product/product.py
@@@ -111,9 -111,9 +111,9 @@@ class product_uom(osv.osv)
      _columns = {
          'name': fields.char('Unit of Measure', size=64, required=True, translate=True),
          'category_id': fields.many2one('product.uom.categ', 'Category', required=True, ondelete='cascade',
-             help="Quantity conversions may happen automatically between Units of Measure in the same category, according to their respective ratios."),
+             help="Conversion between Units of Measure can only occur if they belong to the same category. The conversion will be made based on the ratios."),
          'factor': fields.float('Ratio', required=True,digits=(12, 12),
 -            help='How many times this Unit of Measure is smaller than the reference Unit of Measure in this category:\n'\
 +            help='How much bigger or smaller this unit is compared to the reference Unit of Measure for this category:\n'\
                      '1 * (reference unit) = ratio * (this unit)'),
          'factor_inv': fields.function(_factor_inv, digits=(12,12),
              fnct_inv=_factor_inv_write,

diff --cc addons/product/product_view.xml
Simple merge

diff --cc addons/purchase/purchase.py
Simple merge

diff --cc addons/stock/product.py
index a9e98ab,34c018c..4d95549
--- 1/addons/stock/product.py
--- 2/addons/stock/product.py
+++ b/addons/stock/product.py
@@@ -370,10 -370,10 +370,10 @@@ class product_product(osv.osv)
                   "stored in the Stock Location of the Warehouse of this Shop, "
                   "or any of its children.\n"
                   "Otherwise, this includes goods stored in any Stock Location "
-                  "typed as 'internal'."),
+                  "with 'internal' type."),
          'virtual_available': fields.function(_product_available, multi='qty_available',
              type='float',  digits_compute=dp.get_precision('Product Unit of Measure'),
 -            string='Future Quantity',
 +            string='Forecasted Quantity',
              help="Forecast quantity (computed as Quantity On Hand "
                   "- Outgoing + Incoming)\n"
                   "In a context with a single Stock Location, this includes "