Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IMP] rma_sale_lot: Avoid computing RMA move unnecessarily #443

Closed
wants to merge 1 commit into from
Closed

[IMP] rma_sale_lot: Avoid computing RMA move unnecessarily #443

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions rma_sale_lot/models/sale_order_line.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@ def _get_qty_done_by_product_lot(self, moves):
("move_id.scrapped", "=", False),
],
["qty_done:sum"],
["product_id", "lot_id"],
["product_id", "lot_id", "move_id"],
lazy=False,
):
move_id = group.get("move_id")[0] if group.get("move_id") else False
lot_id = group.get("lot_id")[0] if group.get("lot_id") else False
product_id = group.get("product_id")[0]
qty_done = group.get("qty_done")
res[(product_id, lot_id)] += qty_done
res[(product_id, move_id, lot_id)] += qty_done
return res

def prepare_sale_rma_data(self):
Expand All @@ -38,19 +39,16 @@ def prepare_sale_rma_data(self):
moves = self.get_delivery_move()
data = []
qty_done_by_product_lot = self._get_qty_done_by_product_lot(moves)
for (product_id, lot_id), qty_done in qty_done_by_product_lot.items():
for (product_id, move_id, lot_id), qty_done in qty_done_by_product_lot.items():
data.append(
self._prepare_sale_rma_data_line(moves, product_id, lot_id, qty_done)
self._prepare_sale_rma_data_line(move_id, product_id, lot_id, qty_done)
)
return data

def _prepare_sale_rma_data_line(self, moves, product_id, lot_id, qty_done):
moves = moves.move_line_ids.filtered(
lambda ml, p_id=product_id, l_id=lot_id: ml.product_id.id == p_id
and ml.lot_id.id == l_id
).move_id
def _prepare_sale_rma_data_line(self, move_id, product_id, lot_id, qty_done):
move = self.env["stock.move"].browse(move_id)
quantity = qty_done
for returned_move in moves.returned_move_ids.filtered(
for returned_move in move.returned_move_ids.filtered(
lambda r: r.state in ["partially_available", "assigned", "done"]
):
if (
Expand All @@ -63,13 +61,14 @@ def _prepare_sale_rma_data_line(self, moves, product_id, lot_id, qty_done):
elif returned_move.state == "done":
quantity -= returned_move.product_qty
quantity = float_round(
quantity, precision_rounding=moves.product_id.uom_id.rounding
quantity, precision_rounding=move.product_id.uom_id.rounding
)
return {
"product": moves.product_id,
"product": move.product_id,
"quantity": quantity,
"uom": moves.product_uom,
"picking": moves.picking_id[0],
"uom": move.product_uom,
"picking": move.picking_id,
"sale_line_id": self,
"lot_id": lot_id,
"move": move,
}