Merge lp:~elbati/purchase-wkfl/purchase_delivery_term_ondelete_constraints into lp:~purchase-core-editors/purchase-wkfl/7.0

[Lorenzo Battistini]

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

LGTM

review: Approve (code review, no test)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Seems to be already merged (the change was probably included in another branch).

=== modified file 'purchase_delivery_term/purchase.py'
--- purchase_delivery_term/purchase.py	2013-03-28 17:38:36 +0000
+++ purchase_delivery_term/purchase.py	2013-04-22 14:06:25 +0000
@@ -53,7 +53,7 @@
     _name = 'purchase.delivery.term.line'
     _rec_name = 'term_id'
     _columns = {
-        'term_id': fields.many2one('purchase.delivery.term', 'Term'),
+        'term_id': fields.many2one('purchase.delivery.term', 'Term', ondelete='cascade'),
         'quantity_perc': fields.float('Quantity percentage',
             required=True, help="For 20% set '0.2'"),
         'delay': fields.float('Delivery Lead Time', required=True,
@@ -92,7 +92,7 @@
         'order_id': fields.many2one('purchase.order', 'Order Reference',
             select=True, required=True, ondelete='cascade'),
         'delivery_term_id': fields.many2one('purchase.delivery.term',
-            'Delivery term', required=True),
+            'Delivery term', required=True, ondelete='restrict'),
         'name': fields.char('Description', size=256, required=True),
         'product_id': fields.many2one('product.product', 'Product',
             domain=[('purchase_ok','=',True)], change_default=True),