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>
74 lines
3.4 KiB
XML
74 lines
3.4 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!--
|
|
Westin Healthcare DELIVERY / PICKUP CHARGES from the published rate 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
|
|
|
|
Footnote 3: "Westin Healthcare Delivery includes the drop-off of any
|
|
product or material to a client's home office, facility or
|
|
predetermined location by one of the staff members. This includes
|
|
the return of equipment post-repair."
|
|
-->
|
|
<odoo>
|
|
<data noupdate="1">
|
|
|
|
<record id="delivery_local" model="fusion.repair.delivery.charge">
|
|
<field name="charge_type">local</field>
|
|
<field name="amount">35.00</field>
|
|
<field name="sequence">10</field>
|
|
<field name="description">Within the Brampton service area.</field>
|
|
</record>
|
|
|
|
<record id="delivery_outside" model="fusion.repair.delivery.charge">
|
|
<field name="charge_type">outside</field>
|
|
<field name="amount">60.00</field>
|
|
<field name="sequence">20</field>
|
|
<field name="description">Outside the local service area (per the published card).</field>
|
|
</record>
|
|
|
|
<record id="delivery_rush" model="fusion.repair.delivery.charge">
|
|
<field name="charge_type">rush</field>
|
|
<field name="amount">60.00</field>
|
|
<field name="travel_per_km_fee">0.70</field>
|
|
<field name="travel_distance_threshold_km">25.0</field>
|
|
<field name="sequence">30</field>
|
|
<field name="description">Rush pickup or delivery. $60 plus $0.70 per km, both ways, past 25 km.</field>
|
|
</record>
|
|
|
|
<record id="delivery_lift_chair" model="fusion.repair.delivery.charge">
|
|
<field name="charge_type">lift_chair_install</field>
|
|
<field name="amount">120.00</field>
|
|
<field name="sequence">40</field>
|
|
<field name="description">Lift Chair delivery and on-site set-up.</field>
|
|
</record>
|
|
|
|
<record id="delivery_hospital_bed" model="fusion.repair.delivery.charge">
|
|
<field name="charge_type">hospital_bed_install</field>
|
|
<field name="amount">120.00</field>
|
|
<field name="sequence">50</field>
|
|
<field name="description">Hospital Bed delivery and on-site assembly / set-up.</field>
|
|
</record>
|
|
|
|
<record id="delivery_stairlift_install" model="fusion.repair.delivery.charge">
|
|
<field name="charge_type">stairlift_install</field>
|
|
<field name="amount">300.00</field>
|
|
<field name="sequence">60</field>
|
|
<field name="description">Stairlift delivery and full set-up at client home.</field>
|
|
</record>
|
|
|
|
<record id="delivery_stairlift_removal" model="fusion.repair.delivery.charge">
|
|
<field name="charge_type">stairlift_removal</field>
|
|
<field name="amount">300.00</field>
|
|
<field name="sequence">70</field>
|
|
<field name="description">Removal of an old stairlift from client home.</field>
|
|
</record>
|
|
|
|
</data>
|
|
</odoo>
|