From 8f1e11ab527ab17b46c1c74fcb4b5efcaeb0b45b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 7 Jul 2016 15:49:11 +0200 Subject: [PATCH] [CLN] stock_picking_wave: cleaning and linting --- addons/stock_picking_wave/__openerp__.py | 20 +++++++++---------- .../data/ir_sequence_data_picking_wave.xml | 13 ------------ .../data/stock_picking_wave_data.xml | 8 ++++++++ .../models/stock_picking_wave.py | 12 +++++------ .../wizard/stock_picking_to_wave.py | 2 +- 5 files changed, 25 insertions(+), 30 deletions(-) delete mode 100644 addons/stock_picking_wave/data/ir_sequence_data_picking_wave.xml diff --git a/addons/stock_picking_wave/__openerp__.py b/addons/stock_picking_wave/__openerp__.py index 5ff2aed752e..4401f5dc6d6 100644 --- a/addons/stock_picking_wave/__openerp__.py +++ b/addons/stock_picking_wave/__openerp__.py @@ -6,19 +6,19 @@ 'version': '1.0', 'category': 'Warehouse', 'description': """ -This module adds the picking wave option in warehouse management. -================================================================= +This module adds the picking wave option in warehouse management +================================================================ """, 'website': 'https://www.odoo.com/page/warehouse', 'depends': ['stock'], - 'data': ['security/ir.model.access.csv', - 'views/stock_picking_wave_views.xml', - 'data/stock_picking_wave_data.xml', - 'data/ir_sequence_data_picking_wave.xml', - 'wizard/stock_picking_to_wave_views.xml', - ], + 'data': [ + 'security/ir.model.access.csv', + 'views/stock_picking_wave_views.xml', + 'data/stock_picking_wave_data.xml', + 'wizard/stock_picking_to_wave_views.xml', + ], 'demo': [ - 'data/stock_picking_wave_demo.xml', - ], + 'data/stock_picking_wave_demo.xml', + ], 'installable': True, } diff --git a/addons/stock_picking_wave/data/ir_sequence_data_picking_wave.xml b/addons/stock_picking_wave/data/ir_sequence_data_picking_wave.xml deleted file mode 100644 index f80128bbfb0..00000000000 --- a/addons/stock_picking_wave/data/ir_sequence_data_picking_wave.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Picking Wave - picking.wave - Wave/ - 5 - - - - diff --git a/addons/stock_picking_wave/data/stock_picking_wave_data.xml b/addons/stock_picking_wave/data/stock_picking_wave_data.xml index 2927713f6b9..bfc677faff6 100644 --- a/addons/stock_picking_wave/data/stock_picking_wave_data.xml +++ b/addons/stock_picking_wave/data/stock_picking_wave_data.xml @@ -7,4 +7,12 @@ Stage Changed + + + Picking Wave + picking.wave + Wave/ + 5 + + diff --git a/addons/stock_picking_wave/models/stock_picking_wave.py b/addons/stock_picking_wave/models/stock_picking_wave.py index d4704fa2762..f565bafa809 100644 --- a/addons/stock_picking_wave/models/stock_picking_wave.py +++ b/addons/stock_picking_wave/models/stock_picking_wave.py @@ -28,6 +28,12 @@ class StockPickingWave(models.Model): ('cancel', 'Cancelled')], default='draft', copy=False, track_visibility='onchange', required=True) + @api.model + def create(self, vals): + if vals.get('name', '/') == '/': + vals['name'] = self.env['ir.sequence'].next_by_code('picking.wave') or '/' + return super(StockPickingWave, self).create(vals) + @api.multi def confirm_picking(self): pickings_todo = self.mapped('picking_ids') @@ -46,12 +52,6 @@ class StockPickingWave(models.Model): raise UserError(_('Nothing to print.')) return self.env["report"].with_context(active_ids=pickings.ids, active_model='stock.picking').get_action(pickings, 'stock.report_picking') - @api.model - def create(self, vals): - if vals.get('name', '/') == '/': - vals['name'] = self.env['ir.sequence'].next_by_code('picking.wave') or '/' - return super(StockPickingWave, self).create(vals) - @api.multi def done(self): pickings = self.mapped('picking_ids').filtered(lambda picking: picking.state not in ('cancel', 'done')) diff --git a/addons/stock_picking_wave/wizard/stock_picking_to_wave.py b/addons/stock_picking_wave/wizard/stock_picking_to_wave.py index eb7c8d2305e..69b53578018 100644 --- a/addons/stock_picking_wave/wizard/stock_picking_to_wave.py +++ b/addons/stock_picking_wave/wizard/stock_picking_to_wave.py @@ -12,7 +12,7 @@ class StockPickingToWave(models.TransientModel): @api.multi def attach_pickings(self): - #use active_ids to add picking line to the selected wave + # use active_ids to add picking line to the selected wave self.ensure_one() picking_ids = self.env.context.get('active_ids') return self.env['stock.picking'].browse(picking_ids).write({'wave_id': self.wave_id.id})