diff --git a/fusion-plating/fusion_plating_configurator/models/fp_quote_configurator.py b/fusion-plating/fusion_plating_configurator/models/fp_quote_configurator.py
index fe6c60ab..1a8ee8ab 100644
--- a/fusion-plating/fusion_plating_configurator/models/fp_quote_configurator.py
+++ b/fusion-plating/fusion_plating_configurator/models/fp_quote_configurator.py
@@ -3,6 +3,8 @@
 # License OPL-1 (Odoo Proprietary License v1.0)
 # Part of the Fusion Plating product family.
 
+import math
+
 from odoo import api, fields, models, _
 from odoo.exceptions import UserError
 
@@ -117,7 +119,7 @@ class FpQuoteConfigurator(models.Model):
         'masking_zones', 'complexity', 'substrate_material',
         'quantity', 'batch_size', 'rush_order',
         'shipping_fee', 'delivery_fee',
-        'coating_config_id',
+        'coating_config_id', 'coating_config_id.certification_level',
     )
     def _compute_price(self):
         for rec in self:
@@ -143,10 +145,12 @@ class FpQuoteConfigurator(models.Model):
             else:  # flat_rate
                 unit_price = rule.base_rate
 
-            # --- Thickness factor ---
+            # --- Thickness scaling ---
+            # thickness_factor is a per-mil multiplier. A factor of 1.0
+            # means linear scaling by thickness (e.g. 3 mils = 3x price).
+            # A factor of 0.8 gives a volume discount (3 mils = 2.4x).
             thickness = rec.thickness_requested or 1.0
-            if rule.thickness_factor and rule.thickness_factor != 1.0:
-                unit_price *= rule.thickness_factor * thickness
+            unit_price *= thickness * rule.thickness_factor
 
             # --- Complexity surcharge ---
             surcharge_pct = 0
@@ -159,8 +163,13 @@ class FpQuoteConfigurator(models.Model):
             # --- Masking ---
             masking_cost = (rec.masking_zones or 0) * rule.masking_rate_per_zone
 
-            # --- Quantity ---
-            subtotal = (unit_price * rec.quantity) + masking_cost + rule.setup_fee
+            # --- Quantity + batch setup fees ---
+            num_batches = (
+                math.ceil(rec.quantity / rec.batch_size) if rec.batch_size
+                else 1
+            )
+            total_setup = rule.setup_fee * num_batches
+            subtotal = (unit_price * rec.quantity) + masking_cost + total_setup
 
             # --- Rush surcharge ---
             rush_amount = 0
@@ -178,40 +187,43 @@ class FpQuoteConfigurator(models.Model):
             rec.calculated_price = total
 
             # --- Build breakdown HTML ---
+            sym = rec.currency_id.symbol or '$'
             lines = []
+            method_label = dict(
+                rule._fields['pricing_method'].selection
+            ).get(rule.pricing_method, '')
             lines.append(
-                '<tr><td>Base (%s)</td><td class="text-end">$%.2f x %d</td></tr>'
-                % (dict(rule._fields['pricing_method'].selection).get(rule.pricing_method, ''),
-                   unit_price, rec.quantity)
+                '<tr><td>Base (%s)</td><td class="text-end">%s%.2f x %d</td></tr>'
+                % (method_label, sym, unit_price, rec.quantity)
             )
             if masking_cost:
                 lines.append(
-                    '<tr><td>Masking (%d zones)</td><td class="text-end">$%.2f</td></tr>'
-                    % (rec.masking_zones, masking_cost)
+                    '<tr><td>Masking (%d zones)</td><td class="text-end">%s%.2f</td></tr>'
+                    % (rec.masking_zones, sym, masking_cost)
                 )
-            if rule.setup_fee:
+            if total_setup:
                 lines.append(
-                    '<tr><td>Setup Fee</td><td class="text-end">$%.2f</td></tr>'
-                    % rule.setup_fee
+                    '<tr><td>Setup Fee (x%d batches)</td><td class="text-end">%s%.2f</td></tr>'
+                    % (num_batches, sym, total_setup)
                 )
             if rush_amount:
                 lines.append(
-                    '<tr><td>Rush Surcharge (%.0f%%)</td><td class="text-end">$%.2f</td></tr>'
-                    % (rule.rush_surcharge_percent, rush_amount)
+                    '<tr><td>Rush Surcharge (%.0f%%)</td><td class="text-end">%s%.2f</td></tr>'
+                    % (rule.rush_surcharge_percent, sym, rush_amount)
                 )
             if rec.shipping_fee:
                 lines.append(
-                    '<tr><td>Shipping</td><td class="text-end">$%.2f</td></tr>'
-                    % rec.shipping_fee
+                    '<tr><td>Shipping</td><td class="text-end">%s%.2f</td></tr>'
+                    % (sym, rec.shipping_fee)
                 )
             if rec.delivery_fee:
                 lines.append(
-                    '<tr><td>Delivery</td><td class="text-end">$%.2f</td></tr>'
-                    % rec.delivery_fee
+                    '<tr><td>Delivery</td><td class="text-end">%s%.2f</td></tr>'
+                    % (sym, rec.delivery_fee)
                 )
             lines.append(
-                '<tr class="fw-bold"><td>Total</td><td class="text-end">$%.2f</td></tr>'
-                % total
+                '<tr class="fw-bold"><td>Total</td><td class="text-end">%s%.2f</td></tr>'
+                % (sym, total)
             )
 
             rec.price_breakdown_html = (
diff --git a/fusion-plating/fusion_plating_configurator/views/fp_treatment_views.xml b/fusion-plating/fusion_plating_configurator/views/fp_treatment_views.xml
index 083402a2..1b801c82 100644
--- a/fusion-plating/fusion_plating_configurator/views/fp_treatment_views.xml
+++ b/fusion-plating/fusion_plating_configurator/views/fp_treatment_views.xml
@@ -16,6 +16,7 @@
                 <field name="name"/>
                 <field name="treatment_type"/>
                 <field name="default_duration_minutes"/>
+                <field name="currency_id" column_invisible="1"/>
                 <field name="default_cost"/>
                 <field name="active" widget="boolean_toggle"/>
             </list>
diff --git a/fusion-plating/fusion_plating_configurator/views/sale_order_views.xml b/fusion-plating/fusion_plating_configurator/views/sale_order_views.xml
index d9659ac0..e95d5235 100644
--- a/fusion-plating/fusion_plating_configurator/views/sale_order_views.xml
+++ b/fusion-plating/fusion_plating_configurator/views/sale_order_views.xml
@@ -39,7 +39,7 @@
                         <group string="Delivery">
                             <field name="x_fc_rush_order"/>
                             <field name="x_fc_delivery_method"/>
-                            <field name="x_fc_receiving_status" readonly="1"/>
+                            <field name="x_fc_receiving_status"/><!-- Will become computed when fusion_plating_receiving is installed -->
                         </group>
                     </group>
                 </page>