Merge lp:~camptocamp/ocb-addons/ocb-7.0-595240-opw-skh_fix_1192115-afe into lp:ocb-addons

[Alexandre Fayolle - camptocamp]

[FIX] delivery: carrier information not propagated from sale order to pickings.

port of https://code.launchpad.net/~openerp-dev/openobject-addons/7.0-595240-opw-skh/+merge/180790 to OCB

[Holger Brunn (Therp) (hbrunn)]

review: Approve (code review)

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

LGTM

review: Approve (no test, code review)

[Raphaël Valyi - http://www.akretion.com (rvalyi)]

LGTM,

for reference: commit of Quentin bringing the culprit lines altogether without real reason:
https://github.com/akretion/openerp-addons/commit/c98b484699f349fef2f7e258c44a9861fa51b143

review: Approve

=== modified file 'delivery/sale.py'
--- delivery/sale.py	2012-10-23 16:05:04 +0000
+++ delivery/sale.py	2014-03-17 08:38:11 +0000
@@ -72,8 +72,7 @@
                 'tax_id': [(6,0,taxes_ids)],
                 'type': 'make_to_stock'
             })
-        #remove the value of the carrier_id field on the sale order
-        return self.write(cr, uid, ids, {'carrier_id': False}, context=context)
+        return True
         #return {'type': 'ir.actions.act_window_close'} action reload?
 
 sale_order()