audrius/stock-logistics-reporting
1
0
Fork 1
mirror of https://github.com/OCA/stock-logistics-reporting.git synced 2025-02-16 17:13:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #130 into 12.0

Browse Source 
Signed-off-by dreispt
This commit is contained in:
OCA-git-bot
2021-11-26 10:03:34 +00:00
parent fba0bf1708 5cc1a203d5
commit 1db645df75
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
stock_picking_report_valued/models/stock_move_line.py
View File

@@ -1,10 +1,11 @@
# Copyright 2014-2018 Tecnativa - Pedro M. Baeza
# Copyright 2015 Antonio Espinosa - Tecnativa <antonio.espinosa@tecnativa.com>
# Copyright 2018 Luis M. Ontalba - Tecnativa <luis.martinez@tecnativa.com>
# Copyright 2016-2018 Carlos Dauden - Tecnativa <carlos.dauden@tecnativa.com>
# Copyright 2016-2021 Carlos Dauden - Tecnativa <carlos.dauden@tecnativa.com>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import api, fields, models
from odoo.tools.float_utils import float_round
class StockMoveLine(models.Model):
@@ -57,6 +58,7 @@ class StockMoveLine(models.Model):
access to sales orders (stricter warehouse users, inter-company
records...).
"""
prec = self.env['decimal.precision'].precision_get('Product Price')
for line in self:
# In v12 the support for compute_sudo on non stored fields is
# limited (officially unsupported) so we have to mainaint some
@@ -64,8 +66,13 @@ class StockMoveLine(models.Model):
# https://github.com/odoo/odoo/blob/12.0/odoo/fields.py#L179
sale_line = line.sale_line.sudo()
price_unit = (
sale_line.price_subtotal / sale_line.product_uom_qty
if sale_line.product_uom_qty else sale_line.price_reduce)
float_round(
sale_line.price_subtotal / sale_line.product_uom_qty,
precision_digits=prec,
)
if sale_line.product_uom_qty
else sale_line.price_reduce
)
taxes = line.sale_tax_id.compute_all(
price_unit=price_unit,
currency=line.currency_id,

15
stock_picking_report_valued/tests/test_stock_picking_valued.py
View File

@@ -1,6 +1,6 @@
# Copyright 2017 Tecnativa - David Vidal
# Copyright 2017 Tecnativa - Luis M. Ontalba
# Copyright 2019 Tecnativa - Carlos Dauden
# Copyright 2019-2021 Tecnativa - Carlos Dauden
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo.tests import common
@@ -107,3 +107,16 @@ class TestStockPickingValued(common.SavepointCase):
self.assertEqual(picking.amount_untaxed, 300.0)
self.assertEqual(picking.amount_tax, 40.0)
self.assertEqual(picking.amount_total, 340.0)
def test_05_partial_delivery_computed_price(self):
self.assertTrue(self.partner.valued_picking)
self.sale_order.order_line.price_unit = 23.45
self.sale_order.order_line.product_uom_qty = 3.72
self.sale_order.action_confirm()
self.assertTrue(len(self.sale_order.picking_ids))
for picking in self.sale_order.picking_ids:
picking.action_assign()
picking.move_line_ids.qty_done = 3.55
self.assertAlmostEqual(picking.amount_untaxed, 83.25, 2)
self.assertAlmostEqual(picking.amount_tax, 12.49, 2)
self.assertAlmostEqual(picking.amount_total, 95.74, 2)