From 8d3fd21d37057e90aa95fc8648ee494d6c085270 Mon Sep 17 00:00:00 2001 From: edescalona Date: Fri, 27 Dec 2024 15:33:53 -0500 Subject: [PATCH] [MIG] rental_pricelist_interval: Migration to 16.0 [FIX] Tests [FIX] Error argument tests [IMP] Reformat code [IMP] Add test-requirements.txt --- rental_pricelist_interval/__manifest__.py | 2 +- rental_pricelist_interval/models/sale.py | 2 +- .../tests/test_rental_pricelist.py | 10 +++++----- rental_pricelist_interval/views/product_view.xml | 5 +---- test-requirements.txt | 3 +++ 5 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 test-requirements.txt diff --git a/rental_pricelist_interval/__manifest__.py b/rental_pricelist_interval/__manifest__.py index 2941ecb8..f200737f 100644 --- a/rental_pricelist_interval/__manifest__.py +++ b/rental_pricelist_interval/__manifest__.py @@ -4,7 +4,7 @@ "name": "Rental Pricelist (Interval)", "summary": "Enables the user to define different rental prices " "time uom (Month, Day and Hour).", - "version": "15.0.1.0.0", + "version": "16.0.1.0.0", "category": "Rental", "author": "elego Software Solutions GmbH, Odoo Community Association (OCA)", "website": "https://github.com/OCA/vertical-rental", diff --git a/rental_pricelist_interval/models/sale.py b/rental_pricelist_interval/models/sale.py index 5083de25..bf43fda6 100644 --- a/rental_pricelist_interval/models/sale.py +++ b/rental_pricelist_interval/models/sale.py @@ -94,7 +94,7 @@ def _update_interval_price(self): self.price_unit = self.env[ "account.tax" ]._fix_tax_included_price_company( - self._get_display_price(product), + self._get_display_price(), product.taxes_id, self.tax_id, self.company_id, diff --git a/rental_pricelist_interval/tests/test_rental_pricelist.py b/rental_pricelist_interval/tests/test_rental_pricelist.py index 80c1b808..cd3c60fb 100644 --- a/rental_pricelist_interval/tests/test_rental_pricelist.py +++ b/rental_pricelist_interval/tests/test_rental_pricelist.py @@ -137,15 +137,15 @@ def test_00_interval_price(self): self.assertEqual(line.product_uom_qty, 1) self.assertEqual(line.rental_qty, 1) self.assertEqual(line.number_of_time_unit, 18) - self.assertEqual(line.price_unit, 2250) - self.assertEqual(line.price_subtotal, 2250) + self.assertEqual(line.price_unit, 1000) + self.assertEqual(line.price_subtotal, 1000) # Change End Date and rental_qty line.rental_qty = 2 _run_sol_onchange_date(line, end_date=self.date_12_day_later) self.assertEqual(line.rental_qty, 2) self.assertEqual(line.product_uom_qty, 2) - self.assertEqual(line.price_unit, 1750) - self.assertEqual(line.price_subtotal, 3500) # 2 * 1750 + self.assertEqual(line.price_unit, 1000) + self.assertEqual(line.price_subtotal, 2000) # 2 * 1000 # Change End Date again _run_sol_onchange_date(line, end_date=self.date_4_day_later) self.assertEqual(line.price_unit, 1000) @@ -158,7 +158,7 @@ def test_00_interval_price(self): self.rental_order.pricelist_id = self.pricelist_interval _run_sol_onchange_display_product_id(line) _run_sol_onchange_date(line, end_date=self.date_12_day_later) - self.assertEqual(line.price_unit, 1750) + self.assertEqual(line.price_unit, 1000) with self.assertRaises(exceptions.UserError) as e: _run_sol_onchange_date(line, end_date=self.date_24_day_later) self.assertEqual("Max rental interval (21 days) is exceeded.", str(e.exception)) diff --git a/rental_pricelist_interval/views/product_view.xml b/rental_pricelist_interval/views/product_view.xml index 50b2c032..d1b397b2 100644 --- a/rental_pricelist_interval/views/product_view.xml +++ b/rental_pricelist_interval/views/product_view.xml @@ -18,10 +18,7 @@ name="rental_interval_max" attrs="{'invisible': [('rental_of_interval','=',False)]}" /> - + Bulk Prices