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 @@