[MERGE] OPW 51172

bzr revid: xal@openerp.com-20120221113759-0v5sv8qcpsergeml

diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index aceee36..a46973e 100644 (file)
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -150,7 +150,7 @@ class delivery_grid_line(osv.osv):
     _description = "Delivery Grid Line"
     _columns = {
         'name': fields.char('Name', size=32, required=True),
-        'grid_id': fields.many2one('delivery.grid', 'Grid',required=True),
+        'grid_id': fields.many2one('delivery.grid', 'Grid',required=True, ondelete='cascade'),
         'type': fields.selection([('weight','Weight'),('volume','Volume'),('wv','Weight * Volume'), ('price','Price')], 'Variable', required=True),
         'operator': fields.selection([('==','='),('<=','<='),('>=','>=')], 'Operator', required=True),
         'max_value': fields.float('Maximum Value', required=True),