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 @@ - Run Stock Minimum Rules Only + Run Reordering Rules procurement.orderpoint.compute @@ -20,7 +20,7 @@ - - Stock Valuation + Inventory at Date wizard.valuation.history - 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. - Retrieve the stock valuation of your products at current day + Retrieve the curent stock valuation. @@ -28,14 +25,14 @@ - Stock Valuation + Inventory at Date wizard.valuation.history form form new - + Stock Value At Date 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'), }
- 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.
- Retrieve the stock valuation of your products at current day + Retrieve the curent stock valuation.