diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py index d70af4b4d1e..55199a9aa19 100644 --- a/addons/delivery/delivery.py +++ b/addons/delivery/delivery.py @@ -71,7 +71,7 @@ class delivery_carrier(osv.osv): 'free_if_more_than': fields.boolean('Free If More Than'), 'amount': fields.float('Amount'), 'use_detailed_pricelist': fields.boolean('Use Detailed Pricelist'), - 'pricelist_ids': fields.one2many('delivery.grid', 'carrier_id', 'Price List'), + 'pricelist_ids': fields.one2many('delivery.grid', 'carrier_id', 'Advanced Pricing'), } _defaults = { diff --git a/addons/delivery/delivery_demo.xml b/addons/delivery/delivery_demo.xml index 4dfef0c105b..94666efb26c 100644 --- a/addons/delivery/delivery_demo.xml +++ b/addons/delivery/delivery_demo.xml @@ -17,6 +17,7 @@ Delivery by Poste + Delivery service diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml index 72f811632ce..4ade9b321a7 100644 --- a/addons/delivery/delivery_view.xml +++ b/addons/delivery/delivery_view.xml @@ -9,7 +9,6 @@ tree - @@ -22,10 +21,9 @@
- - + @@ -82,7 +80,7 @@ Define the delivery methods you are using and their pricing in order to reinvoice the delivery costs when you are doing invoicing based on delivery orders - + @@ -132,7 +130,7 @@ tree,form The delivery price list allows you to compute the cost and sales price of the delivery according to the weight of the products and other criteria. You can define several price lists for one delivery method, per country or a zone in a specific country defined by a postal code range. - + delivery.grid.line.form