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

[Laurent Mignon (Acsone)]

[FIX] https://bugs.launchpad.net/e-commerce-addons/+bug/1280131

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

LGTM
Thanks

review: Approve (code review)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

LGTM

review: Approve (code review, no tests)

=== modified file 'sale_payment_method/migrations/0.1/post-migration.py'
--- sale_payment_method/migrations/0.1/post-migration.py	2013-09-26 08:41:34 +0000
+++ sale_payment_method/migrations/0.1/post-migration.py	2014-02-14 11:02:02 +0000
@@ -27,9 +27,10 @@
             "many2many with the name payment_ids")
 
 def migrate(cr, version):
-    cr.execute("INSERT INTO account_voucher_sale_order_rel"
-               "(sale_order_id, account_voucher_id) "
-               "(SELECT id, payment_id FROM "
-               " sale_order "
-               "WHERE payment_id IS NOT NULL )")
+    if version:
+        cr.execute("INSERT INTO account_voucher_sale_order_rel"
+                   "(sale_order_id, account_voucher_id) "
+                   "(SELECT id, payment_id FROM "
+                   " sale_order "
+                   "WHERE payment_id IS NOT NULL )")