Merge lp:~openerp-dev/openobject-addons/7.0-595240-opw-skh into lp:openobject-addons/7.0

[Somesh Khare]

Hello Sir,

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

Steps To reproduce:
1. Install Delivery module.
2. Create a Sale Order and add the carrier information in the Sale Order, after clicking on "Add in Quote" button (See Carrier information becomes blank)
3. Now confirm the Sale Order and see the carrier information on the created "Delivery Order" (No carrier information).

You can also see the bug: https://bugs.launchpad.net/openobject-addons/+bug/1192115 for more information. Root of the problem is line 76 in delivery/sale.py where def delivery_set() method make the carrier_id as False.

This branch fixes this issue. Kindly review the branch and please share your view.

Thanks & Regards,
Somesh Khare

[Naresh(OpenERP) (nch-openerp)]

review: Approve

Unmerged revisions

9312. By Somesh Khare(OpenERP) <email address hidden> on 2013-07-24

[FIX]Delivery: carrier information not propagated from sale order to pickings (Case: ref 595240)

=== modified file 'delivery/sale.py'
--- delivery/sale.py	2013-06-07 11:38:29 +0000
+++ delivery/sale.py	2013-08-19 07:06:56 +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()