e-commerce-addons

Merge lp:~acsone-openerp/e-commerce-addons/7.0-bug-1280131-lmi into lp:~extra-addons-commiter/e-commerce-addons/7.0

  1. 7.0-bug-1280131-lmi
  2. Merge into 7.0
Proposed by Laurent Mignon (Acsone)
Status: Merged
Approved by: Yannick Vaucher @ Camptocamp
Approved revision: 293
Merged at revision: 293
Proposed branch: lp:~acsone-openerp/e-commerce-addons/7.0-bug-1280131-lmi
Merge into: lp:~extra-addons-commiter/e-commerce-addons/7.0
Diff against target: 18 lines (+6/-5)
1 file modified
sale_payment_method/migrations/0.1/post-migration.py (+6/-5)
To merge this branch: bzr merge lp:~acsone-openerp/e-commerce-addons/7.0-bug-1280131-lmi
Reviewer Review Type Date Requested Status
Yannick Vaucher @ Camptocamp code review, no tests Approve
Guewen Baconnier @ Camptocamp code review Approve
Review via email: mp+206422@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

LGTM
Thanks

review: Approve (code review)
Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote :

LGTM

review: Approve (code review, no tests)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'sale_payment_method/migrations/0.1/post-migration.py'
2--- sale_payment_method/migrations/0.1/post-migration.py 2013-09-26 08:41:34 +0000
3+++ sale_payment_method/migrations/0.1/post-migration.py 2014-02-14 11:02:02 +0000
4@@ -27,9 +27,10 @@
5 "many2many with the name payment_ids")
6
7 def migrate(cr, version):
8- cr.execute("INSERT INTO account_voucher_sale_order_rel"
9- "(sale_order_id, account_voucher_id) "
10- "(SELECT id, payment_id FROM "
11- " sale_order "
12- "WHERE payment_id IS NOT NULL )")
13+ if version:
14+ cr.execute("INSERT INTO account_voucher_sale_order_rel"
15+ "(sale_order_id, account_voucher_id) "
16+ "(SELECT id, payment_id FROM "
17+ " sale_order "
18+ "WHERE payment_id IS NOT NULL )")
19

Subscribers

People subscribed via source and target branches