Skip to content

[IMP] account, *sale: sale_order/move line unit price computation #201181

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

Closed
wants to merge 1 commit into from
Closed

[IMP] account, *sale: sale_order/move line unit price computation #201181

Show file tree
Hide file tree
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
29 changes: 0 additions & 29 deletions addons/account/models/product.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,41 +228,12 @@ def _get_tax_included_unit_price(self, company, currency, document_date, documen
if product_uom and product.uom_id != product_uom:
product_price_unit = product.uom_id._compute_price(product_price_unit, product_uom)

# Apply fiscal position.
if product_taxes and fiscal_position:
product_price_unit = self._get_tax_included_unit_price_from_price(
product_price_unit,
product_taxes,
fiscal_position=fiscal_position,
)

# Apply currency rate.
if currency != product_currency:
product_price_unit = product_currency._convert(product_price_unit, currency, company, document_date, round=False)

return product_price_unit

def _get_tax_included_unit_price_from_price(
self, product_price_unit, product_taxes,
fiscal_position=None,
product_taxes_after_fp=None,
):
if not product_taxes:
return product_price_unit

if product_taxes_after_fp is None:
if not fiscal_position:
return product_price_unit

product_taxes_after_fp = fiscal_position.map_tax(product_taxes)

return product_taxes._adapt_price_unit_to_another_taxes(
price_unit=product_price_unit,
product=self,
original_taxes=product_taxes,
new_taxes=product_taxes_after_fp,
)

@api.depends('lst_price', 'product_tmpl_id', 'taxes_id')
@api.depends_context('company')
def _compute_tax_string(self):
Expand Down
60 changes: 30 additions & 30 deletions addons/account/tests/test_account_move_in_invoice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ def test_in_invoice_line_onchange_product_1(self):

def test_in_invoice_line_onchange_product_2_with_fiscal_pos(self):
''' Test mapping a price-included tax (10%) with a price-excluded tax (20%) on a price_unit of 110.0.
The price_unit should be 100.0 after applying the fiscal position.
The price_unit and price_subtotal should still be 110.0 after applying the fiscal position.
'''
tax_price_include = self.env['account.tax'].create({
'name': '10% incl',
Expand All @@ -227,10 +227,10 @@ def test_in_invoice_line_onchange_product_2_with_fiscal_pos(self):
'include_base_amount': True,
})
tax_price_exclude = self.env['account.tax'].create({
'name': '15% excl',
'name': '20% excl',
'type_tax_use': 'purchase',
'amount_type': 'percent',
'amount': 15,
'amount': 20,
})

fiscal_position = self.env['account.fiscal.position'].create({
Expand Down Expand Up @@ -262,14 +262,14 @@ def test_in_invoice_line_onchange_product_2_with_fiscal_pos(self):
self.assertInvoiceValues(invoice, [
{
'product_id': product.id,
'price_unit': 200.0,
'price_subtotal': 200.0,
'price_total': 230.0,
'price_unit': 220.0,
'price_subtotal': 220.0,
'price_total': 264.0,
'tax_ids': tax_price_exclude.ids,
'tax_line_id': False,
'currency_id': self.other_currency.id,
'amount_currency': 200.0,
'debit': 100.0,
'amount_currency': 220.0,
'debit': 110.0,
'credit': 0.0,
},
{
Expand All @@ -280,8 +280,8 @@ def test_in_invoice_line_onchange_product_2_with_fiscal_pos(self):
'tax_ids': [],
'tax_line_id': tax_price_exclude.id,
'currency_id': self.other_currency.id,
'amount_currency': 30.0,
'debit': 15.0,
'amount_currency': 44.0,
'debit': 22.0,
'credit': 0.0,
},
{
Expand All @@ -292,16 +292,16 @@ def test_in_invoice_line_onchange_product_2_with_fiscal_pos(self):
'tax_ids': [],
'tax_line_id': False,
'currency_id': self.other_currency.id,
'amount_currency': -230.0,
'amount_currency': -264.0,
'debit': 0.0,
'credit': 115.0,
'credit': 132.0,
},
], {
'currency_id': self.other_currency.id,
'fiscal_position_id': fiscal_position.id,
'amount_untaxed': 200.0,
'amount_tax': 30.0,
'amount_total': 230.0,
'amount_untaxed': 220.0,
'amount_tax': 44.0,
'amount_total': 264.0,
})

uom_dozen = self.env.ref('uom.product_uom_dozen')
Expand All @@ -313,14 +313,14 @@ def test_in_invoice_line_onchange_product_2_with_fiscal_pos(self):
{
'product_id': product.id,
'product_uom_id': uom_dozen.id,
'price_unit': 2400.0,
'price_subtotal': 2400.0,
'price_total': 2760.0,
'price_unit': 2640.0,
'price_subtotal': 2640.0,
'price_total': 3168.0,
'tax_ids': tax_price_exclude.ids,
'tax_line_id': False,
'currency_id': self.other_currency.id,
'amount_currency': 2400.0,
'debit': 1200.0,
'amount_currency': 2640.0,
'debit': 1320.0,
'credit': 0.0,
},
{
Expand All @@ -332,8 +332,8 @@ def test_in_invoice_line_onchange_product_2_with_fiscal_pos(self):
'tax_ids': [],
'tax_line_id': tax_price_exclude.id,
'currency_id': self.other_currency.id,
'amount_currency': 360.0,
'debit': 180.0,
'amount_currency': 528.0,
'debit': 264.0,
'credit': 0.0,
},
{
Expand All @@ -345,21 +345,21 @@ def test_in_invoice_line_onchange_product_2_with_fiscal_pos(self):
'tax_ids': [],
'tax_line_id': False,
'currency_id': self.other_currency.id,
'amount_currency': -2760.0,
'amount_currency': -3168.0,
'debit': 0.0,
'credit': 1380.0,
'credit': 1584.0,
},
], {
'currency_id': self.other_currency.id,
'fiscal_position_id': fiscal_position.id,
'amount_untaxed': 2400.0,
'amount_tax': 360.0,
'amount_total': 2760.0,
'amount_untaxed': 2640.0,
'amount_tax': 528.0,
'amount_total': 3168.0,
})

def test_in_invoice_line_onchange_product_2_with_fiscal_pos_2(self):
''' Test mapping a price-included tax (10%) with another price-included tax (20%) on a price_unit of 110.0.
The price_unit should be 120.0 after applying the fiscal position.
''' Test mapping a price-included tax (10%) with another price-included tax (20%) on a price_unit of 120.0.
The price_unit should still be 120.00 while price_subtotal should be 100.00 after applying the fiscal position.
'''
tax_price_include_1 = self.env['account.tax'].create({
'name': '10% incl',
Expand Down Expand Up @@ -391,7 +391,7 @@ def test_in_invoice_line_onchange_product_2_with_fiscal_pos_2(self):
product = self.env['product.product'].create({
'name': 'product',
'uom_id': self.env.ref('uom.product_uom_unit').id,
'standard_price': 110.0,
'standard_price': 120.0,
'supplier_taxes_id': [(6, 0, tax_price_include_1.ids)],
})

Expand Down
66 changes: 33 additions & 33 deletions addons/account/tests/test_account_move_out_invoice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ def test_out_invoice_line_onchange_product_1(self):

def test_out_invoice_line_onchange_product_2_with_fiscal_pos_1(self):
''' Test mapping a price-included tax (10%) with a price-excluded tax (20%) on a price_unit of 110.0.
The price_unit should be 100.0 after applying the fiscal position.
The price_unit and price_subtotal should still be 110.0 after applying the fiscal position.
'''
tax_price_include = self.env['account.tax'].create({
'name': '10% incl',
Expand All @@ -213,10 +213,10 @@ def test_out_invoice_line_onchange_product_2_with_fiscal_pos_1(self):
'include_base_amount': True,
})
tax_price_exclude = self.env['account.tax'].create({
'name': '15% excl',
'name': '20% excl',
'type_tax_use': 'sale',
'amount_type': 'percent',
'amount': 15,
'amount': 20,
})

fiscal_position = self.env['account.fiscal.position'].create({
Expand Down Expand Up @@ -248,15 +248,15 @@ def test_out_invoice_line_onchange_product_2_with_fiscal_pos_1(self):
self.assertInvoiceValues(invoice, [
{
'product_id': product.id,
'price_unit': 200.0,
'price_subtotal': 200.0,
'price_total': 230.0,
'price_unit': 220.0,
'price_subtotal': 220.0,
'price_total': 264.0,
'tax_ids': tax_price_exclude.ids,
'tax_line_id': False,
'currency_id': self.other_currency.id,
'amount_currency': -200.0,
'amount_currency': -220.0,
'debit': 0.0,
'credit': 100.0,
'credit': 110.0,
},
{
'product_id': False,
Expand All @@ -266,9 +266,9 @@ def test_out_invoice_line_onchange_product_2_with_fiscal_pos_1(self):
'tax_ids': [],
'tax_line_id': tax_price_exclude.id,
'currency_id': self.other_currency.id,
'amount_currency': -30.0,
'amount_currency': -44.0,
'debit': 0.0,
'credit': 15.0,
'credit': 22.0,
},
{
'product_id': False,
Expand All @@ -278,16 +278,16 @@ def test_out_invoice_line_onchange_product_2_with_fiscal_pos_1(self):
'tax_ids': [],
'tax_line_id': False,
'currency_id': self.other_currency.id,
'amount_currency': 230.0,
'debit': 115.0,
'amount_currency': 264.0,
'debit': 132.0,
'credit': 0.0,
},
], {
'currency_id': self.other_currency.id,
'fiscal_position_id': fiscal_position.id,
'amount_untaxed': 200.0,
'amount_tax': 30.0,
'amount_total': 230.0,
'amount_untaxed': 220.0,
'amount_tax': 44.0,
'amount_total': 264.0,
})

uom_dozen = self.env.ref('uom.product_uom_dozen')
Expand All @@ -299,15 +299,15 @@ def test_out_invoice_line_onchange_product_2_with_fiscal_pos_1(self):
{
'product_id': product.id,
'product_uom_id': uom_dozen.id,
'price_unit': 2400.0,
'price_subtotal': 2400.0,
'price_total': 2760.0,
'price_unit': 2640.0,
'price_subtotal': 2640.0,
'price_total': 3168.0,
'tax_ids': tax_price_exclude.ids,
'tax_line_id': False,
'currency_id': self.other_currency.id,
'amount_currency': -2400.0,
'amount_currency': -2640.0,
'debit': 0.0,
'credit': 1200.0,
'credit': 1320.0,
},
{
'product_id': False,
Expand All @@ -318,9 +318,9 @@ def test_out_invoice_line_onchange_product_2_with_fiscal_pos_1(self):
'tax_ids': [],
'tax_line_id': tax_price_exclude.id,
'currency_id': self.other_currency.id,
'amount_currency': -360.0,
'amount_currency': -528.0,
'debit': 0.0,
'credit': 180.0,
'credit': 264.0,
},
{
'product_id': False,
Expand All @@ -331,16 +331,16 @@ def test_out_invoice_line_onchange_product_2_with_fiscal_pos_1(self):
'tax_ids': [],
'tax_line_id': False,
'currency_id': self.other_currency.id,
'amount_currency': 2760.0,
'debit': 1380.0,
'amount_currency': 3168.0,
'debit': 1584.0,
'credit': 0.0,
},
], {
'currency_id': self.other_currency.id,
'fiscal_position_id': fiscal_position.id,
'amount_untaxed': 2400.0,
'amount_tax': 360.0,
'amount_total': 2760.0,
'amount_untaxed': 2640.0,
'amount_tax': 528.0,
'amount_total': 3168.0,
})

# Check rounding.
Expand All @@ -364,15 +364,15 @@ def test_out_invoice_line_onchange_product_2_with_fiscal_pos_1(self):
],
})
self.assertRecordValues(invoice.invoice_line_ids, [{
'price_unit': 163.6425, # 90.0034 / 1.10 * 2
'price_unit': 180.0068,
'tax_ids': tax_price_exclude.ids,
'price_subtotal': 163.643,
'price_total': 188.189,
'price_subtotal': 180.007,
'price_total': 216.008,
}])

def test_out_invoice_line_onchange_product_2_with_fiscal_pos_2(self):
''' Test mapping a price-included tax (10%) with another price-included tax (20%) on a price_unit of 110.0.
The price_unit should be 120.0 after applying the fiscal position.
''' Test mapping a price-included tax (10%) with another price-included tax (20%) on a price_unit of 120.0.
The price_unit should still be 120.00 while price_subtotal should be 100.00 after applying the fiscal position.
'''
tax_price_include_1 = self.env['account.tax'].create({
'name': '10% incl',
Expand Down Expand Up @@ -404,7 +404,7 @@ def test_out_invoice_line_onchange_product_2_with_fiscal_pos_2(self):
product = self.env['product.product'].create({
'name': 'product',
'uom_id': self.env.ref('uom.product_uom_unit').id,
'lst_price': 110.0,
'lst_price': 120.0,
'taxes_id': [(6, 0, tax_price_include_1.ids)],
})

Expand Down
4 changes: 2 additions & 2 deletions addons/delivery/tests/test_delivery_cost.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ def test_01_taxes_on_delivery_cost(self):
line.product_uom_qty = 1.0
sale_order = order_form.save()

self.assertRecordValues(sale_order.order_line, [{'price_subtotal': 9.09, 'price_total': 10.45}])
self.assertRecordValues(sale_order.order_line, [{'price_subtotal': 10.0, 'price_total': 11.5}])

# Now trying to add the delivery line using the delivery wizard, the results should be the same as before
delivery_wizard = Form(self.env['choose.delivery.carrier'].with_context(default_order_id=sale_order.id,
Expand All @@ -274,7 +274,7 @@ def test_01_taxes_on_delivery_cost(self):
('is_delivery', '=', True),
])

self.assertRecordValues(line, [{'price_subtotal': 9.09, 'price_total': 10.45}])
self.assertRecordValues(line, [{'price_subtotal': 10.0, 'price_total': 11.5}])

def test_estimated_weight(self):
"""
Expand Down
10 changes: 1 addition & 9 deletions addons/sale/models/sale_order_line.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,15 +536,7 @@ def _compute_price_unit(self):
line.price_unit = 0.0
line.technical_price_unit = 0.0
else:
line = line.with_company(line.company_id)
price = line._get_display_price()
line.price_unit = line.product_id._get_tax_included_unit_price_from_price(
price,
product_taxes=line.product_id.taxes_id.filtered(
lambda tax: tax.company_id == line.env.company
),
fiscal_position=line.order_id.fiscal_position_id,
)
line.price_unit = line._get_display_price()
line.technical_price_unit = line.price_unit

def _get_order_date(self):
Expand Down
5 changes: 0 additions & 5 deletions addons/website_sale/models/product_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,11 +569,6 @@ def _apply_taxes_to_price(
website=None,
):
website = website or self.env['website'].get_current_website()
price = self.env['product.product']._get_tax_included_unit_price_from_price(
price,
product_taxes,
product_taxes_after_fp=taxes,
)
show_tax = website.show_line_subtotals_tax_selection
tax_display = 'total_excluded' if show_tax == 'tax_excluded' else 'total_included'

Expand Down