48dd7718e2
User shared their actual published service-rate card. Bundle 9's seeded
numbers were placeholders that no longer match. Realigned the rate card,
added the LIFT & ELEVATING SERVICE class, added the in-shop labour
rate path, added the delivery / pickup charge model, added rush as a
proper tier (distinct from after-hours), and added 30-min increment
rounding on top of the existing 1-hour minimum.
EQUIPMENT CLASS
fusion.repair.product.category gets a new x_fc_equipment_class
selection: 'standard' vs 'lift_elevating'. The published card splits
pricing into two service classes - lift_elevating has higher rates
($160 callout vs $95, $110/h vs $85).
Categories marked lift_elevating in seed:
stairlift, porch_lift, lift_chair (new)
New 'Lift Chair' category seeded (power recliner / lift chair).
CALLOUT RATE CARD
fusion.repair.callout.rate gets:
- equipment_class field (standard / lift_elevating)
- in_shop_labor_rate field (separate $75 vs $85 on-site)
- 'rush' tier value (was missing - rush was implicit via emergency
surcharge from Bundle 8; now a proper tier matching the printed
rate card row 'Rush Service Calls $120')
Re-seeded with the PUBLISHED Westin rate card (exact values):
STANDARD SERVICE
regular $95 callout / $85/h on-site / $75/h in-shop
rush $120 callout / $85/h / $75/h
after_hours $140 callout / $85/h / $75/h
weekend $180 callout / $85/h / $75/h (extension)
holiday $220 callout / $85/h / $75/h (extension)
LIFT & ELEVATING SERVICE
regular $160 callout / $110/h on-site / $110/h in-shop
rush $200 callout / $110/h / $110/h (extension)
after_hours $240 callout / $110/h / $110/h (extension)
weekend $300 callout / $110/h / $110/h (extension)
holiday $360 callout / $110/h / $110/h (extension)
Travel: $0.70 per km, BOTH WAYS, past 25 km, per technician
(matches the per-card '$0.70 per km x 2-way' footnote).
get_for_tier(tier, equipment_class) now resolves with a fallback:
tries (tier, lift_elevating) first, falls back to (tier, standard)
if no lift-specific row exists - so an admin can leave standard rows
as the catch-all and only customise lift for the exceptions.
DELIVERY / PICKUP RATE CARD
New fusion.repair.delivery.charge model + seed of all 7 items from
the printed card:
Local Service Area (within Brampton) ........ $35
Outside Local Area .......................... $60
Rush Pickups / Delivery ..................... $60 + $0.70/km x 2-way
Lift Chair Delivery and Set-Up .............. $120
Hospital Bed Delivery and Set-Up ............ $120
Stairlift Delivery and Set-Up ............... $300
Stairlift Removal ........................... $300
quote_rush(distance_km) helper for the office's delivery scheduling.
New menu: Configuration > Delivery / Pickup Charges.
PRICING ENGINE UPDATES (repair.order._compute_callout_quote)
- Class-aware rate lookup (uses category.equipment_class).
- In-shop mode (x_fc_in_shop=True): skips callout fee + extra-tech +
travel; charges in_shop_labor_rate * hours * techs only. Per the
rate-card footnote 'In-Shop Labour Rate'.
- 30-min increment rounding ON TOP of the 1-hour floor:
billable_h = max(ceil(actual * 2) / 2, min_hours)
-> 20-min work bills 1.0 h
-> 75-min work bills 1.5 h
-> 95-min work bills 2.0 h
- Improved breakdown text shows the rate-card row name + class +
pro-ration math so the client can see how the total was computed.
NEW FIELDS
repair.order:
x_fc_in_shop (Boolean) - flip to switch the quote engine to
in-shop mode.
x_fc_callout_tier now includes 'rush' as a value (was missing).
visit-report wizard:
callout_in_shop related field - tech can flip the mode on-site if
the work was actually done in-store after pickup.
MIGRATION SCRIPT
migrations/19.0.2.1.0/post-migration.py runs once on existing
installs:
1. Updates stairlift / porch_lift / lift_chair categories
equipment_class -> lift_elevating
2. Wipes the 4 Bundle 9 rate-card xml_ids so the new noupdate=1
seed creates them with the correct printed values.
Fresh installs get the right values directly from the seed XML.
Admin-created custom rate rows (no xml_id) are NEVER touched.
VERIFIED END-TO-END (0 bugs across 28 checks)
Rate card matches printed values exactly:
regular/standard = $95/$85h/$75h PASS
rush/standard = $120/$85h/$75h PASS
after_hours/standard = $140/$85h/$75h PASS
regular/lift = $160/$110h/$110h PASS
Six end-to-end quote scenarios:
A. Standard 12km 20-min -> $180 ($95 + 1h*$85)
B. Lift 12km 20-min -> $270 ($160 + 1h*$110)
C. Rush 30km 1.2h -> $254.50
($120 + ceil(2.4)/2=1.5h * $85 + 5km*2*$0.70 = $7)
D. After-hours lift 2-tech 35km 2.6h -> $928.00
($240 + ceil(5.2)/2=3.0h * $110 * 2 + 10km*2*$0.70*2)
E. In-shop standard 2h -> $150 (2h * $75 in-shop, no callout)
F. In-shop lift 1.5h -> $165 (1.5h * $110 in-shop)
Seven delivery rates loaded with correct amounts; rush 40km calc
= $81 ($60 base + 15km*2*$0.70).
Stairlift / Porch Lift / Lift Chair categories correctly marked
lift_elevating; rest stay standard.
Bumped to 19.0.2.1.0.
Co-authored-by: Cursor <cursoragent@cursor.com>
89 lines
3.2 KiB
Python
89 lines
3.2 KiB
Python
# -*- coding: utf-8 -*-
|
|
# Copyright 2024-2026 Nexa Systems Inc.
|
|
# License OPL-1 (Odoo Proprietary License v1.0)
|
|
|
|
"""Delivery / pickup rate card (separate from repair callouts).
|
|
|
|
Per Westin's published rate card the DELIVERY / PICKUP CHARGES section is
|
|
a distinct service from repair callouts. These are charged when we move
|
|
equipment (drop-off of a sold unit, post-repair return delivery, removal
|
|
of old equipment, etc.).
|
|
"""
|
|
|
|
from odoo import api, fields, models
|
|
|
|
|
|
class FusionRepairDeliveryCharge(models.Model):
|
|
_name = 'fusion.repair.delivery.charge'
|
|
_description = 'Delivery / Pickup Rate Card'
|
|
_order = 'sequence, charge_type, id'
|
|
|
|
name = fields.Char(compute='_compute_name', store=True)
|
|
sequence = fields.Integer(default=10)
|
|
charge_type = fields.Selection(
|
|
[
|
|
('local', 'Local Service Area'),
|
|
('outside', 'Outside Local Area'),
|
|
('rush', 'Rush Pickup / Delivery'),
|
|
('lift_chair_install', 'Lift Chair Delivery and Set-Up'),
|
|
('hospital_bed_install', 'Hospital Bed Delivery and Set-Up'),
|
|
('stairlift_install', 'Stairlift Delivery and Set-Up'),
|
|
('stairlift_removal', 'Stairlift Removal'),
|
|
('other', 'Other'),
|
|
],
|
|
string='Charge Type',
|
|
required=True,
|
|
)
|
|
amount = fields.Monetary(
|
|
string='Amount',
|
|
currency_field='currency_id',
|
|
required=True,
|
|
)
|
|
travel_per_km_fee = fields.Monetary(
|
|
string='Per-km Fee (Rush, 2-way)',
|
|
currency_field='currency_id',
|
|
default=0.0,
|
|
help='Only applies to rush pickups/deliveries. Per the published card: '
|
|
'$60 plus $0.70 per km x 2-way.',
|
|
)
|
|
travel_distance_threshold_km = fields.Float(
|
|
string='Free Travel Distance (km, 2-way)',
|
|
default=0.0,
|
|
help='Only applies to rush. Above this km, every additional km is '
|
|
'charged travel_per_km_fee BOTH WAYS.',
|
|
)
|
|
description = fields.Text(translate=True)
|
|
currency_id = fields.Many2one(
|
|
'res.currency',
|
|
default=lambda self: self.env.company.currency_id,
|
|
)
|
|
company_id = fields.Many2one(
|
|
'res.company', default=lambda self: self.env.company,
|
|
)
|
|
active = fields.Boolean(default=True)
|
|
|
|
@api.depends('charge_type', 'amount')
|
|
def _compute_name(self):
|
|
for r in self:
|
|
label = dict(self._fields['charge_type'].selection).get(r.charge_type) or '?'
|
|
r.name = f'{label} - ${r.amount:.0f}'
|
|
|
|
@api.model
|
|
def get_charge(self, charge_type):
|
|
"""Return the active rate row for `charge_type`, empty recordset if none."""
|
|
return self.sudo().search([
|
|
('charge_type', '=', charge_type),
|
|
('active', '=', True),
|
|
('company_id', 'in', self.env.companies.ids),
|
|
], limit=1)
|
|
|
|
@api.model
|
|
def quote_rush(self, distance_km):
|
|
"""Convenience: returns the total for a Rush Pickup / Delivery at
|
|
`distance_km` one-way. Returns 0.0 if no rush row configured."""
|
|
rush = self.get_charge('rush')
|
|
if not rush:
|
|
return 0.0
|
|
over = max(distance_km - rush.travel_distance_threshold_km, 0.0)
|
|
return rush.amount + (over * 2.0 * rush.travel_per_km_fee)
|