Merge lp:~openerp-dev/openobject-addons/trunk-sale-action-ship-create-al into lp:openobject-addons

[Antony Lesuisse (OpenERP)]

Example of refactoring

=== modified file 'sale/sale.py'
--- sale/sale.py	2011-09-24 11:25:29 +0000
+++ sale/sale.py	2011-09-26 22:57:25 +0000
@@ -673,9 +673,24 @@
                 return False
             return canceled
 
+    def action_ship_create_picking(self, cr, uid, order):
+        pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out')
+        picking_id = self.pool.get('stock.picking').create(cr, uid, {
+            'name': pick_name,
+            'origin': order.name,
+            'type': 'out',
+            'state': 'auto',
+            'move_type': order.picking_policy,
+            'sale_id': order.id,
+            'address_id': order.partner_shipping_id.id,
+            'note': order.note,
+            'invoice_state': (order.order_policy=='picking' and '2binvoiced') or 'none',
+            'company_id': order.company_id.id,
+        })
+        return picking_id
+
     def action_ship_create(self, cr, uid, ids, *args):
         wf_service = netsvc.LocalService("workflow")
-        picking_id = False
         move_obj = self.pool.get('stock.move')
         proc_obj = self.pool.get('procurement.order')
         company = self.pool.get('res.users').browse(cr, uid, uid).company_id
@@ -694,19 +709,7 @@
                 if line.product_id and line.product_id.product_tmpl_id.type in ('product', 'consu'):
                     location_id = order.shop_id.warehouse_id.lot_stock_id.id
                     if not picking_id:
-                        pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out')
-                        picking_id = self.pool.get('stock.picking').create(cr, uid, {
-                            'name': pick_name,
-                            'origin': order.name,
-                            'type': 'out',
-                            'state': 'auto',
-                            'move_type': order.picking_policy,
-                            'sale_id': order.id,
-                            'address_id': order.partner_shipping_id.id,
-                            'note': order.note,
-                            'invoice_state': (order.order_policy=='picking' and '2binvoiced') or 'none',
-                            'company_id': order.company_id.id,
-                        })
+                        picking_id = action_ship_create_picking(cr,uid,order)
                     move_id = self.pool.get('stock.move').create(cr, uid, {
                         'name': line.name[:64],
                         'picking_id': picking_id,