Skip to content

Commit

Permalink
[MIG] rental_pricelist_interval: Migration to 16.0
Browse files Browse the repository at this point in the history
[FIX] Tests

[FIX] Error argument tests

[IMP] Reformat code

[IMP] Add test-requirements.txt
  • Loading branch information
edescalona committed Dec 27, 2024
1 parent ca6ef19 commit 8d3fd21
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion rental_pricelist_interval/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion rental_pricelist_interval/models/sale.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
10 changes: 5 additions & 5 deletions rental_pricelist_interval/tests/test_rental_pricelist.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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))
5 changes: 1 addition & 4 deletions rental_pricelist_interval/views/product_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@
name="rental_interval_max"
attrs="{'invisible': [('rental_of_interval','=',False)]}"
/>
<field
name="product_rental_interval_id"
groups="base.group_no_one"
/>
<field name="product_rental_interval_id" invisible="1" />
<strong colspan="1" class="oe_inline">Bulk Prices</strong>
<button
name="action_reset_rental_price_interval_items"
Expand Down
3 changes: 3 additions & 0 deletions test-requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
odoo-addon-rental_base @ git+https://github.com/OCA/vertical-rental.git@refs/pull/48/head#subdirectory=setup/rental_base
odoo-addon-rental_pricelist @ git+https://github.com/OCA/vertical-rental.git@refs/pull/49/head#subdirectory=setup/rental_pricelist
odoo-addon-sale_rental @ git+https://github.com/OCA/vertical-rental.git@refs/pull/46/head#subdirectory=setup/sale_rental

0 comments on commit 8d3fd21

Please sign in to comment.