Merge lp:~daniel-watkins-credativ/openobject-addons/686517 into lp:openobject-addons/5.0

[Daniel Watkins (credativ)]

This adds an option to the Return Packing wizard which allows the return location to be specified.

[Dimitri John Ledkov (ex-credativ) (dle-credativ)]

What is the status of this review?
Did this miss the merge window for 5.0 and now 6.0?
Is this fixed in trunk?

I have inherited this code and can work on it.

Unmerged revisions

2882. By Dan Watkins on 2010-12-07

[FIX] stock: Add ability to choose returns location in wizard.wizard_return.

2881. By Dan Watkins on 2010-12-07

[FIX] stock: Code cleanup in wizard.wizard_return.

=== modified file 'stock/wizard/wizard_return.py'
--- stock/wizard/wizard_return.py	2010-12-07 16:31:36 +0000
+++ stock/wizard/wizard_return.py	2010-12-10 13:26:37 +0000
@@ -57,6 +57,13 @@
     else:
         new_invoice_state=pick.invoice_state
     fields['invoice_state']={'string':_('Invoice state'), 'type':'selection', 'default':make_default(new_invoice_state), 'required':True, 'selection':[('2binvoiced', _('to be invoiced')), ('none', _('None'))]}
+    arch_lst.append('<field name="return_location"/>\n<newline/>')
+    fields['return_location'] = {
+        'string': _('Returns Location'),
+        'type': 'many2one',
+        'relation': 'stock.location',
+        'required': True,
+    }
     arch_lst.append('</form>')
     arch.string='\n'.join(arch_lst)
     return res
@@ -82,18 +89,28 @@
                 new_type='out'
             else:
                 new_type='internal'
-            new_picking = pick_obj.copy(cr, uid, pick.id, {'name':'%s (return)' % pick.name,
-                    'move_lines':[], 'state':'draft', 'type':new_type, 
-                    'date':date_cur, 'invoice_state':data['form']['invoice_state'],})
+            new_picking = pick_obj.copy(cr, uid, pick.id, {
+                            'name': '%s (return)' % pick.name,
+                            'move_lines': [],
+                            'state': 'draft',
+                            'type': new_type,
+                            'date': date_cur,
+                            'invoice_state': data['form']['invoice_state'],
+                        })
         new_location = move.location_dest_id.id
 
         new_move = move_obj.copy(cr, uid, move.id, {
             'product_qty': move_qty,
-            'product_uos_qty': uom_obj._compute_qty(cr, uid, move.product_uom.id,
-                move_qty, move.product_uos.id),
-            'picking_id':new_picking, 'state':'draft',
-            'location_id':new_location, 'location_dest_id':move.location_id.id,
-            'date':date_cur, 'date_planned':date_cur,})
+            'product_uos_qty': uom_obj._compute_qty(
+                                    cr, uid, move.product_uom.id, move_qty,
+                                    move.product_uos.id),
+            'picking_id': new_picking,
+            'state': 'draft',
+            'location_id': new_location,
+            'location_dest_id': data['form']['return_location'],
+            'date': date_cur,
+            'date_planned': date_cur,
+        })
     if new_picking:
         wf_service = netsvc.LocalService("workflow")
         if new_picking: