[MERGE] delivery: cleanup yml

[odoo/odoo.git] / addons / delivery / sale.py

diff --git a/addons/delivery/sale.py b/addons/delivery/sale.py
index 2640035..86fb261 100644 (file)
--- a/addons/delivery/sale.py
+++ b/addons/delivery/sale.py
@@ -18,16 +18,15 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import netsvc
-from osv import fields, osv
+from osv import fields,osv
 
 
 # Overloaded sale_order to manage carriers :
 class sale_order(osv.osv):
     _inherit = 'sale.order'
     _columns = {
-        'carrier_id':fields.many2one("delivery.carrier", "Delivery method", help="Complete this field if you plan to invoice the shipping based on picking."),
-        'id': fields.integer('ID', readonly=True, invisible=True),
+        'carrier_id':fields.many2one("delivery.carrier", "Delivery Method", help="Complete this field if you plan to invoice the shipping based on picking."),
+        'id': fields.integer('ID', readonly=True,invisible=True),
     }
 
     def onchange_partner_id(self, cr, uid, ids, part):
@@ -37,19 +36,13 @@ class sale_order(osv.osv):
             result['value']['carrier_id'] = dtype
         return result
 
-    def action_ship_create(self, cr, uid, ids, *args):
-        result = super(sale_order, self).action_ship_create(cr, uid, ids, *args)
-        for order in self.browse(cr, uid, ids, context={}):
-            pids = [ x.id for x in order.picking_ids]
-            self.pool.get('stock.picking').write(cr, uid, pids, {
-                'carrier_id':order.carrier_id.id,
-            })
+    def _prepare_order_picking(self, cr, uid, order, context=None):
+        result = super(sale_order, self)._prepare_order_picking(cr, uid, order, context=context)
+        result.update(carrier_id=order.carrier_id.id)
         return result
-sale_order()
-
-
 
 
+sale_order()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: