clesgow
4468d18615
As done with the "done" state, if a single picking in a batch is cancelled while the other pickings aren't, this picking is removed from the batch, as it would create inconsistencies between the states of the pickings in a single batch. closes odoo/odoo#90449 X-original-commit: 1f2813e59970cd2eb078b514cd7d563837f175a1 Signed-off-by: Arnold Moyaux <arm@odoo.com> Signed-off-by: Quentin Wolfs (quwo) <quwo@odoo.com>
227 lines
10 KiB
Python
227 lines
10 KiB
Python
# -*- coding: utf-8 -*-
|
|
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
|
|
from odoo import _, api, Command, fields, models
|
|
from odoo.osv import expression
|
|
from odoo.exceptions import ValidationError
|
|
|
|
|
|
class StockPickingType(models.Model):
|
|
_inherit = "stock.picking.type"
|
|
|
|
count_picking_batch = fields.Integer(compute='_compute_picking_count')
|
|
count_picking_wave = fields.Integer(compute='_compute_picking_count')
|
|
auto_batch = fields.Boolean('Automatic Batches',
|
|
help="Automatically put pickings into batches as they are confirmed when possible.")
|
|
batch_group_by_partner = fields.Boolean('Contact', help="Automatically group batches by contacts.")
|
|
batch_group_by_destination = fields.Boolean('Destination Country', help="Automatically group batches by destination country.")
|
|
batch_group_by_src_loc = fields.Boolean('Source Location',
|
|
help="Automatically group batches by their source location.")
|
|
batch_group_by_dest_loc = fields.Boolean('Destination Location',
|
|
help="Automatically group batches by their destination location.")
|
|
batch_max_lines = fields.Integer("Maximum lines per batch",
|
|
help="A transfer will not be automatically added to batches that will exceed this number of lines if the transfer is added to it.\n"
|
|
"Leave this value as '0' if no line limit.")
|
|
batch_max_pickings = fields.Integer("Maximum transfers per batch",
|
|
help="A transfer will not be automatically added to batches that will exceed this number of transfers.\n"
|
|
"Leave this value as '0' if no transfer limit.")
|
|
batch_auto_confirm = fields.Boolean("Auto-confirm", default=True)
|
|
|
|
def _compute_picking_count(self):
|
|
super()._compute_picking_count()
|
|
domains = {
|
|
'count_picking_batch': [('is_wave', '=', False)],
|
|
'count_picking_wave': [('is_wave', '=', True)],
|
|
}
|
|
for field in domains:
|
|
data = self.env['stock.picking.batch']._read_group(domains[field] +
|
|
[('state', 'not in', ('done', 'cancel')), ('picking_type_id', 'in', self.ids)],
|
|
['picking_type_id'], ['picking_type_id'])
|
|
count = {
|
|
x['picking_type_id'][0]: x['picking_type_id_count']
|
|
for x in data if x['picking_type_id']
|
|
}
|
|
for record in self:
|
|
record[field] = count.get(record.id, 0)
|
|
|
|
@api.model
|
|
def _get_batch_group_by_keys(self):
|
|
return ['batch_group_by_partner', 'batch_group_by_destination', 'batch_group_by_src_loc', 'batch_group_by_dest_loc']
|
|
|
|
@api.constrains(lambda self: self._get_batch_group_by_keys() + ['auto_batch'])
|
|
def _validate_auto_batch_group_by(self):
|
|
group_by_keys = self._get_batch_group_by_keys()
|
|
for picking_type in self:
|
|
if not picking_type.auto_batch:
|
|
continue
|
|
if not any(picking_type[key] for key in group_by_keys):
|
|
raise ValidationError(_("If the Automatic Batches feature is enabled, at least one 'Group by' option must be selected."))
|
|
|
|
def get_action_picking_tree_batch(self):
|
|
return self._get_action('stock_picking_batch.stock_picking_batch_action')
|
|
|
|
def get_action_picking_tree_wave(self):
|
|
return self._get_action('stock_picking_batch.action_picking_tree_wave')
|
|
|
|
|
|
class StockPicking(models.Model):
|
|
_inherit = "stock.picking"
|
|
|
|
batch_id = fields.Many2one(
|
|
'stock.picking.batch', string='Batch Transfer',
|
|
check_company=True,
|
|
states={'done': [('readonly', True)], 'cancel': [('readonly', True)]},
|
|
help='Batch associated to this transfer', index=True, copy=False)
|
|
|
|
@api.model_create_multi
|
|
def create(self, vals_list):
|
|
pickings = super().create(vals_list)
|
|
for picking, vals in zip(pickings, vals_list):
|
|
if vals.get('batch_id'):
|
|
picking.batch_id._sanity_check()
|
|
return pickings
|
|
|
|
def write(self, vals):
|
|
batches = self.batch_id
|
|
res = super().write(vals)
|
|
if vals.get('batch_id'):
|
|
batches.filtered(lambda b: not b.picking_ids).state = 'cancel'
|
|
if not self.batch_id.picking_type_id:
|
|
self.batch_id.picking_type_id = self.picking_type_id[0]
|
|
self.batch_id._sanity_check()
|
|
return res
|
|
|
|
def action_add_operations(self):
|
|
view = self.env.ref('stock_picking_batch.view_move_line_tree_detailed_wave')
|
|
return {
|
|
'name': _('Add Operations'),
|
|
'type': 'ir.actions.act_window',
|
|
'view_mode': 'list',
|
|
'view': view,
|
|
'views': [(view.id, 'tree')],
|
|
'res_model': 'stock.move.line',
|
|
'target': 'new',
|
|
'domain': [
|
|
('picking_id', 'in', self.ids),
|
|
('state', '!=', 'done')
|
|
],
|
|
'context': dict(
|
|
self.env.context,
|
|
picking_to_wave=self.ids,
|
|
active_wave_id=self.env.context.get('active_wave_id').id,
|
|
search_default_by_location=True,
|
|
)}
|
|
|
|
def action_confirm(self):
|
|
res = super().action_confirm()
|
|
for picking in self:
|
|
if picking.picking_type_id.auto_batch and not picking.immediate_transfer and not picking.batch_id and picking.move_ids and picking._is_auto_batchable():
|
|
picking._find_auto_batch()
|
|
return res
|
|
|
|
def _action_done(self):
|
|
res = super()._action_done()
|
|
for picking in self:
|
|
if picking.batch_id and any(picking.state != 'done' for picking in picking.batch_id.picking_ids):
|
|
picking.batch_id = None
|
|
|
|
return res
|
|
|
|
def action_cancel(self):
|
|
res = super().action_cancel()
|
|
for picking in self:
|
|
if picking.batch_id and any(picking.state != 'cancel' for picking in picking.batch_id.picking_ids):
|
|
picking.batch_id = None
|
|
return res
|
|
|
|
def _should_show_transfers(self):
|
|
if len(self.batch_id) == 1 and self == self.batch_id.picking_ids:
|
|
return False
|
|
return super()._should_show_transfers()
|
|
|
|
def _find_auto_batch(self):
|
|
# Try to find a compatible batch to insert the picking
|
|
possible_batches = self.env['stock.picking.batch'].sudo().search(self._get_possible_batches_domain())
|
|
for batch in possible_batches:
|
|
if batch._is_picking_auto_mergeable(self):
|
|
batch.picking_ids |= self
|
|
return batch
|
|
|
|
# If no batch were found, try to find a compatible picking and put them both in a new batch.
|
|
possible_pickings = self.env['stock.picking'].search(self._get_possible_pickings_domain())
|
|
for picking in possible_pickings:
|
|
if self._is_auto_batchable(picking):
|
|
# Create new batch with both pickings
|
|
new_batch = self.env['stock.picking.batch'].sudo().create({
|
|
'picking_ids': [Command.link(self.id), Command.link(picking.id)],
|
|
'company_id': self.company_id.id if self.company_id else False,
|
|
'picking_type_id': self.picking_type_id.id,
|
|
})
|
|
if picking.picking_type_id.batch_auto_confirm:
|
|
new_batch.action_confirm()
|
|
return new_batch
|
|
|
|
# If nothing was found after those two steps, then no batch is doable given the conditions
|
|
return False
|
|
|
|
def _is_auto_batchable(self, picking=None):
|
|
""" Verifies if a picking can be put in a batch with another picking without violating auto_batch constrains.
|
|
"""
|
|
res = True
|
|
if not picking:
|
|
picking = self.env['stock.picking']
|
|
if self.picking_type_id.batch_max_lines:
|
|
res = res and (len(self.move_ids) + len(picking.move_ids) <= self.picking_type_id.batch_max_lines)
|
|
if self.picking_type_id.batch_max_pickings:
|
|
# Sounds absurd. BUT if we put "batch max picking" to a value <= 1, makes sense ... Or not. Because then there is no point to batch.
|
|
res = res and self.picking_type_id.batch_max_pickings > 1
|
|
return res
|
|
|
|
def _get_possible_pickings_domain(self):
|
|
self.ensure_one()
|
|
domain = [
|
|
('id', '!=', self.id),
|
|
('company_id', '=', self.company_id.id if self.company_id else False),
|
|
('immediate_transfer', '=', False),
|
|
('state', 'in', ('waiting', 'confirmed', 'assigned')),
|
|
('picking_type_id', '=', self.picking_type_id.id),
|
|
('batch_id', '=', False),
|
|
]
|
|
if self.picking_type_id.batch_group_by_partner:
|
|
domain = expression.AND([domain, [('partner_id', '=', self.partner_id.id)]])
|
|
if self.picking_type_id.batch_group_by_destination:
|
|
domain = expression.AND([domain, [('partner_id.country_id', '=', self.partner_id.country_id.id)]])
|
|
if self.picking_type_id.batch_group_by_src_loc:
|
|
domain = expression.AND([domain, [('location_id', '=', self.location_id.id)]])
|
|
if self.picking_type_id.batch_group_by_dest_loc:
|
|
domain = expression.AND([domain, [('location_dest_id', '=', self.location_dest_id.id)]])
|
|
|
|
return domain
|
|
|
|
def _get_possible_batches_domain(self):
|
|
self.ensure_one()
|
|
domain = [
|
|
('state', 'in', ('draft', 'in_progress') if self.picking_type_id.batch_auto_confirm else ('draft',)),
|
|
('picking_type_id', '=', self.picking_type_id.id),
|
|
('company_id', '=', self.company_id.id if self.company_id else False),
|
|
]
|
|
if self.picking_type_id.batch_group_by_partner:
|
|
domain = expression.AND([domain, [('picking_ids.partner_id', '=', self.partner_id.id)]])
|
|
if self.picking_type_id.batch_group_by_destination:
|
|
domain = expression.AND([domain, [('picking_ids.partner_id.country_id', '=', self.partner_id.country_id.id)]])
|
|
if self.picking_type_id.batch_group_by_src_loc:
|
|
domain = expression.AND([domain, [('picking_ids.location_id', '=', self.location_id.id)]])
|
|
if self.picking_type_id.batch_group_by_dest_loc:
|
|
domain = expression.AND([domain, [('picking_ids.location_dest_id', '=', self.location_dest_id.id)]])
|
|
|
|
return domain
|
|
|
|
def action_view_batch(self):
|
|
self.ensure_one()
|
|
return {
|
|
'type': 'ir.actions.act_window',
|
|
'res_model': 'stock.picking.batch',
|
|
'res_id': self.batch_id.id,
|
|
'view_mode': 'form'
|
|
}
|