From 4b6024d3f62a2b9af08506a2d3a0d73aafec38b0 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Fri, 2 Aug 2013 16:22:26 +0200
Subject: [PATCH] [FIX]variable name and function typo

bzr revid: csn@openerp.com-20130802142226-mmw62e3hdhp2qzrk
---
 addons/stock_picking_wave/stock_picking_wave.py           | 2 +-
 addons/stock_picking_wave/wizard/picking_to_wave.py       | 8 ++++----
 addons/stock_picking_wave/wizard/picking_to_wave_view.xml | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/stock_picking_wave/stock_picking_wave.py b/addons/stock_picking_wave/stock_picking_wave.py
index ccf300f8535..5411e8beaa6 100644
--- a/addons/stock_picking_wave/stock_picking_wave.py
+++ b/addons/stock_picking_wave/stock_picking_wave.py
@@ -86,5 +86,5 @@ class res_partner(osv.osv):
 class stock_picking_wave_type(osv.osv):
     _name = 'stock.picking.wave.type'
     _columns = {
-        'name': fields.char('Type'),
+        'name': fields.char('Type', required=True),
     }
diff --git a/addons/stock_picking_wave/wizard/picking_to_wave.py b/addons/stock_picking_wave/wizard/picking_to_wave.py
index a946212b15f..03dffb8b9d6 100644
--- a/addons/stock_picking_wave/wizard/picking_to_wave.py
+++ b/addons/stock_picking_wave/wizard/picking_to_wave.py
@@ -27,8 +27,8 @@ class stock_picking_to_wave(osv.osv_memory):
         'wave_id': fields.many2one('stock.picking.wave', 'Picking Wave', required=True),
     }
 
-    def merge(self, cr, uid, ids, context=None):
+    def attach_pickings(self, cr, uid, ids, context=None):
         #use active_ids to add picking line to the selected wave
-        wave = self.browse(cr, uid, ids, context=context)[0].wave_id.id
-        picking = context.get('active_ids', False)
-        return self.pool.get('stock.picking.wave').write(cr, uid, [wave], {'picking_ids': map(lambda x: (4, x, False), picking)}, context=context)
\ No newline at end of file
+        wave_id = self.browse(cr, uid, ids, context=context)[0].wave_id.id
+        picking_ids = context.get('active_ids', False)
+        return self.pool.get('stock.picking').write(cr, uid, picking_ids, {'wave_id': wave_id})
\ No newline at end of file
diff --git a/addons/stock_picking_wave/wizard/picking_to_wave_view.xml b/addons/stock_picking_wave/wizard/picking_to_wave_view.xml
index 01d5ec7188c..62f5b3d0095 100644
--- a/addons/stock_picking_wave/wizard/picking_to_wave_view.xml
+++ b/addons/stock_picking_wave/wizard/picking_to_wave_view.xml
@@ -11,7 +11,7 @@
                     <separator string="Select a wave"/>
                     <field name="wave_id" class="oe_inline"/>
                     <footer>
-                        <button name="merge" type="object" string="Add to wave" class="oe_highlight"/>
+                        <button name="attach_pickings" type="object" string="Add to wave" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
                     </footer>