oca/oca-ocb-sale
2
0
Fork 0
mirror of https://github.com/bringout/oca-ocb-sale.git synced 2026-04-27 23:52:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

19.0 vanilla

Browse source
This commit is contained in:
Ernad Husremovic 2026-03-09 09:32:12 +01:00
parent 79f83631d5
commit 73afc09215
6267 changed files with 1534193 additions and 1130106 deletions
Download patch file Download diff file Expand all files Collapse all files

90
odoo-bringout-oca-ocb-sale_mrp/sale_mrp/models/sale_order_line.py
View file

@ -30,20 +30,20 @@ class SaleOrderLine(models.Model):
if components and components != [line.product_id.id]:
line.display_qty_widget = True
def _compute_qty_delivered(self):
super(SaleOrderLine, self)._compute_qty_delivered()
def _prepare_qty_delivered(self):
delivered_qties = super()._prepare_qty_delivered()
for order_line in self:
if order_line.qty_delivered_method == 'stock_move':
boms = order_line.move_ids.filtered(lambda m: m.state != 'cancel').mapped('bom_line_id.bom_id')
boms = order_line.move_ids.filtered(lambda m: m.state != 'cancel').bom_line_id.bom_id
dropship = any(m._is_dropshipped() for m in order_line.move_ids)
if not boms and dropship:
boms = boms._bom_find(order_line.product_id, company_id=order_line.company_id.id, bom_type='phantom')[order_line.product_id]
# We fetch the BoMs of type kits linked to the order_line,
# the we keep only the one related to the finished produst.
# This bom should be the only one since bom_line_id was written on the moves
relevant_bom = boms.filtered(lambda b: b.type == 'phantom' and
(b.product_id == order_line.product_id or
(b.product_tmpl_id == order_line.product_id.product_tmpl_id and not b.product_id)))
if not relevant_bom:
relevant_bom = boms._bom_find(order_line.product_id, company_id=order_line.company_id.id, bom_type='phantom')[order_line.product_id]
if relevant_bom:
# not written on a move coming from a PO: all moves (to customer) must be done
# and the returns must be delivered back to the customer
@ -56,22 +56,26 @@ class SaleOrderLine(models.Model):
if any((m.location_dest_id.usage == 'customer' and m.state != 'done')
or (m.location_dest_id.usage != 'customer'
and m.state == 'done'
and float_compare(m.quantity_done,
sum(sub_m.product_uom._compute_quantity(sub_m.quantity_done, m.product_uom) for sub_m in m.returned_move_ids if sub_m.state == 'done'),
and float_compare(m.quantity,
sum(sub_m.product_uom._compute_quantity(sub_m.quantity, m.product_uom) for sub_m in m.returned_move_ids if sub_m.state == 'done'),
precision_rounding=m.product_uom.rounding) > 0)
for m in moves) or not moves:
order_line.qty_delivered = 0
delivered_qties[order_line] = 0
else:
order_line.qty_delivered = order_line.product_uom_qty
delivered_qties[order_line] = order_line.product_uom_qty
continue
moves = order_line.move_ids.filtered(lambda m: m.state == 'done' and not m.scrapped)
moves = order_line.move_ids.filtered(lambda m: m.state == 'done' and m.location_dest_usage != 'inventory')
filters = {
'incoming_moves': lambda m: m.location_dest_id.usage == 'customer' and (not m.origin_returned_move_id or (m.origin_returned_move_id and m.to_refund)),
'outgoing_moves': lambda m: m.location_dest_id.usage != 'customer' and m.to_refund
# in/out perspective w/ respect to moves is flipped for sale order document
'incoming_moves': lambda m:
m._is_outgoing() and
(not m.origin_returned_move_id or (m.origin_returned_move_id and m.to_refund)),
'outgoing_moves': lambda m:
m._is_incoming() and m.to_refund,
}
order_qty = order_line.product_uom._compute_quantity(order_line.product_uom_qty, relevant_bom.product_uom_id)
order_qty = order_line.product_uom_id._compute_quantity(order_line.product_uom_qty, relevant_bom.product_uom_id)
qty_delivered = moves._compute_kit_quantities(order_line.product_id, order_qty, relevant_bom, filters)
order_line.qty_delivered += relevant_bom.product_uom_id._compute_quantity(qty_delivered, order_line.product_uom)
delivered_qties[order_line] += relevant_bom.product_uom_id._compute_quantity(qty_delivered, order_line.product_uom_id)
# If no relevant BOM is found, fall back on the all-or-nothing policy. This happens
# when the product sold is made only of kits. In this case, the BOM of the stock moves
@ -79,9 +83,10 @@ class SaleOrderLine(models.Model):
elif boms:
# if the move is ingoing, the product **sold** has delivered qty 0
if all(m.state == 'done' and m.location_dest_id.usage == 'customer' for m in order_line.move_ids):
order_line.qty_delivered = order_line.product_uom_qty
delivered_qties[order_line] = order_line.product_uom_qty
else:
order_line.qty_delivered = 0.0
delivered_qties[order_line] = 0.0
return delivered_qties
def compute_uom_qty(self, new_qty, stock_move, rounding=True):
#check if stock move concerns a kit
@ -112,20 +117,53 @@ class SaleOrderLine(models.Model):
components[product] = {'qty': qty, 'uom': to_uom.id}
return components
@api.model
def _get_incoming_outgoing_moves_filter(self):
""" Method to be override: will get incoming moves and outgoing moves.
:return: Dictionary with incoming moves and outgoing moves
:rtype: dict
"""
# The first move created was the one created from the intial rule that started it all.
sorted_moves = self.move_ids.sorted('id')
triggering_rule_ids = []
seen_wh_ids = set()
seen_bom_id = set()
for move in sorted_moves:
if move.bom_line_id.bom_id.id in seen_bom_id:
triggering_rule_ids.append(move.rule_id.id)
elif move.warehouse_id.id not in seen_wh_ids:
triggering_rule_ids.append(move.rule_id.id)
seen_wh_ids.add(move.warehouse_id.id)
if move.bom_line_id and move.bom_line_id.bom_id.type == 'phantom':
seen_bom_id.add(move.bom_line_id.bom_id.id)
return {
'incoming_moves': lambda m: (
m.state != 'cancel' and m.location_dest_usage != 'inventory'
and m.rule_id.id in triggering_rule_ids
and m.location_final_id.usage == 'customer'
and (not m.origin_returned_move_id or (m.origin_returned_move_id and m.to_refund)
)),
'outgoing_moves': lambda m: (
m.state != 'cancel' and m.location_dest_usage != 'inventory'
and m.location_id.usage == 'customer' and m.to_refund
),
}
def _get_qty_procurement(self, previous_product_uom_qty=False):
self.ensure_one()
# Specific case when we change the qty on a SO for a kit product.
# We don't try to be too smart and keep a simple approach: we use the quantity of entire
# kits that are currently in delivery
bom = self.env['mrp.bom']._bom_find(self.product_id, bom_type='phantom')[self.product_id]
if bom:
moves = self.move_ids.filtered(lambda r: r.state != 'cancel' and not r.scrapped)
filters = {
'incoming_moves': lambda m: m.location_dest_id.usage == 'customer' and (not m.origin_returned_move_id or (m.origin_returned_move_id and m.to_refund)),
'outgoing_moves': lambda m: m.location_dest_id.usage != 'customer' and m.to_refund
}
bom = self.env['mrp.bom'].sudo()._bom_find(self.product_id, bom_type='phantom', company_id=self.company_id.id)[self.product_id]
if bom and self.move_ids:
moves = self.move_ids.filtered(lambda r: r.state != 'cancel' and r.location_dest_usage != 'inventory')
filters = self._get_incoming_outgoing_moves_filter()
order_qty = previous_product_uom_qty.get(self.id, 0) if previous_product_uom_qty else self.product_uom_qty
order_qty = self.product_uom._compute_quantity(order_qty, bom.product_uom_id)
order_qty = self.product_uom_id._compute_quantity(order_qty, bom.product_uom_id)
qty = moves._compute_kit_quantities(self.product_id, order_qty, bom, filters)
return bom.product_uom_id._compute_quantity(qty, self.product_uom)
return super(SaleOrderLine, self)._get_qty_procurement(previous_product_uom_qty=previous_product_uom_qty)
return bom.product_uom_id._compute_quantity(qty, self.product_uom_id)
elif bom and previous_product_uom_qty:
return previous_product_uom_qty.get(self.id)
return super()._get_qty_procurement(previous_product_uom_qty=previous_product_uom_qty)