From 77331c39cc8c6840c7b1cebeab2dc1321cdb1294 Mon Sep 17 00:00:00 2001 From: Enric Tobella Date: Mon, 9 Apr 2018 10:32:58 +0200 Subject: [PATCH] [IMP] stock_request: Add stock request order --- stock_request/README.rst | 1 + stock_request/__manifest__.py | 7 +- .../data/stock_request_sequence_data.xml | 8 + stock_request/models/__init__.py | 2 + stock_request/models/res_config_settings.py | 14 + stock_request/models/stock_request.py | 113 +++++-- stock_request/models/stock_request_order.py | 249 ++++++++++++++ stock_request/security/ir.model.access.csv | 4 +- .../security/stock_request_security.xml | 45 +++ stock_request/static/description/icon.png | Bin 4857 -> 7510 bytes stock_request/tests/test_stock_request.py | 316 ++++++++++++++++-- .../views/res_config_settings_views.xml | 60 ++++ stock_request/views/stock_request_menu.xml | 27 ++ .../views/stock_request_order_views.xml | 137 ++++++++ stock_request/views/stock_request_views.xml | 14 +- 15 files changed, 926 insertions(+), 71 deletions(-) create mode 100644 stock_request/models/res_config_settings.py create mode 100644 stock_request/models/stock_request_order.py create mode 100644 stock_request/views/res_config_settings_views.xml create mode 100644 stock_request/views/stock_request_menu.xml create mode 100644 stock_request/views/stock_request_order_views.xml diff --git a/stock_request/README.rst b/stock_request/README.rst index f3d0cca06..34182e2ed 100644 --- a/stock_request/README.rst +++ b/stock_request/README.rst @@ -71,6 +71,7 @@ Contributors ------------ * Jordi Ballester (EFICENT) . +* Enric Tobella Maintainer ---------- diff --git a/stock_request/__manifest__.py b/stock_request/__manifest__.py index 309374eb5..c0c885040 100644 --- a/stock_request/__manifest__.py +++ b/stock_request/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Stock Request", "summary": "Internal request for stock", - "version": "11.0.1.0.0", + "version": "11.0.2.0.0", "license": "LGPL-3", "website": "https://github.com/stock-logistics-warehouse", "author": "Eficent, " @@ -20,7 +20,10 @@ "views/stock_request_allocation_views.xml", "views/stock_move_views.xml", "views/stock_picking_views.xml", - "data/stock_request_sequence_data.xml" + "views/stock_request_order_views.xml", + "views/res_config_settings_views.xml", + "views/stock_request_menu.xml", + "data/stock_request_sequence_data.xml", ], "installable": True, } diff --git a/stock_request/data/stock_request_sequence_data.xml b/stock_request/data/stock_request_sequence_data.xml index 3f2f9fd8a..985be8057 100644 --- a/stock_request/data/stock_request_sequence_data.xml +++ b/stock_request/data/stock_request_sequence_data.xml @@ -10,5 +10,13 @@ + + Stock Request Order + stock.request.order + SRO/ + 5 + + + diff --git a/stock_request/models/__init__.py b/stock_request/models/__init__.py index a7e453e0c..36e050a25 100644 --- a/stock_request/models/__init__.py +++ b/stock_request/models/__init__.py @@ -1,7 +1,9 @@ from . import stock_request from . import stock_request_allocation +from . import stock_request_order from . import stock_move from . import stock_picking from . import procurement_rule from . import stock_move_line +from . import res_config_settings diff --git a/stock_request/models/res_config_settings.py b/stock_request/models/res_config_settings.py new file mode 100644 index 000000000..74220d880 --- /dev/null +++ b/stock_request/models/res_config_settings.py @@ -0,0 +1,14 @@ +# Copyright 2018 Creu Blanca +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). + +from odoo import fields, models + + +class ResConfigSettings(models.TransientModel): + _inherit = 'res.config.settings' + + group_stock_request_order = fields.Boolean( + implied_group='stock_request.group_stock_request_order') + + module_stock_request_purchase = fields.Boolean( + string='Stock requests for purchase') diff --git a/stock_request/models/stock_request.py b/stock_request/models/stock_request.py index af8615424..3833890f9 100644 --- a/stock_request/models/stock_request.py +++ b/stock_request/models/stock_request.py @@ -36,8 +36,9 @@ class StockRequest(models.Model): @api.depends('product_id', 'product_uom_id', 'product_uom_qty') def _compute_product_qty(self): - self.product_qty = self.product_uom_id._compute_quantity( - self.product_uom_qty, self.product_id.uom_id) + for rec in self: + rec.product_qty = rec.product_uom_id._compute_quantity( + rec.product_uom_qty, rec.product_id.uom_id) name = fields.Char( 'Name', copy=False, required=True, readonly=True, @@ -138,12 +139,24 @@ class StockRequest(models.Model): route_id = fields.Many2one('stock.location.route', string='Route', readonly=True, states={'draft': [('readonly', False)]}, + domain="[('id', 'in', route_ids)]", ondelete='restrict') + route_ids = fields.Many2many( + 'stock.location.route', string='Route', + compute='_compute_route_ids', + readonly=True, + ) + allocation_ids = fields.One2many(comodel_name='stock.request.allocation', inverse_name='stock_request_id', string='Stock Request Allocation') + order_id = fields.Many2one( + 'stock.request.order', + readonly=True, + ) + _sql_constraints = [ ('name_uniq', 'unique(name, company_id)', 'Stock Request name must be unique'), @@ -177,6 +190,21 @@ class StockRequest(models.Model): request.product_id.uom_id._compute_quantity( open_qty, request.product_uom_id) + @api.depends('product_id', 'warehouse_id', 'location_id') + def _compute_route_ids(self): + for record in self: + routes = self.env['stock.location.route'] + if record.product_id: + routes += record.product_id.mapped( + 'route_ids') | record.product_id.mapped( + 'categ_id').mapped('total_route_ids') + if record.warehouse_id: + routes |= self.env['stock.location.route'].search( + [('warehouse_ids', 'in', record.warehouse_id.ids)]) + parents = record.get_parents().ids + record.route_ids = routes.filtered(lambda r: any( + p.location_id.id in parents for p in r.pull_ids)) + def get_parents(self): location = self.location_id.sudo() result = location @@ -196,26 +224,65 @@ class StockRequest(models.Model): 'same category than the default unit ' 'of measure of the product')) - def _get_valid_routes(self): - routes = self.env['stock.location.route'] - if self.product_id: - routes += self.product_id.mapped( - 'route_ids') | self.product_id.mapped( - 'categ_id').mapped('total_route_ids') - if self.warehouse_id: - routes |= self.env['stock.location.route'].search( - [('warehouse_ids', 'in', self.warehouse_id.ids)]) - parents = self.get_parents().ids - routes = routes.filtered(lambda r: any( - p.location_id.id in parents for p in r.pull_ids)) - return routes + @api.constrains('order_id', 'requested_by') + def check_order_requested_by(self): + if self.order_id and self.order_id.requested_by != self.requested_by: + raise ValidationError(_( + 'Requested by must be equal to the order' + )) + + @api.constrains('order_id', 'warehouse_id') + def check_order_warehouse_id(self): + if self.order_id and self.order_id.warehouse_id != self.warehouse_id: + raise ValidationError(_( + 'Warehouse must be equal to the order' + )) + + @api.constrains('order_id', 'location_id') + def check_order_location(self): + if self.order_id and self.order_id.location_id != self.location_id: + raise ValidationError(_( + 'Location must be equal to the order' + )) + + @api.constrains('order_id', 'procurement_group_id') + def check_order_procurement_group(self): + if ( + self.order_id and + self.order_id.procurement_group_id != self.procurement_group_id + ): + raise ValidationError(_( + 'Procurement group must be equal to the order' + )) + + @api.constrains('order_id', 'company_id') + def check_order_company(self): + if self.order_id and self.order_id.company_id != self.company_id: + raise ValidationError(_( + 'Company must be equal to the order' + )) + + @api.constrains('order_id', 'expected_date') + def check_order_expected_date(self): + if self.order_id and self.order_id.expected_date != self.expected_date: + raise ValidationError(_( + 'Expected date must be equal to the order' + )) + + @api.constrains('order_id', 'picking_policy') + def check_order_picking_policy(self): + if ( + self.order_id and + self.order_id.picking_policy != self.picking_policy + ): + raise ValidationError(_( + 'The picking policy must be equal to the order' + )) @api.onchange('warehouse_id') def onchange_warehouse_id(self): """ Finds location id for changed warehouse. """ res = {'domain': {}} - routes = self._get_valid_routes() - res['domain']['route_id'] = [('id', 'in', routes.ids)] if self.warehouse_id: # search with sudo because the user may not have permissions loc_wh = self.location_id.sudo().get_warehouse() @@ -228,8 +295,6 @@ class StockRequest(models.Model): @api.onchange('location_id') def onchange_location_id(self): res = {'domain': {}} - routes = self._get_valid_routes() - res['domain']['route_id'] = [('id', 'in', routes.ids)] if self.location_id: loc_wh = self.location_id.get_warehouse() if self.warehouse_id != loc_wh: @@ -254,8 +319,6 @@ class StockRequest(models.Model): @api.onchange('product_id') def onchange_product_id(self): res = {'domain': {}} - routes = self._get_valid_routes() - res['domain']['route_id'] = [('id', 'in', routes.ids)] if self.product_id: self.product_uom_id = self.product_id.uom_id.id res['domain']['product_uom_id'] = [ @@ -285,6 +348,8 @@ class StockRequest(models.Model): def action_done(self): self.state = 'done' + if self.order_id: + self.order_id.check_done() return True def check_done(self): @@ -373,3 +438,9 @@ class StockRequest(models.Model): (self.env.ref('stock.view_picking_form').id, 'form')] action['res_id'] = pickings.id return action + + @api.multi + def unlink(self): + if self.filtered(lambda r: r.state != 'draft'): + raise UserError(_('Only requests on draft state can be unlinked')) + return super(StockRequest, self).unlink() diff --git a/stock_request/models/stock_request_order.py b/stock_request/models/stock_request_order.py new file mode 100644 index 000000000..cd76013de --- /dev/null +++ b/stock_request/models/stock_request_order.py @@ -0,0 +1,249 @@ +# Copyright 2018 Creu Blanca +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). + +from odoo import api, fields, models, _ +from odoo.exceptions import UserError + +REQUEST_STATES = [ + ('draft', 'Draft'), + ('open', 'In progress'), + ('done', 'Done'), + ('cancel', 'Cancelled')] + + +class StockRequestOrder(models.Model): + _name = 'stock.request.order' + _description = 'Stock Request Order' + _inherit = ['mail.thread', 'mail.activity.mixin'] + + @api.model + def default_get(self, fields): + res = super().default_get(fields) + warehouse = None + if 'warehouse_id' not in res and res.get('company_id'): + warehouse = self.env['stock.warehouse'].search( + [('company_id', '=', res['company_id'])], limit=1) + if warehouse: + res['warehouse_id'] = warehouse.id + res['location_id'] = warehouse.lot_stock_id.id + return res + + def _get_default_requested_by(self): + return self.env['res.users'].browse(self.env.uid) + + name = fields.Char( + 'Name', copy=False, required=True, readonly=True, + states={'draft': [('readonly', False)]}, + default=lambda self: self.env['ir.sequence'].next_by_code( + 'stock.request.order')) + state = fields.Selection(selection=REQUEST_STATES, string='Status', + copy=False, default='draft', index=True, + readonly=True, track_visibility='onchange', + ) + requested_by = fields.Many2one( + 'res.users', 'Requested by', required=True, + track_visibility='onchange', + default=lambda s: s._get_default_requested_by(), + ) + warehouse_id = fields.Many2one( + 'stock.warehouse', 'Warehouse', readonly=True, + ondelete="cascade", required=True, + states={'draft': [('readonly', False)]}) + location_id = fields.Many2one( + 'stock.location', 'Location', readonly=True, + domain=[('usage', 'in', ['internal', 'transit'])], + ondelete="cascade", required=True, + states={'draft': [('readonly', False)]}, + ) + procurement_group_id = fields.Many2one( + 'procurement.group', 'Procurement Group', readonly=True, + states={'draft': [('readonly', False)]}, + help="Moves created through this stock request will be put in this " + "procurement group. If none is given, the moves generated by " + "procurement rules will be grouped into one big picking.", + ) + company_id = fields.Many2one( + 'res.company', 'Company', required=True, readonly=True, + states={'draft': [('readonly', False)]}, + default=lambda self: self.env['res.company']._company_default_get( + 'stock.request.order'), + ) + expected_date = fields.Datetime( + 'Expected date', default=fields.Datetime.now, index=True, + required=True, readonly=True, + states={'draft': [('readonly', False)]}, + help="Date when you expect to receive the goods.", + ) + picking_policy = fields.Selection([ + ('direct', 'Receive each product when available'), + ('one', 'Receive all products at once')], + string='Shipping Policy', required=True, readonly=True, + states={'draft': [('readonly', False)]}, + default='direct', + ) + move_ids = fields.One2many(comodel_name='stock.move', + compute='_compute_move_ids', + string='Stock Moves', readonly=True, + ) + picking_ids = fields.One2many('stock.picking', + compute='_compute_picking_ids', + string='Pickings', readonly=True, + ) + picking_count = fields.Integer(string='Delivery Orders', + compute='_compute_picking_ids', + readonly=True, + ) + stock_request_ids = fields.One2many( + 'stock.request', + inverse_name='order_id', + ) + stock_request_count = fields.Integer( + string='Stock requests', + compute='_compute_stock_request_count', + readonly=True, + ) + + _sql_constraints = [ + ('name_uniq', 'unique(name, company_id)', + 'Stock Request name must be unique'), + ] + + @api.depends('stock_request_ids.allocation_ids') + def _compute_picking_ids(self): + for record in self: + record.picking_ids = record.stock_request_ids.mapped('picking_ids') + record.picking_count = len(record.picking_ids) + + @api.depends('stock_request_ids') + def _compute_move_ids(self): + for record in self: + record.move_ids = record.stock_request_ids.mapped('move_ids') + + @api.depends('stock_request_ids') + def _compute_stock_request_count(self): + for record in self: + record.stock_request_count = len(record.stock_request_ids) + + @api.onchange('requested_by') + def onchange_requested_by(self): + self.change_childs() + + @api.onchange('expected_date') + def onchange_expected_date(self): + self.change_childs() + + @api.onchange('picking_policy') + def onchange_picking_policy(self): + self.change_childs() + + @api.onchange('location_id') + def onchange_location_id(self): + if self.location_id: + loc_wh = self.location_id.sudo().get_warehouse() + if loc_wh and self.warehouse_id != loc_wh: + self.warehouse_id = loc_wh + self.with_context( + no_change_childs=True).onchange_warehouse_id() + self.change_childs() + + @api.onchange('warehouse_id') + def onchange_warehouse_id(self): + if self.warehouse_id: + # search with sudo because the user may not have permissions + loc_wh = self.location_id.sudo().get_warehouse() + if self.warehouse_id != loc_wh: + self.location_id = self.warehouse_id.sudo().lot_stock_id + self.with_context(no_change_childs=True).onchange_location_id() + if self.warehouse_id.sudo().company_id != self.company_id: + self.company_id = self.warehouse_id.company_id + self.with_context(no_change_childs=True).onchange_company_id() + self.change_childs() + + @api.onchange('procurement_group_id') + def onchange_procurement_group_id(self): + self.change_childs() + + @api.onchange('company_id') + def onchange_company_id(self): + if self.company_id and ( + not self.warehouse_id or + self.warehouse_id.sudo().company_id != self.company_id + ): + self.warehouse_id = self.env['stock.warehouse'].search( + [('company_id', '=', self.company_id.id)], limit=1) + self.with_context(no_change_childs=True).onchange_warehouse_id() + self.change_childs() + return { + 'domain': { + 'warehouse_id': [('company_id', '=', self.company_id.id)]}} + + def change_childs(self): + if not self._context.get('no_change_childs', False): + for line in self.stock_request_ids: + line.warehouse_id = self.warehouse_id + line.location_id = self.location_id + line.company_id = self.company_id + line.picking_policy = self.picking_policy + line.expected_date = self.expected_date + line.requested_by = self.requested_by + line.procurement_group_id = self.procurement_group_id + + @api.multi + def action_confirm(self): + for line in self.stock_request_ids: + line.action_confirm() + self.state = 'open' + return True + + def action_draft(self): + for line in self.stock_request_ids: + line.action_draft() + self.state = 'draft' + return True + + def action_cancel(self): + for line in self.stock_request_ids: + line.action_cancel() + self.state = 'cancel' + return True + + def action_done(self): + self.state = 'done' + return True + + def check_done(self): + if not self.stock_request_ids.filtered(lambda r: r.state != 'done'): + self.action_done() + return + + @api.multi + def action_view_transfer(self): + action = self.env.ref('stock.action_picking_tree_all').read()[0] + + pickings = self.mapped('picking_ids') + if len(pickings) > 1: + action['domain'] = [('id', 'in', pickings.ids)] + elif pickings: + action['views'] = [ + (self.env.ref('stock.view_picking_form').id, 'form')] + action['res_id'] = pickings.id + return action + + @api.multi + def action_view_stock_requests(self): + action = self.env.ref( + 'stock_request.action_stock_request_form').read()[0] + if len(self.stock_request_ids) > 1: + action['domain'] = [('order_id', 'in', self.ids)] + elif self.stock_request_ids: + action['views'] = [ + (self.env.ref( + 'stock_request.view_stock_request_form').id, 'form')] + action['res_id'] = self.stock_request_ids.id + return action + + @api.multi + def unlink(self): + if self.filtered(lambda r: r.state != 'draft'): + raise UserError(_('Only orders on draft state can be unlinked')) + return super().unlink() diff --git a/stock_request/security/ir.model.access.csv b/stock_request/security/ir.model.access.csv index ca66a1a53..4a92b001b 100644 --- a/stock_request/security/ir.model.access.csv +++ b/stock_request/security/ir.model.access.csv @@ -5,9 +5,9 @@ access_stock_request_stock_user,stock.request stock user,model_stock_request,sto access_stock_request_allocation_user,stock request allocation user,model_stock_request_allocation,group_stock_request_user,1,1,1,1 access_stock_request_allocation_manager,stock request allocation manager,model_stock_request_allocation,group_stock_request_manager,1,1,1,1 access_stock_request_allocation_stock_user,stock.request.allocation stock user,model_stock_request_allocation,stock.group_stock_user,1,0,0,0 -access_stock_request_manager,stock request manager,model_stock_request,group_stock_request_manager,1,1,1,1 -access_stock_warehouse_user,stock.warehouse.user,stock.model_stock_warehouse,group_stock_request_user,1,0,0,0 access_stock_location_user,stock.location.user,stock.model_stock_location,group_stock_request_user,1,0,0,0 access_stock_location_request_manager,stock.location request manager,stock.model_stock_location,group_stock_request_manager,1,0,0,0 access_procurement_rule_request_manager,procurement_rule request_manager,stock.model_procurement_rule,group_stock_request_manager,1,0,0,0 access_procurement_rule,procurement.rule.flow,stock.model_procurement_rule,group_stock_request_user,1,0,0,0 +access_stock_request_order_user,stock request user,model_stock_request_order,stock_request.group_stock_request_user,1,1,1,0 +access_stock_request_order_manager,stock request manager,model_stock_request_order,stock_request.group_stock_request_manager,1,1,1,1 diff --git a/stock_request/security/stock_request_security.xml b/stock_request/security/stock_request_security.xml index ecb96c13e..827788eb5 100644 --- a/stock_request/security/stock_request_security.xml +++ b/stock_request/security/stock_request_security.xml @@ -21,6 +21,11 @@ + + Stock Request Order + + + @@ -67,6 +72,46 @@ + + + stock_request_order multi-company + + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + + + Follow Stock Request Order + + + + + + + ['|',('requested_by','=',user.id), + ('message_partner_ids', 'in', [user.partner_id.id])] + + + + Stock Request Order User + + + + + + + [('requested_by','=',user.id)] + + + + Stock Request Manager + + + + + + + diff --git a/stock_request/static/description/icon.png b/stock_request/static/description/icon.png index a7c11c7a1e3df3654b45284d5b92ca7c86e56b4e..c31ecfd9f58e3ab7e0ede0f1d56185d51074099c 100644 GIT binary patch literal 7510 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 literal 4857 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 + + + + + + + res.config.settings.view.form.inherit.medical + res.config.settings + + + +
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+
+ + + + + + Settings + ir.actions.act_window + res.config.settings + form + inline + {'module' : 'stock_request'} + + + + diff --git a/stock_request/views/stock_request_menu.xml b/stock_request/views/stock_request_menu.xml new file mode 100644 index 000000000..c90445b14 --- /dev/null +++ b/stock_request/views/stock_request_menu.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + diff --git a/stock_request/views/stock_request_order_views.xml b/stock_request/views/stock_request_order_views.xml new file mode 100644 index 000000000..444e3b902 --- /dev/null +++ b/stock_request/views/stock_request_order_views.xml @@ -0,0 +1,137 @@ + + + + + stock.request.order.tree + stock.request.order + + + + + + + + + + + + stock.request.order.form + stock.request.order + +
+
+
+ +
+ + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+
+ + + + + Stock request orders + ir.actions.act_window + stock.request.order + form + tree,form + + + diff --git a/stock_request/views/stock_request_views.xml b/stock_request/views/stock_request_views.xml index 9734edc16..2e748a712 100644 --- a/stock_request/views/stock_request_views.xml +++ b/stock_request/views/stock_request_views.xml @@ -82,6 +82,7 @@ + @@ -93,6 +94,7 @@ + @@ -128,16 +130,4 @@ - - - -