audrius/stock-logistics-warehouse
1
0
Fork 1
mirror of https://github.com/OCA/stock-logistics-warehouse.git synced 2025-01-21 14:27:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #1280 into 12.0

Browse Source 
Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2021-10-22 07:46:45 +00:00
parent 040bbb1505 1344aad156
commit a257b0e85a
2 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
stock_secondary_unit/models/stock_move.py
View File

@@ -99,18 +99,28 @@ class StockMoveLine(models.Model):
@api.multi
def write(self, vals):
for rec in self:
move_lines_with_second_unit = self.filtered(
lambda ml: ml.move_id.secondary_uom_id)
res = super(StockMoveLine, self - move_lines_with_second_unit).write(
vals)
for rec in move_lines_with_second_unit:
move = rec.move_id
if move.secondary_uom_id:
uom = rec.product_id.uom_id
factor = move.secondary_uom_id.factor * uom.factor
move_line_qty = vals.get('product_uom_qty', rec.product_uom_qty)
qty = float_round(
move_line_qty / (factor or 1.0),
precision_rounding=move.secondary_uom_id.uom_id.rounding
)
vals.update({
'secondary_uom_qty': qty,
'secondary_uom_id': move.secondary_uom_id.id,
})
return super().write(vals)
uom = rec.product_id.uom_id
factor = move.secondary_uom_id.factor * uom.factor
if 'product_uom_qty' in vals and vals['product_uom_qty'] == 0:
# The picking has been validated and product_uom_qty is
# reset to zero
move_line_qty = move.quantity_done
else:
move_line_qty = vals.get(
'product_uom_qty', rec.product_uom_qty)
qty = float_round(
move_line_qty / (factor or 1.0),
precision_rounding=move.secondary_uom_id.uom_id.rounding
)
vals.update({
'secondary_uom_qty': qty,
'secondary_uom_id': move.secondary_uom_id.id,
})
res = super(StockMoveLine, rec).write(vals)
return res

6
stock_secondary_unit/tests/test_stock_secondary_unit.py
View File

@@ -121,6 +121,12 @@ class TestProductSecondaryUnit(SavepointCase):
sum(delivery_order.move_line_ids.mapped('secondary_uom_qty'))
self.assertEquals(uom_qty, 20.0)
self.assertEquals(secondary_uom_qty, 40.0)
# After picking validation secondary_uom_qty not reset to zero
delivery_order.move_lines.quantity_done = 20.0
delivery_order.action_done()
secondary_uom_qty = \
sum(delivery_order.move_line_ids.mapped('secondary_uom_qty'))
self.assertEquals(secondary_uom_qty, 40.0)
def test_04_picking_secondary_unit(self):
product = self.product_template.product_variant_ids[0]