Skip to content
Open
Changes from all commits
Commits
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
20 changes: 20 additions & 0 deletions stock_voucher/models/stock_picking.py
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,31 @@ def _compute_declared_value(self):
bom_quantity += line_data["qty"]
if not bom_quantity:
continue
<<<<<<< 9a113e5d633cccf10b3acb482e4d045786905423
rec_move = rec.move_ids.filtered(lambda m: m._origin.id == move.id)
picking_avg.append(move.product_uom_qty / bom_quantity)
done_avg.append(rec_move.quantity / bom_quantity)
picking_value += so_bom_line.price_reduce_taxexcl * (sum(picking_avg) / len(picking_avg))
done_value += so_bom_line.price_reduce_taxexcl * (sum(done_avg) / len(done_avg))
||||||| 0d3e5e7eea336d4475e33ea9cedecc90499ec194
picking_avg.append(
move.product_uom_qty / bom_quantity)
done_avg.append(
move.quantity / bom_quantity)
picking_value += so_bom_line.price_reduce_taxexcl * (
sum(picking_avg) / len(picking_avg))
done_value += so_bom_line.price_reduce_taxexcl * (
sum(done_avg) / len(done_avg))
=======
picking_avg.append(
move.product_uom_qty / bom_quantity)
done_avg.append(
move.quantity / bom_quantity)
if picking_avg:
picking_value += so_bom_line.price_reduce_taxexcl * (sum(picking_avg) / len(picking_avg))
if done_avg:
done_value += so_bom_line.price_reduce_taxexcl * (sum(done_avg) / len(done_avg))
>>>>>>> a2987dd9428358e4f09b63ef3e11b368b335cde0

declared_value = picking_value if inmediate_transfer else done_value
if pricelist:
Expand Down
Loading