diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index 1b31672c20b..9f95a430f4e 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -98,11 +98,16 @@ class delivery_carrier(osv.osv):
         return False
 
     def create_grid_lines(self, cr, uid, ids, vals, context=None):
-        if context == None:
+        if context is None:
             context = {}
         grid_line_pool = self.pool.get('delivery.grid.line')
         grid_pool = self.pool.get('delivery.grid')
         for record in self.browse(cr, uid, ids, context=context):
+            # if using advanced pricing per destination: do not change
+            if record.use_detailed_pricelist:
+                continue
+			
+            # not using advanced pricing per destination: override grid
             grid_id = grid_pool.search(cr, uid, [('carrier_id', '=', record.id)], context=context)
 
             if grid_id and not (record.normal_price or record.free_if_more_than):
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index c46253777d2..1e47d815084 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -28,9 +28,9 @@
                         <field name="active" select="1"/>
                         <separator string="Pricing Information" colspan="4"/>
                         <group colspan="4" col="4">
-                            <field name="normal_price"/>
+                            <field name="normal_price" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
                             <newline/>
-                            <field name="free_if_more_than"/>
+                            <field name="free_if_more_than" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
                             <field name="amount" attrs="{'required':[('free_if_more_than','&lt;&gt;',False)], 'invisible':[('free_if_more_than','=',False)]}"/>
                         </group>
                         <newline/>