diff --git a/addons/account/product.py b/addons/account/product.py index 57ca99b73c4..0a6a0eda10c 100644 --- a/addons/account/product.py +++ b/addons/account/product.py @@ -60,14 +60,14 @@ class product_template(osv.osv): relation='account.account', string="Income Account", view_load=True, - help="This account will be used to value outgoing stock using sale price."), + help="This account will be used for invoices instead of the default one to value sales for the current product."), 'property_account_expense': fields.property( 'account.account', type='many2one', relation='account.account', string="Expense Account", view_load=True, - help="This account will be used to value outgoing stock using cost price."), + help="This account will be used for invoices instead of the default one to value expenses for the current product."), } product_template() diff --git a/addons/account_anglo_saxon/product.py b/addons/account_anglo_saxon/product.py index a2a5f7e6e95..87ca24753d6 100644 --- a/addons/account_anglo_saxon/product.py +++ b/addons/account_anglo_saxon/product.py @@ -38,14 +38,14 @@ class product_category(osv.osv): relation='account.account', string="Income Account", view_load=True, - help="This account will be used to value outgoing stock for the current product category using sale price"), + help="This account will be used to value outgoing stock using sale price."), 'property_account_expense_categ': fields.property( 'account.account', type='many2one', relation='account.account', string="Expense Account", view_load=True, - help="This account will be used to value outgoing stock for the current product category using cost price"), + help="This account will be used to value outgoing stock using cost price."), } product_category() @@ -68,14 +68,14 @@ class product_template(osv.osv): relation='account.account', string="Income Account", view_load=True, - help="This account will be used to value outgoing stock for the current product category using sale price"), + help="This account will be used to value outgoing stock using sale price."), 'property_account_expense': fields.property( 'account.account', type='many2one', relation='account.account', string="Expense Account", view_load=True, - help="This account will be used to value outgoing stock for the current product category using cost price"), + help="This account will be used to value outgoing stock using cost price."), } product_template() diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index 9f31bb289e4..597ba3b9da1 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -1297,7 +1297,7 @@ class product_product(osv.osv): _columns = { 'income_pdt': fields.boolean('Point of Sale Cash In', help="Check if, this is a product you can use to put cash into a statement for the point of sale backend."), - 'expense_pdt': fields.boolean('Point of Sale Cash Out', help="Check if, this is a product you can use to take cash from a statement for the point of sale backend, exemple: money lost, transfer to bank, etc."), + 'expense_pdt': fields.boolean('Point of Sale Cash Out', help="Check if, this is a product you can use to take cash from a statement for the point of sale backend, example: money lost, transfer to bank, etc."), 'pos_categ_id': fields.many2one('pos.category','Point of Sale Category', help="If you want to sell this product through the point of sale, select the category it belongs to."), 'to_weight' : fields.boolean('To Weigh', help="Check if the product should be weighted (mainly used with self check-out interface)."), diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index edd8677fc51..c1b228a877e 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -634,9 +634,10 @@ class product_template(osv.osv): _columns = { '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. \n'Make 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. Buy: When procuring the product, a purchase order will be generated."), + '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 --git a/addons/product/product.py b/addons/product/product.py index caa7342d4db..10612afa39f 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -290,7 +290,7 @@ class product_template(osv.osv): 'weight': fields.float('Gross Weight', digits_compute=dp.get_precision('Stock Weight'), help="The gross weight in Kg."), 'weight_net': fields.float('Net Weight', digits_compute=dp.get_precision('Stock Weight'), help="The net weight in Kg."), 'cost_method': fields.selection([('standard','Standard Price'), ('average','Average Price')], 'Costing Method', required=True, - help="Standard Price: The cost price is manually updated at the end of a specific period (usually every year), \nAverage Price: The cost price is recomputed at each incoming shipment."), + help="Standard Price: The cost price is manually updated at the end of a specific period (usually every year). \nAverage Price: The cost price is recomputed at each incoming shipment."), 'warranty': fields.float('Warranty'), 'sale_ok': fields.boolean('Can be Sold', help="Specify if the product can be selected in a sales order line."), 'state': fields.selection([('',''),