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

Proposed by Lorenzo Battistini
Status: Merged
Merge reported by: Guewen Baconnier @ Camptocamp
Merged at revision: not available
Proposed branch: lp:~elbati/purchase-wkfl/purchase_delivery_term_ondelete_constraints
Merge into: lp:~purchase-core-editors/purchase-wkfl/7.0
Diff against target: 21 lines (+2/-2)
1 file modified
purchase_delivery_term/purchase.py (+2/-2)
To merge this branch: bzr merge lp:~elbati/purchase-wkfl/purchase_delivery_term_ondelete_constraints
Reviewer Review Type Date Requested Status
Guewen Baconnier @ Camptocamp code review, no test Approve
Review via email: mp+160118@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

LGTM

review: Approve (code review, no test)
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'purchase_delivery_term/purchase.py'
2--- purchase_delivery_term/purchase.py 2013-03-28 17:38:36 +0000
3+++ purchase_delivery_term/purchase.py 2013-04-22 14:06:25 +0000
4@@ -53,7 +53,7 @@
5 _name = 'purchase.delivery.term.line'
6 _rec_name = 'term_id'
7 _columns = {
8- 'term_id': fields.many2one('purchase.delivery.term', 'Term'),
9+ 'term_id': fields.many2one('purchase.delivery.term', 'Term', ondelete='cascade'),
10 'quantity_perc': fields.float('Quantity percentage',
11 required=True, help="For 20% set '0.2'"),
12 'delay': fields.float('Delivery Lead Time', required=True,
13@@ -92,7 +92,7 @@
14 'order_id': fields.many2one('purchase.order', 'Order Reference',
15 select=True, required=True, ondelete='cascade'),
16 'delivery_term_id': fields.many2one('purchase.delivery.term',
17- 'Delivery term', required=True),
18+ 'Delivery term', required=True, ondelete='restrict'),
19 'name': fields.char('Description', size=256, required=True),
20 'product_id': fields.many2one('product.product', 'Product',
21 domain=[('purchase_ok','=',True)], change_default=True),

Subscribers

People subscribed via source and target branches