Arnold Moyaux
7dda6bb927
The rational is: Currently we have 2 columns. One for reservation, the other for quantity picked. However in real time, either you follow the reservation and everything goes well. Otherwise you pick something else. In the case where you pick somewhere else than reserved, you would like to modify the reservation to have something similar and free the quantity you didn't pick and expect the system to not suggest the ones you took. In other hand, we always want to have the reserve quantity similar to the done. On top, having two columns could be confusing for the end user. The cons: -The qty_done column could be use during the picking, to remember if something has been pick or still to pick. - For some flow (put in pack), it's easier to write a part of the quantity to pack and still want to reserve the full amount of product. We goes back and choose a ligther interface over complex feature. Changes: Qty done and reserved qty are merged into a single column. A new checkbox on the move exists to mark it as picked or not Since the reservation always follow the quantity, it's now possible to have more reserved quantity than stock. However the system will never propose it and the inventory showing reserved > quantity should be a warning. The system should never modify a move that has been picked. We don't want to overide the user action. Regression: Not able to pick a single stock.move.line closes odoo/odoo#137864 Related: odoo/enterprise#48709 Related: odoo/upgrade#5310 Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
74 lines
3.5 KiB
Python
74 lines
3.5 KiB
Python
# -*- coding: utf-8 -*-
|
|
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
|
|
from odoo import _, api, fields, models
|
|
|
|
|
|
class StockScrap(models.Model):
|
|
_inherit = 'stock.scrap'
|
|
|
|
production_id = fields.Many2one(
|
|
'mrp.production', 'Manufacturing Order',
|
|
check_company=True)
|
|
workorder_id = fields.Many2one(
|
|
'mrp.workorder', 'Work Order',
|
|
check_company=True) # Not to restrict or prefer quants, but informative
|
|
product_is_kit = fields.Boolean(related='product_id.is_kits')
|
|
product_template = fields.Many2one(related='product_id.product_tmpl_id')
|
|
bom_id = fields.Many2one(
|
|
'mrp.bom', 'Kit',
|
|
domain="[('type', '=', 'phantom'), '|', ('product_id', '=', product_id), '&', ('product_id', '=', False), ('product_tmpl_id', '=', product_template)]",
|
|
check_company=True)
|
|
|
|
@api.onchange('workorder_id')
|
|
def _onchange_workorder_id(self):
|
|
if self.workorder_id:
|
|
self.location_id = self.workorder_id.production_id.location_src_id.id
|
|
|
|
@api.onchange('production_id')
|
|
def _onchange_production_id(self):
|
|
if self.production_id:
|
|
self.location_id = self.production_id.move_raw_ids.filtered(lambda x: x.state not in ('done', 'cancel')) and self.production_id.location_src_id.id or self.production_id.location_dest_id.id
|
|
|
|
def _prepare_move_values(self):
|
|
vals = super(StockScrap, self)._prepare_move_values()
|
|
if self.production_id:
|
|
vals['origin'] = vals['origin'] or self.production_id.name
|
|
if self.product_id in self.production_id.move_finished_ids.mapped('product_id'):
|
|
vals.update({'production_id': self.production_id.id})
|
|
else:
|
|
vals.update({'raw_material_production_id': self.production_id.id})
|
|
return vals
|
|
|
|
@api.onchange('lot_id')
|
|
def _onchange_serial_number(self):
|
|
if self.product_id.tracking == 'serial' and self.lot_id:
|
|
if self.production_id:
|
|
message, recommended_location = self.env['stock.quant']._check_serial_number(self.product_id,
|
|
self.lot_id,
|
|
self.company_id,
|
|
self.location_id,
|
|
self.production_id.location_dest_id)
|
|
if message:
|
|
if recommended_location:
|
|
self.location_id = recommended_location
|
|
return {'warning': {'title': _('Warning'), 'message': message}}
|
|
else:
|
|
return super()._onchange_serial_number()
|
|
|
|
@api.depends('move_ids', 'move_ids.move_line_ids.quantity', 'product_id')
|
|
def _compute_scrap_qty(self):
|
|
self.scrap_qty = 1
|
|
for scrap in self:
|
|
if not scrap.bom_id:
|
|
return super(StockScrap, scrap)._compute_scrap_qty()
|
|
if scrap.move_ids:
|
|
filters = {
|
|
'incoming_moves': lambda m: True,
|
|
'outgoing_moves': lambda m: False
|
|
}
|
|
scrap.scrap_qty = scrap.move_ids._compute_kit_quantities(scrap.product_id, scrap.scrap_qty, scrap.bom_id, filters)
|
|
|
|
def _should_check_available_qty(self):
|
|
return super()._should_check_available_qty() or self.product_is_kit
|