feat(step-library): full plating workflow coverage + per-recipe configurability + audit

Implements 2026-04-29-step-library-audit-design.md. Bumps fusion_plating
to 19.0.18.7.0, fusion_plating_jobs to 19.0.8.12.0, fusion_plating_reports
to 19.0.10.2.0.

LIBRARY EXPANSION
- 8 new Step Kinds: Receiving, Electroclean, Strike, Salt Spray,
  Adhesion Test, Hardness Test, Packaging, Tank Replenishment
- 4 new input types: photo, multi_point_thickness, bath_chemistry_panel, ph
- DEFAULT_INPUTS_BY_KIND rewritten to seed audit-grade prompts on every
  kind (bath IDs, photos, multi-point thickness, signatures, etc.)
- + Common Audit Fields one-click button on the library template form
- Default Operator Instructions relabel + alert callout

PER-RECIPE CONFIGURABILITY
- collect (Boolean) per recipe-step input prompt — opt out without delete
- collect_measurements (Boolean) master switch on recipe step — when off,
  wizard skips entirely
- template_input_id (Many2one) traceability link from recipe to library
- Recipe-step backend form view exposes the new fields with handle drag,
  toggle, target range, and library-source column

RUNTIME WIRING
- Step input wizard filters node.input_ids to step_input AND collect=True;
  short-circuits on collect_measurements=False
- New input types: photo (image widget + ir.attachment), multi-point
  thickness (5 readings + auto avg, skips empty cells), bath chemistry
  panel (pH/conc/temp/bath bundle), pH (0-14 numeric)
- Composite values JSON-serialized into value_text; photo via attachment

CoC REPORT
- Filters captured prompts to collect=True only
- Renders new input types with appropriate format

MIGRATION (post-migrate.py for 19.0.18.7.0)
- Backfills collect=True on recipe-step inputs
- Backfills collect_measurements=True on recipe steps
- Re-runs action_seed_default_inputs on every existing template
  (idempotent, preserves user edits)
- Backfills template_input_id by name-matching against source library
  template (handles JSONB vs varchar name columns)

SEED DATA
- 8 example templates (one per new kind) in fp_step_template_data.xml
  with noupdate=1

BATTLE TEST
- bt_step_library_audit.py: 29 assertions all PASS on entech

OWL EDITOR EXTENSION DEFERRED
- The simple recipe editor's per-step Instructions/Measurements
  expansions were not implemented in this pass; users configure via the
  backend recipe-step form. Track follow-up.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

fusion_plating/fusion_plating/__manifest__.py

@@ -5,7 +5,7 @@
 
 {
     'name': 'Fusion Plating',
-    'version': '19.0.12.6.2',
+    'version': '19.0.18.7.0',
     'category': 'Manufacturing/Plating',
     'summary': 'Core plating / metal finishing ERP: facilities, processes, tanks, baths, jobs, operators.',
     'description': """
@@ -119,6 +119,7 @@ Copyright (c) 2026 Nexa Systems Inc. All rights reserved.
         'data/fp_recipe_general_processing.xml',
         'data/fp_recipe_anodize.xml',
         'data/fp_recipe_chem_conversion.xml',
+        'data/fp_step_template_data.xml',
     ],
     'post_init_hook': 'post_init_hook',
     'assets': {

fusion_plating/fusion_plating/data/fp_step_template_data.xml

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2026 Nexa Systems Inc.
+    License OPL-1 (Odoo Proprietary License v1.0)
+    Part of the Fusion Plating product family.
+
+    Seed templates for the 8 new Step Kinds added in 19.0.18.7.0.
+    noupdate="1" so users can rename / archive without a module
+    upgrade reverting their edits.
+-->
+<odoo noupdate="1">
+
+    <record id="fp_step_template_receiving_std" model="fp.step.template">
+        <field name="name">Incoming Inspection (Standard)</field>
+        <field name="code">RECV_STD</field>
+        <field name="default_kind">receiving</field>
+        <field name="icon">fa-inbox</field>
+        <field name="description"><![CDATA[
+            <p>Verify quantity received against packing slip. Visually inspect
+            for damage, corrosion, oil residue. Photo any damage. Record
+            inspector initials.</p>
+        ]]></field>
+    </record>
+
+    <record id="fp_step_template_electroclean_std" model="fp.step.template">
+        <field name="name">Electroclean (Standard)</field>
+        <field name="code">ELEC_CLEAN_STD</field>
+        <field name="default_kind">electroclean</field>
+        <field name="icon">fa-bolt</field>
+        <field name="description"><![CDATA[
+            <p>Submerge rack and energise. Record actual amperage, voltage,
+            and current density. Verify polarity per recipe spec.</p>
+        ]]></field>
+    </record>
+
+    <record id="fp_step_template_strike_std" model="fp.step.template">
+        <field name="name">Wood's Nickel Strike (Standard)</field>
+        <field name="code">STRIKE_STD</field>
+        <field name="default_kind">strike</field>
+        <field name="icon">fa-flash</field>
+        <field name="description"><![CDATA[
+            <p>Apply thin nickel strike to ensure adhesion before main plate.
+            Record bath ID, time, temperature, electrical readings.</p>
+        ]]></field>
+    </record>
+
+    <record id="fp_step_template_salt_spray_std" model="fp.step.template">
+        <field name="name">Salt Spray Test (ASTM B117)</field>
+        <field name="code">SALT_SPRAY_STD</field>
+        <field name="default_kind">salt_spray</field>
+        <field name="icon">fa-tint</field>
+        <field name="description"><![CDATA[
+            <p>Submit test panel to salt spray cabinet for the specified
+            duration. Record red rust % and white corrosion %. Attach lab
+            report on completion.</p>
+        ]]></field>
+    </record>
+
+    <record id="fp_step_template_adhesion_std" model="fp.step.template">
+        <field name="name">Adhesion Test (Bend / Tape)</field>
+        <field name="code">ADHESION_STD</field>
+        <field name="default_kind">adhesion_test</field>
+        <field name="icon">fa-link</field>
+        <field name="description"><![CDATA[
+            <p>Perform adhesion test per spec (bend, tape, burnish, or file).
+            Photo coupon. Record PASS/FAIL.</p>
+        ]]></field>
+    </record>
+
+    <record id="fp_step_template_hardness_std" model="fp.step.template">
+        <field name="name">Microhardness Test</field>
+        <field name="code">HARDNESS_STD</field>
+        <field name="default_kind">hardness_test</field>
+        <field name="icon">fa-cube</field>
+        <field name="description"><![CDATA[
+            <p>Take three indentations minimum on the test coupon. Record
+            test load, individual readings, and the computed average.
+            Confirm equipment calibration is current.</p>
+        ]]></field>
+    </record>
+
+    <record id="fp_step_template_packaging_std" model="fp.step.template">
+        <field name="name">Packaging (Standard)</field>
+        <field name="code">PKG_STD</field>
+        <field name="default_kind">packaging</field>
+        <field name="icon">fa-archive</field>
+        <field name="description"><![CDATA[
+            <p>Wrap parts per customer spec (VCI bag, bubble wrap, separator
+            paper). Verify cert package included if required. Record quantity
+            per package and total package count.</p>
+        ]]></field>
+    </record>
+
+    <record id="fp_step_template_replenishment_std" model="fp.step.template">
+        <field name="name">Tank Replenishment</field>
+        <field name="code">REPL_STD</field>
+        <field name="default_kind">replenishment</field>
+        <field name="icon">fa-flask</field>
+        <field name="description"><![CDATA[
+            <p>Mid-shift bath top-up. Record bath ID, chemistry added (name
+            and amount), pH and concentration before/after. Operator must
+            sign.</p>
+        ]]></field>
+    </record>
+
+</odoo>

fusion_plating/fusion_plating/migrations/19.0.18.7.0/post-migrate.py

@@ -0,0 +1,89 @@
+# -*- coding: utf-8 -*-
+# Copyright 2026 Nexa Systems Inc.
+# License OPL-1 (Odoo Proprietary License v1.0)
+"""Post-migration for 19.0.18.7.0 — Step Library audit expansion.
+
+1. Default `collect=True` on all existing recipe-step inputs.
+2. Default `collect_measurements=True` on all existing recipe steps.
+3. Re-run action_seed_default_inputs on every existing template to
+   pull in the newly-added prompts (idempotent — skips rows whose
+   name is already present, so user edits survive).
+4. Backfill template_input_id by name-matching against the linked
+   library template (best-effort).
+"""
+
+import logging
+
+_logger = logging.getLogger(__name__)
+
+
+def migrate(cr, version):
+    if not version:
+        return
+    from odoo.api import Environment, SUPERUSER_ID
+    env = Environment(cr, SUPERUSER_ID, {})
+
+    # 1. Default collect=True on all recipe-step inputs that have NULL
+    cr.execute("""
+        UPDATE fusion_plating_process_node_input
+        SET collect = TRUE
+        WHERE collect IS NULL
+    """)
+    _logger.info(
+        "Backfilled collect=True on %s recipe-step inputs", cr.rowcount
+    )
+
+    # 2. Default collect_measurements=True on recipe steps with NULL
+    cr.execute("""
+        UPDATE fusion_plating_process_node
+        SET collect_measurements = TRUE
+        WHERE collect_measurements IS NULL
+    """)
+    _logger.info(
+        "Backfilled collect_measurements=True on %s recipe steps", cr.rowcount
+    )
+
+    # 3. Re-seed defaults on every existing template (idempotent)
+    Template = env['fp.step.template']
+    templates = Template.search([('default_kind', '!=', False)])
+    for tpl in templates:
+        try:
+            tpl.action_seed_default_inputs()
+        except Exception as e:
+            _logger.warning(
+                "Failed to re-seed defaults on template %s: %s", tpl.id, e
+            )
+    _logger.info("Re-seeded defaults on %s templates", len(templates))
+
+    # 4. Backfill template_input_id — name-match recipe-node inputs against
+    #    their parent recipe's source library template.
+    # Note: fusion_plating_process_node_input.name is plain varchar;
+    # fp_step_template_input.name is translatable JSONB (use ->>'en_US').
+    cr.execute("""
+        SELECT ni.id, ni.name, n.source_template_id
+        FROM fusion_plating_process_node_input ni
+        JOIN fusion_plating_process_node n ON n.id = ni.node_id
+        WHERE ni.template_input_id IS NULL
+          AND n.source_template_id IS NOT NULL
+    """)
+    rows = cr.fetchall()
+    matched = 0
+    for ni_id, name, tpl_id in rows:
+        if not name:
+            continue
+        cr.execute("""
+            SELECT id FROM fp_step_template_input
+            WHERE template_id = %s
+              AND name->>'en_US' = %s
+            LIMIT 1
+        """, (tpl_id, name))
+        match = cr.fetchone()
+        if match:
+            cr.execute("""
+                UPDATE fusion_plating_process_node_input
+                SET template_input_id = %s WHERE id = %s
+            """, (match[0], ni_id))
+            matched += 1
+    _logger.info(
+        "Backfilled template_input_id on %s recipe-step inputs", matched
+    )

fusion_plating/fusion_plating/models/fp_process_node.py

@@ -103,6 +103,15 @@ class FpProcessNode(models.Model):
         string='Description',
         help='Rich text instructions for this step.',
     )
+    # Sub 12d — master switch for runtime data collection. When False the
+    # operator wizard skips this step entirely (no input prompts shown).
+    collect_measurements = fields.Boolean(
+        string='Collect Measurements at Runtime',
+        default=True,
+        help='Master switch. When off, the operator wizard skips this step '
+             'entirely (no input prompts shown). Use for housekeeping steps '
+             'or when no measurement is needed for this recipe.',
+    )
     notes = fields.Text(
         string='Internal Notes',
         help='Internal notes (not shown to customers).',
@@ -633,6 +642,10 @@ class FpProcessNodeInput(models.Model):
             ('signature', 'Signature'),
             ('location_picker', 'Location Picker'),
             ('customer_wo', 'Customer WO #'),
+            ('photo', 'Photo'),
+            ('multi_point_thickness', 'Multi-Point Thickness (avg)'),
+            ('bath_chemistry_panel', 'Bath Chemistry Panel'),
+            ('ph', 'pH'),
         ],
         string='Input Type',
         required=True,
@@ -695,3 +708,21 @@ class FpProcessNodeInput(models.Model):
         ],
         string='Compliance Tag', default='none',
     )
+
+    # ===== Sub 12d — per-recipe configurability =============================
+    collect = fields.Boolean(
+        string='Collect This Measurement',
+        default=True,
+        help='Toggle off to skip this prompt at runtime without deleting '
+             'it. Recipe authors use this to opt out of library-seeded '
+             'prompts without affecting the library itself.',
+    )
+    template_input_id = fields.Many2one(
+        'fp.step.template.input',
+        string='Source Library Prompt',
+        ondelete='set null',
+        help='Set when this row was snapshot-copied from a library template '
+             'prompt. Powers "Reset to Library Defaults" — rows where this '
+             'is False are treated as recipe-only custom prompts and survive '
+             'the reset.',
+    )

fusion_plating/fusion_plating/models/fp_step_template.py

@@ -3,7 +3,7 @@
 # License OPL-1 (Odoo Proprietary License v1.0)
 # Part of the Fusion Plating product family.
 
-from odoo import api, fields, models
+from odoo import _, api, fields, models
 
 
 class FpStepTemplate(models.Model):
@@ -75,22 +75,30 @@ class FpStepTemplate(models.Model):
         help='Opens the transition form before Mark Done (Sub 12b).')
 
     default_kind = fields.Selection([
-        ('cleaning', 'Cleaning'),
+        ('receiving', 'Receiving / Incoming Inspection'),
-        ('etch', 'Etch'),
+        ('contract_review', 'Contract Review (QA-005)'),
-        ('rinse', 'Rinse'),
-        ('plate', 'Plating'),
-        ('bake', 'Bake'),
-        ('inspect', 'Inspection'),
         ('racking', 'Racking'),
-        ('derack', 'De-Racking'),
         ('mask', 'Masking'),
-        ('demask', 'De-Masking'),
+        ('cleaning', 'Cleaning'),
-        ('dry', 'Drying'),
+        ('electroclean', 'Electroclean'),
+        ('etch', 'Etch / Activation'),
+        ('rinse', 'Rinse'),
+        ('strike', 'Strike (Wood\'s Nickel / Activation)'),
+        ('plate', 'Plating'),
+        ('replenishment', 'Tank Replenishment'),
         ('wbf_test', 'Water Break Free Test'),
+        ('dry', 'Drying'),
+        ('bake', 'Bake (HE Relief / Stress Relief)'),
+        ('demask', 'De-Masking'),
+        ('derack', 'De-Racking'),
+        ('inspect', 'Inspection'),
+        ('hardness_test', 'Hardness Test (HV / HK / HRC)'),
+        ('adhesion_test', 'Adhesion Test'),
+        ('salt_spray', 'Salt Spray / Corrosion Test'),
         ('final_inspect', 'Final Inspection'),
+        ('packaging', 'Packaging / Pre-Ship'),
         ('ship', 'Shipping'),
         ('gating', 'Gating'),
-        ('contract_review', 'Contract Review (QA-005)'),
     ], string='Step Kind', help='Drives sane-default input seeding.')
 
     input_template_ids = fields.One2many(
@@ -138,43 +146,183 @@ class FpStepTemplate(models.Model):
     # each → 'each', min → 'min'. Format-only strings ('HH:MM') get
     # left blank since they're not units.
     DEFAULT_INPUTS_BY_KIND = {
+        'receiving': [
+            {'name': 'Qty Received', 'input_type': 'number',
+             'target_unit': 'each', 'sequence': 10, 'required': True},
+            {'name': 'Qty Rejected', 'input_type': 'number',
+             'target_unit': 'each', 'sequence': 20},
+            {'name': 'Customer PO# Verified', 'input_type': 'boolean', 'sequence': 30},
+            {'name': 'Packing Slip #', 'input_type': 'text', 'sequence': 40},
+            {'name': 'Condition Notes', 'input_type': 'text', 'sequence': 50},
+            {'name': 'Damage Photo', 'input_type': 'photo', 'sequence': 60},
+            {'name': 'Inspector Initials', 'input_type': 'signature',
+             'sequence': 70, 'required': True},
+        ],
         'cleaning': [
             {'name': 'Actual Time', 'input_type': 'time_seconds',
              'target_unit': 's', 'sequence': 10},
             {'name': 'Actual Temperature', 'input_type': 'temperature',
              'target_unit': 'f', 'sequence': 20},
+            {'name': 'Bath ID', 'input_type': 'text', 'sequence': 30},
+            {'name': 'Ultrasonic On', 'input_type': 'boolean', 'sequence': 40},
+            {'name': 'Titration Done', 'input_type': 'boolean', 'sequence': 50},
+        ],
+        'electroclean': [
+            {'name': 'Actual Time', 'input_type': 'time_seconds',
+             'target_unit': 's', 'sequence': 10},
+            {'name': 'Actual Temperature', 'input_type': 'temperature',
+             'target_unit': 'f', 'sequence': 20},
+            {'name': 'Amperage', 'input_type': 'number', 'sequence': 30,
+             'hint': 'A'},
+            {'name': 'Voltage', 'input_type': 'number', 'sequence': 40,
+             'hint': 'V'},
+            {'name': 'Current Density', 'input_type': 'number', 'sequence': 50,
+             'hint': 'ASF (A per sq ft)'},
+            {'name': 'Polarity', 'input_type': 'selection', 'sequence': 60,
+             'selection_options': 'anodic,cathodic,periodic'},
+            {'name': 'Bath ID', 'input_type': 'text', 'sequence': 70},
         ],
         'etch': [
             {'name': 'Actual Time', 'input_type': 'time_seconds',
              'target_unit': 's', 'sequence': 10},
             {'name': 'Actual Temperature', 'input_type': 'temperature',
              'target_unit': 'f', 'sequence': 20},
+            {'name': 'Acid Concentration', 'input_type': 'number', 'sequence': 30,
+             'hint': '% or g/L'},
+            {'name': 'Bath ID', 'input_type': 'text', 'sequence': 40},
+            {'name': 'HE Risk Flag', 'input_type': 'boolean', 'sequence': 50,
+             'hint': 'Hydrogen Embrittlement risk for high-strength steel'},
+        ],
+        'rinse': [
+            {'name': 'Rinse Type', 'input_type': 'selection', 'sequence': 10,
+             'selection_options': 'cascade,spray,DI,city'},
+            {'name': 'Conductivity', 'input_type': 'number', 'sequence': 20,
+             'hint': 'µS/cm — required for DI rinses'},
+            {'name': 'Actual Time', 'input_type': 'time_seconds',
+             'target_unit': 's', 'sequence': 30},
+        ],
+        'strike': [
+            {'name': 'Actual Time', 'input_type': 'time_seconds',
+             'target_unit': 's', 'sequence': 10},
+            {'name': 'Actual Temperature', 'input_type': 'temperature',
+             'target_unit': 'f', 'sequence': 20},
+            {'name': 'Amperage', 'input_type': 'number', 'sequence': 30,
+             'hint': 'A'},
+            {'name': 'Voltage', 'input_type': 'number', 'sequence': 40,
+             'hint': 'V'},
+            {'name': 'Current Density', 'input_type': 'number', 'sequence': 50,
+             'hint': 'ASF'},
+            {'name': 'Bath ID', 'input_type': 'text', 'sequence': 60},
         ],
-        'rinse': [],
         'plate': [
             {'name': 'Actual Time', 'input_type': 'time_hms',
              'target_unit': 'min', 'sequence': 10},
             {'name': 'Actual Temperature', 'input_type': 'temperature',
              'target_unit': 'f', 'sequence': 20},
-            {'name': 'Plating Thickness', 'input_type': 'thickness',
+            {'name': 'Bath ID', 'input_type': 'text', 'sequence': 30},
-             'target_unit': 'in', 'sequence': 30},
+            {'name': 'pH', 'input_type': 'ph', 'sequence': 40},
+            {'name': 'Bath Concentration', 'input_type': 'number', 'sequence': 50,
+             'hint': 'g/L'},
+            {'name': 'Current Density', 'input_type': 'number', 'sequence': 60,
+             'hint': 'ASF — electroplate only'},
+            {'name': 'Plating Thickness', 'input_type': 'multi_point_thickness',
+             'target_unit': 'in', 'sequence': 70},
         ],
-        'bake': [
+        'replenishment': [
-            {'name': 'Time In', 'input_type': 'text', 'sequence': 10},
+            {'name': 'Bath ID', 'input_type': 'text', 'sequence': 10,
-            {'name': 'Time Out', 'input_type': 'text', 'sequence': 20},
+             'required': True},
+            {'name': 'Chemistry Added', 'input_type': 'text', 'sequence': 20,
+             'hint': 'name + amount, e.g. "Nickel sulfamate 500mL"'},
+            {'name': 'pH Before', 'input_type': 'ph', 'sequence': 30},
+            {'name': 'pH After', 'input_type': 'ph', 'sequence': 40},
+            {'name': 'Concentration Before', 'input_type': 'number', 'sequence': 50},
+            {'name': 'Concentration After', 'input_type': 'number', 'sequence': 60},
+            {'name': 'Operator Initials', 'input_type': 'signature',
+             'sequence': 70, 'required': True},
+        ],
+        'wbf_test': [
+            {'name': 'Result', 'input_type': 'pass_fail', 'sequence': 10,
+             'required': True},
+            {'name': 'Retest Count', 'input_type': 'number', 'sequence': 20},
+            {'name': 'Photo on FAIL', 'input_type': 'photo', 'sequence': 30},
+        ],
+        'dry': [
+            {'name': 'Dry Method', 'input_type': 'selection', 'sequence': 10,
+             'selection_options': 'hot air,oven,spin'},
+            {'name': 'Actual Time', 'input_type': 'time_seconds',
+             'target_unit': 's', 'sequence': 20},
             {'name': 'Actual Temperature', 'input_type': 'temperature',
              'target_unit': 'f', 'sequence': 30},
         ],
+        'bake': [
+            {'name': 'Time In', 'input_type': 'date', 'sequence': 10},
+            {'name': 'Time Out', 'input_type': 'date', 'sequence': 20},
+            {'name': 'Actual Temperature', 'input_type': 'temperature',
+             'target_unit': 'f', 'sequence': 30},
+            {'name': 'Oven ID', 'input_type': 'text', 'sequence': 40},
+            {'name': 'Chart Recorder File', 'input_type': 'photo', 'sequence': 50,
+             'hint': 'Attach AMS-2759 chart-recorder file'},
+        ],
         'racking': [
             {'name': 'Actual Qty', 'input_type': 'number',
-             'target_unit': 'each', 'sequence': 10},
+             'target_unit': 'each', 'sequence': 10, 'required': True},
+            {'name': 'Rack ID', 'input_type': 'text', 'sequence': 20},
+            {'name': 'Masking Applied', 'input_type': 'boolean', 'sequence': 30},
+            {'name': 'Photo of Racked Load', 'input_type': 'photo', 'sequence': 40},
         ],
         'derack': [
             {'name': 'Actual Qty', 'input_type': 'number',
              'target_unit': 'each', 'sequence': 10},
+            {'name': 'Mask Removal Method', 'input_type': 'selection', 'sequence': 20,
+             'selection_options': 'mechanical,solvent,thermal,not applicable'},
+            {'name': 'Residue Check', 'input_type': 'pass_fail', 'sequence': 30},
+        ],
+        'mask': [
+            {'name': 'Actual Qty', 'input_type': 'number',
+             'target_unit': 'each', 'sequence': 10},
+            {'name': 'Mask Material', 'input_type': 'selection', 'sequence': 20,
+             'selection_options': 'Microshield,latex tape,vinyl plugs,wax,other'},
+            {'name': 'Photo of Masked Parts', 'input_type': 'photo', 'sequence': 30},
+        ],
+        'demask': [
+            {'name': 'Residue Check', 'input_type': 'pass_fail', 'sequence': 10},
+            {'name': 'Surface Condition', 'input_type': 'selection', 'sequence': 20,
+             'selection_options': 'clean,marks,needs rework'},
         ],
         'inspect': [
-            {'name': 'PASS/FAIL', 'input_type': 'pass_fail', 'sequence': 10},
+            {'name': 'Result', 'input_type': 'pass_fail', 'sequence': 10,
+             'required': True},
+            {'name': 'Defect Type', 'input_type': 'selection', 'sequence': 20,
+             'selection_options': 'pitting,burn,blister,peel,missing coverage,none'},
+            {'name': 'Thickness Sample', 'input_type': 'thickness',
+             'target_unit': 'in', 'sequence': 30},
+            {'name': 'Photo', 'input_type': 'photo', 'sequence': 40},
+            {'name': 'Inspector Signature', 'input_type': 'signature', 'sequence': 50},
+        ],
+        'hardness_test': [
+            {'name': 'Test Load', 'input_type': 'number', 'sequence': 10,
+             'hint': 'gf'},
+            {'name': 'Readings (HV/HK/HRC)', 'input_type': 'multi_point_thickness',
+             'sequence': 20, 'hint': 'Three indents minimum'},
+            {'name': 'Equipment ID', 'input_type': 'text', 'sequence': 30},
+            {'name': 'Last Calibration Date', 'input_type': 'date', 'sequence': 40},
+        ],
+        'adhesion_test': [
+            {'name': 'Test Method', 'input_type': 'selection', 'sequence': 10,
+             'selection_options': 'bend,tape,burnish,file'},
+            {'name': 'Result', 'input_type': 'pass_fail', 'sequence': 20,
+             'required': True},
+            {'name': 'Photo of Coupon', 'input_type': 'photo', 'sequence': 30},
+        ],
+        'salt_spray': [
+            {'name': 'Test Duration', 'input_type': 'number', 'sequence': 10,
+             'hint': 'hours'},
+            {'name': 'Result', 'input_type': 'pass_fail', 'sequence': 20,
+             'required': True},
+            {'name': 'Red Rust %', 'input_type': 'number', 'sequence': 30},
+            {'name': 'White Corrosion %', 'input_type': 'number', 'sequence': 40},
+            {'name': 'Lab Report', 'input_type': 'photo', 'sequence': 50,
+             'hint': 'Attach scanned lab report'},
         ],
         'final_inspect': [
             {'name': 'Outgoing Part Count Verified',
@@ -183,35 +331,80 @@ class FpStepTemplate(models.Model):
              'target_unit': 'each', 'sequence': 20},
             {'name': 'Qty Rejected', 'input_type': 'number',
              'target_unit': 'each', 'sequence': 30},
+            {'name': 'Defect Categorization', 'input_type': 'selection', 'sequence': 35,
+             'selection_options': 'pitting,burn,blister,peel,missing coverage,dimensional,none'},
             {'name': 'Actual Coating Thickness',
-             'input_type': 'thickness', 'target_unit': 'in', 'sequence': 40},
+             'input_type': 'multi_point_thickness',
-            {'name': 'Pass/Fail', 'input_type': 'pass_fail', 'sequence': 50},
+             'target_unit': 'in', 'sequence': 40},
+            {'name': 'Dimensional Verification', 'input_type': 'pass_fail',
+             'sequence': 45},
+            {'name': 'Surface Finish (Ra)', 'input_type': 'number', 'sequence': 47,
+             'hint': 'µin'},
+            {'name': 'Pass/Fail', 'input_type': 'pass_fail', 'sequence': 50,
+             'required': True},
+            {'name': 'Inspector Signature', 'input_type': 'signature', 'sequence': 60},
         ],
-        'wbf_test': [
+        'packaging': [
-            {'name': 'PASS/FAIL', 'input_type': 'pass_fail', 'sequence': 10},
+            {'name': 'Packaging Type', 'input_type': 'selection', 'sequence': 10,
+             'selection_options': 'VCI bag,bubble wrap,separator paper,custom crate,other'},
+            {'name': 'Qty Per Package', 'input_type': 'number',
+             'target_unit': 'each', 'sequence': 20},
+            {'name': 'Package Count', 'input_type': 'number', 'sequence': 30},
+            {'name': 'Cert Package Included', 'input_type': 'boolean', 'sequence': 40},
+            {'name': 'Customer-Supplied Packaging', 'input_type': 'boolean',
+             'sequence': 50},
         ],
-        'mask': [
-            {'name': 'Actual Qty', 'input_type': 'number',
-             'target_unit': 'each', 'sequence': 10},
-        ],
-        'demask': [],
-        'dry': [],
         'ship': [
             {'name': 'Outgoing Qty', 'input_type': 'number',
-             'target_unit': 'each', 'sequence': 10},
+             'target_unit': 'each', 'sequence': 10, 'required': True},
+            {'name': 'Carrier', 'input_type': 'selection', 'sequence': 20,
+             'selection_options': 'UPS,FedEx,Purolator,Customer Pickup,Other'},
+            {'name': 'Tracking #', 'input_type': 'text', 'sequence': 30},
+            {'name': 'BoL #', 'input_type': 'text', 'sequence': 40},
+            {'name': 'Photo of Sealed Shipment', 'input_type': 'photo',
+             'sequence': 50},
         ],
         'gating': [],
-        # Sub 4 + 12c follow-up — Contract Review step (Policy B).
-        # The shop-floor step itself is a tickbox; the heavy QA-005 form
-        # is opened via fp.contract.review (separate model). These
-        # inputs capture summary fields for the chronological CoC.
         'contract_review': [
-            {'name': 'Reviewer Initials', 'input_type': 'text', 'sequence': 10},
+            {'name': 'Reviewer Initials', 'input_type': 'signature', 'sequence': 10},
             {'name': 'Date Reviewed', 'input_type': 'date', 'sequence': 20},
             {'name': 'QA-005 Approved', 'input_type': 'pass_fail', 'sequence': 30},
         ],
     }
 
+    COMMON_AUDIT_FIELDS = [
+        {'name': 'Operator Initials', 'input_type': 'signature',
+         'required': True, 'sequence': 800},
+        {'name': 'Bath ID', 'input_type': 'text', 'sequence': 810},
+        {'name': 'Photo on Failure', 'input_type': 'photo', 'sequence': 820,
+         'hint': 'upload only if failure observed'},
+        {'name': 'Equipment ID', 'input_type': 'text', 'sequence': 830},
+    ]
+
+    def action_add_common_audit_fields(self):
+        """Idempotently append the common audit fields to this template.
+        Skips rows whose name already exists. Logs to chatter.
+        """
+        Input = self.env['fp.step.template.input']
+        for tpl in self:
+            existing_names = set(tpl.input_template_ids.mapped('name'))
+            added = []
+            for spec in self.COMMON_AUDIT_FIELDS:
+                if spec['name'] in existing_names:
+                    continue
+                Input.create({
+                    'template_id': tpl.id,
+                    **spec,
+                })
+                added.append(spec['name'])
+            if added:
+                tpl.message_post(
+                    body=_('Added common audit fields: %s') % ', '.join(added),
+                    message_type='notification',
+                    subtype_xmlid='mail.mt_note',
+                )
+        return True
+
     def action_seed_default_inputs(self):
         """Seed input_template_ids based on default_kind. Idempotent —
         only adds inputs whose names don't already exist on this template.

fusion_plating/fusion_plating/models/fp_step_template_input.py

@@ -36,6 +36,10 @@ class FpStepTemplateInput(models.Model):
         ('temperature', 'Temperature'),
         ('thickness', 'Thickness'),
         ('pass_fail', 'Pass / Fail'),
+        ('photo', 'Photo'),
+        ('multi_point_thickness', 'Multi-Point Thickness (avg)'),
+        ('bath_chemistry_panel', 'Bath Chemistry Panel'),
+        ('ph', 'pH'),
     ], string='Input Type', required=True, default='text')
     target_min = fields.Float(string='Target Min',
         help='Lower bound of the acceptable range, expressed in Target Unit.')

fusion_plating/fusion_plating/scripts/bt_step_library_audit.py

@@ -0,0 +1,167 @@
+# -*- coding: utf-8 -*-
+"""Battle test — Step Library audit expansion (Sub 12d).
+
+Run via odoo-shell on entech:
+
+  cat bt_step_library_audit.py | ssh pve-worker5 "pct exec 111 -- bash -c \\
+    'su - odoo -s /bin/bash -c \"/usr/bin/odoo shell -c /etc/odoo/odoo.conf -d admin --no-http\"'"
+
+Asserts properties of the new architecture and prints PASS/FAIL.
+"""
+
+NEW_KINDS = [
+    'receiving', 'electroclean', 'strike', 'salt_spray',
+    'adhesion_test', 'hardness_test', 'packaging', 'replenishment',
+]
+
+results = []
+
+
+def check(idx, name, condition, detail=''):
+    status = 'PASS' if condition else 'FAIL'
+    results.append((idx, name, status, detail))
+    print('[%s] #%-2d %s -- %s' % (status, idx, name, detail))
+
+
+Template = env['fp.step.template']
+Node = env['fusion.plating.process.node']
+NodeInput = env['fusion.plating.process.node.input']
+
+# 1. Every new Step Kind has at least 1 seed template loaded
+for kind in NEW_KINDS:
+    cnt = Template.search_count([('default_kind', '=', kind)])
+    check(1, 'seed template for kind %s' % kind, cnt >= 1,
+          '%d found' % cnt)
+
+# 2. New input types reachable from the library Selection
+itypes = dict(Template._fields['default_kind'].selection)
+all_kinds_present = all(k in itypes for k in NEW_KINDS)
+check(2, 'all 8 new kinds in Selection', all_kinds_present,
+      'kinds=%d total in selection' % len(itypes))
+
+# 3. fp.step.template.input has the 4 new input_type entries
+ti = dict(env['fp.step.template.input']._fields['input_type'].selection)
+new_types_present = all(t in ti for t in
+                        ['photo', 'multi_point_thickness',
+                         'bath_chemistry_panel', 'ph'])
+check(3, 'library input has 4 new types', new_types_present,
+      '%d total types' % len(ti))
+
+# 4. Recipe-node input has the 4 new input_type entries
+ni = dict(NodeInput._fields['input_type'].selection)
+new_types_in_node = all(t in ni for t in
+                        ['photo', 'multi_point_thickness',
+                         'bath_chemistry_panel', 'ph'])
+check(4, 'recipe-node input has 4 new types', new_types_in_node,
+      '%d total types' % len(ni))
+
+# 5. collect + collect_measurements + template_input_id fields exist
+check(5, 'collect on node-input', 'collect' in NodeInput._fields,
+      'present' if 'collect' in NodeInput._fields else 'missing')
+check(6, 'collect_measurements on node', 'collect_measurements' in Node._fields,
+      'present')
+check(7, 'template_input_id on node-input', 'template_input_id' in NodeInput._fields,
+      'present')
+
+# 8. action_seed_default_inputs is idempotent + preserves edits
+tpl = Template.create({
+    'name': 'BT-SeedIdem-%s' % env.cr.now(),
+    'default_kind': 'plate',
+})
+tpl.action_seed_default_inputs()
+n1 = len(tpl.input_template_ids)
+# user edit
+tpl.input_template_ids[0].name = 'EDITED-DO-NOT-CLOBBER'
+tpl.action_seed_default_inputs()
+n2 = len(tpl.input_template_ids)
+edited = tpl.input_template_ids.filtered(
+    lambda i: i.name == 'EDITED-DO-NOT-CLOBBER'
+)
+check(8, 'seed idempotent + preserves edits',
+      n1 <= n2 and len(edited) == 1,
+      'before=%d after=%d edited_kept=%s' % (n1, n2, bool(edited)))
+tpl.unlink()
+
+# 9. action_add_common_audit_fields is idempotent
+tpl = Template.create({
+    'name': 'BT-AuditIdem-%s' % env.cr.now(),
+    'default_kind': 'plate',
+})
+tpl.action_add_common_audit_fields()
+m1 = len(tpl.input_template_ids)
+tpl.action_add_common_audit_fields()
+m2 = len(tpl.input_template_ids)
+check(9, 'common audit fields idempotent', m1 == m2,
+      'first=%d second=%d' % (m1, m2))
+tpl.unlink()
+
+# 10. collect=True is default on new node-inputs
+node = Node.create({
+    'name': 'BT-CollectDefault',
+    'node_type': 'step',
+})
+ni = NodeInput.create({
+    'node_id': node.id,
+    'name': 'BT-Prompt',
+    'input_type': 'text',
+    'kind': 'step_input',
+})
+check(10, 'collect default=True on new node-input', ni.collect,
+      'collect=%s' % ni.collect)
+
+# 11. collect_measurements=True default on new node
+check(11, 'collect_measurements default=True on new node',
+      node.collect_measurements,
+      'collect_measurements=%s' % node.collect_measurements)
+node.unlink()
+
+# 12. Wizard filter excludes collect=False rows (simulated)
+node = Node.create({'name': 'BT-Filter', 'node_type': 'step'})
+ni_on = NodeInput.create({
+    'node_id': node.id, 'name': 'On', 'input_type': 'text',
+    'kind': 'step_input', 'collect': True,
+})
+ni_off = NodeInput.create({
+    'node_id': node.id, 'name': 'Off', 'input_type': 'text',
+    'kind': 'step_input', 'collect': False,
+})
+visible = node.input_ids.filtered(
+    lambda i: i.kind == 'step_input' and i.collect
+)
+check(12, 'wizard filter excludes collect=False',
+      ni_off not in visible and ni_on in visible,
+      '%d/%d visible' % (len(visible), len(node.input_ids)))
+
+# 13. Master switch path — when False, filter returns empty
+node.collect_measurements = False
+empty_path = (not node.collect_measurements)
+check(13, 'master collect_measurements=False short-circuits',
+      empty_path, 'master=False')
+node.unlink()
+
+# 14. Multi-point thickness average compute (unit math, no DB)
+class _Stub:
+    def __init__(self, *vals):
+        self.point_1, self.point_2, self.point_3, \
+            self.point_4, self.point_5 = vals
+        non_empty = [v for v in vals if v]
+        self.point_avg = sum(non_empty) / len(non_empty) if non_empty else 0
+s = _Stub(0.001, 0.0012, 0.0011, 0, 0)
+check(14, 'multi-point avg skips empties',
+      round(s.point_avg, 5) == 0.0011,
+      'avg=%.5f' % s.point_avg)
+
+# 15. Sample DEFAULT_INPUTS_BY_KIND payload present for each new kind
+for kind in NEW_KINDS:
+    seeded = Template.DEFAULT_INPUTS_BY_KIND.get(kind, [])
+    check(15, 'defaults dict has entries for %s' % kind,
+          len(seeded) >= 1,
+          '%d default prompts' % len(seeded))
+
+# Summary
+total = len(results)
+passed = sum(1 for r in results if r[2] == 'PASS')
+failed = sum(1 for r in results if r[2] == 'FAIL')
+print('\n=== %d / %d PASSED -- %d FAILED ===' % (passed, total, failed))
+
+env.cr.commit()

fusion_plating/fusion_plating/views/fp_process_node_views.xml

@@ -117,16 +117,28 @@
                             <field name="description" widget="html"/>
                         </page>
                         <page string="Operator Inputs" name="inputs">
+                            <group>
+                                <field name="collect_measurements"
+                                       widget="boolean_toggle"
+                                       help="Master switch — when off, the operator wizard skips this step entirely."/>
+                            </group>
                             <field name="input_ids">
                                 <list editable="bottom">
                                     <field name="sequence" widget="handle"/>
+                                    <field name="collect" widget="boolean_toggle"
+                                           string="Collect"/>
                                     <field name="name"/>
                                     <field name="input_type"/>
+                                    <field name="kind" optional="hide"/>
+                                    <field name="target_min" optional="hide"/>
+                                    <field name="target_max" optional="hide"/>
+                                    <field name="target_unit" optional="hide"/>
                                     <field name="required"/>
                                     <field name="hint"/>
-                                    <field name="uom"/>
                                     <field name="selection_options"
                                            invisible="input_type != 'selection'"/>
+                                    <field name="template_input_id" optional="hide"
+                                           string="From Library"/>
                                 </list>
                             </field>
                         </page>

fusion_plating/fusion_plating/views/fp_step_template_views.xml

@@ -33,6 +33,10 @@
                     <button name="action_seed_default_inputs" type="object"
                             string="Seed Default Inputs" class="btn-secondary"
                             invisible="not default_kind"/>
+                    <button name="action_add_common_audit_fields" type="object"
+                            string="+ Common Audit Fields"
+                            class="btn-secondary"
+                            help="Append Operator Initials, Bath ID, Photo on Failure, Equipment ID"/>
                 </header>
                 <sheet>
                     <div class="oe_title">
@@ -58,9 +62,14 @@
                         </group>
                     </group>
                     <notebook>
-                        <page string="Instructions" name="instructions">
+                        <page string="Default Operator Instructions" name="instructions">
+                            <div class="alert alert-info" role="alert">
+                                Standing instructions the office gives operators for this
+                                step. Snapshot-copied onto every recipe that uses this
+                                step. Recipe authors can override per recipe.
+                            </div>
                             <field name="description"
-                                   placeholder="Rich-text instructions / WI reference."/>
+                                   placeholder="e.g. Mask threaded holes with vinyl plugs. Use Microshield for through-holes."/>
                         </page>
                         <page string="Operation Measurements" name="op_measurements">
                             <field name="input_template_ids">

fusion_plating/fusion_plating_configurator/__init__.py

@@ -75,11 +75,55 @@ def _backfill_cloned_process_names(env):
         renamed += 1
 
 
+def _backfill_part_material_id(env):
+    """Pin existing parts AND quote configurators to a row in the
+    shared material library.
+
+    Pre-Sub-12d, both models only had a `substrate_material` Selection.
+    This sets `material_id` on every record that doesn't yet have one,
+    matching by substrate_material → seed material XML id. Idempotent.
+    """
+    Part = env['fp.part.catalog']
+    Material = env['fp.part.material']
+    if Part is None or Material is None:
+        return
+    # Map legacy Selection key → seed XML id (the generic per-category entry).
+    xmlid_by_key = {
+        'aluminium': 'fusion_plating_configurator.fp_material_aluminium',
+        'steel': 'fusion_plating_configurator.fp_material_steel',
+        'stainless': 'fusion_plating_configurator.fp_material_stainless',
+        'copper': 'fusion_plating_configurator.fp_material_copper',
+        'titanium': 'fusion_plating_configurator.fp_material_titanium',
+        'other': 'fusion_plating_configurator.fp_material_other',
+    }
+    cache = {}
+    for key, xmlid in xmlid_by_key.items():
+        rec = env.ref(xmlid, raise_if_not_found=False)
+        if rec:
+            cache[key] = rec.id
+    if not cache:
+        return
+    # Parts
+    for part in Part.search([('material_id', '=', False)]):
+        mid = cache.get(part.substrate_material)
+        if mid:
+            part.material_id = mid
+    # Quote configurators (same Selection key → same library)
+    Quote = env['fp.quote.configurator']
+    if Quote is not None:
+        for q in Quote.search([('material_id', '=', False)]):
+            mid = cache.get(q.substrate_material)
+            if mid:
+                q.material_id = mid
+
+
 def post_init_hook(env):
     _backfill_currency(env)
     _backfill_cloned_process_names(env)
+    _backfill_part_material_id(env)
 
 
 def post_upgrade_hook(env):
     _backfill_currency(env)
     _backfill_cloned_process_names(env)
+    _backfill_part_material_id(env)

fusion_plating/fusion_plating_configurator/__manifest__.py

@@ -5,7 +5,7 @@
 
 {
     'name': 'Fusion Plating — Configurator',
-    'version': '19.0.18.3.2',
+    'version': '19.0.18.6.0',
     'category': 'Manufacturing/Plating',
     'summary': 'Quotation configurator with part catalog, coating configs, and formula-based pricing engine.',
     'description': """
@@ -40,7 +40,10 @@ Provides:
         'data/fp_configurator_sequence_data.xml',
         'data/fp_sub5_sequence_data.xml',
         'data/fp_treatment_data.xml',
+        'data/fp_part_material_data.xml',
         'views/fp_treatment_views.xml',
+        'views/fp_part_material_views.xml',
+        'views/fp_coating_thickness_views.xml',
         'views/fp_part_catalog_views.xml',
         'views/fp_process_node_part_scoped_views.xml',
         'views/fp_coating_config_views.xml',

fusion_plating/fusion_plating_configurator/data/fp_part_material_data.xml

@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2026 Nexa Systems Inc.
+    License OPL-1 (Odoo Proprietary License v1.0)
+    Part of the Fusion Plating product family.
+
+    Seed materials. noupdate="1" so users can rename / archive without
+    a module upgrade reverting their edits.
+-->
+<odoo noupdate="1">
+
+    <!-- Aluminium family -->
+    <record id="fp_material_aluminium" model="fp.part.material">
+        <field name="name">Aluminium</field>
+        <field name="category">aluminium</field>
+        <field name="sequence">10</field>
+    </record>
+    <record id="fp_material_aluminium_6061" model="fp.part.material">
+        <field name="name">Aluminium 6061</field>
+        <field name="category">aluminium</field>
+        <field name="sequence">11</field>
+        <field name="notes">Common 6000-series alloy. Magnesium + silicon.</field>
+    </record>
+    <record id="fp_material_aluminium_6063" model="fp.part.material">
+        <field name="name">Aluminium 6063</field>
+        <field name="category">aluminium</field>
+        <field name="sequence">12</field>
+        <field name="notes">Architectural 6000-series alloy.</field>
+    </record>
+    <record id="fp_material_aluminium_7075" model="fp.part.material">
+        <field name="name">Aluminium 7075</field>
+        <field name="category">aluminium</field>
+        <field name="sequence">13</field>
+        <field name="notes">High-strength 7000-series. Aerospace.</field>
+    </record>
+    <record id="fp_material_aluminium_2024" model="fp.part.material">
+        <field name="name">Aluminium 2024</field>
+        <field name="category">aluminium</field>
+        <field name="sequence">14</field>
+        <field name="notes">2000-series. Copper alloy, aerospace.</field>
+    </record>
+
+    <!-- Steel family -->
+    <record id="fp_material_steel" model="fp.part.material">
+        <field name="name">Steel</field>
+        <field name="category">steel</field>
+        <field name="sequence">20</field>
+    </record>
+    <record id="fp_material_steel_1018" model="fp.part.material">
+        <field name="name">Steel 1018</field>
+        <field name="category">steel</field>
+        <field name="sequence">21</field>
+        <field name="notes">Low-carbon mild steel.</field>
+    </record>
+    <record id="fp_material_steel_4140" model="fp.part.material">
+        <field name="name">Steel 4140</field>
+        <field name="category">steel</field>
+        <field name="sequence">22</field>
+        <field name="notes">Chrome-moly alloy steel.</field>
+    </record>
+
+    <!-- Stainless family -->
+    <record id="fp_material_stainless" model="fp.part.material">
+        <field name="name">Stainless Steel</field>
+        <field name="category">stainless</field>
+        <field name="sequence">30</field>
+    </record>
+    <record id="fp_material_stainless_304" model="fp.part.material">
+        <field name="name">Stainless 304</field>
+        <field name="category">stainless</field>
+        <field name="sequence">31</field>
+        <field name="notes">Austenitic. General-purpose stainless.</field>
+    </record>
+    <record id="fp_material_stainless_316" model="fp.part.material">
+        <field name="name">Stainless 316</field>
+        <field name="category">stainless</field>
+        <field name="sequence">32</field>
+        <field name="notes">Marine-grade. Molybdenum-bearing.</field>
+    </record>
+    <record id="fp_material_stainless_17_4" model="fp.part.material">
+        <field name="name">Stainless 17-4 PH</field>
+        <field name="category">stainless</field>
+        <field name="sequence">33</field>
+        <field name="notes">Precipitation hardening.</field>
+    </record>
+
+    <!-- Copper family -->
+    <record id="fp_material_copper" model="fp.part.material">
+        <field name="name">Copper</field>
+        <field name="category">copper</field>
+        <field name="sequence">40</field>
+    </record>
+    <record id="fp_material_brass_360" model="fp.part.material">
+        <field name="name">Brass C360</field>
+        <field name="category">copper</field>
+        <field name="sequence">41</field>
+        <field name="density">8.5</field>
+        <field name="notes">Free-machining brass.</field>
+    </record>
+    <record id="fp_material_bronze" model="fp.part.material">
+        <field name="name">Bronze</field>
+        <field name="category">copper</field>
+        <field name="sequence">42</field>
+        <field name="density">8.8</field>
+    </record>
+
+    <!-- Titanium family -->
+    <record id="fp_material_titanium" model="fp.part.material">
+        <field name="name">Titanium</field>
+        <field name="category">titanium</field>
+        <field name="sequence">50</field>
+    </record>
+    <record id="fp_material_titanium_grade_2" model="fp.part.material">
+        <field name="name">Titanium Grade 2</field>
+        <field name="category">titanium</field>
+        <field name="sequence">51</field>
+        <field name="notes">Commercially pure titanium.</field>
+    </record>
+    <record id="fp_material_titanium_grade_5" model="fp.part.material">
+        <field name="name">Titanium Grade 5 (Ti-6Al-4V)</field>
+        <field name="category">titanium</field>
+        <field name="sequence">52</field>
+        <field name="density">4.43</field>
+        <field name="notes">Aerospace alloy.</field>
+    </record>
+
+    <!-- Other -->
+    <record id="fp_material_other" model="fp.part.material">
+        <field name="name">Other</field>
+        <field name="category">other</field>
+        <field name="sequence">99</field>
+    </record>
+
+</odoo>

fusion_plating/fusion_plating_configurator/models/__init__.py

@@ -4,6 +4,7 @@
 # Part of the Fusion Plating product family.
 
 from . import fp_treatment
+from . import fp_part_material
 from . import fp_part_catalog
 from . import fp_coating_thickness
 from . import fp_coating_config

fusion_plating/fusion_plating_configurator/models/fp_part_catalog.py

@@ -19,6 +19,11 @@ class FpPartCatalog(models.Model):
     _description = 'Fusion Plating — Part Catalog'
     _inherit = ['mail.thread', 'mail.activity.mixin']
     _order = 'partner_id, part_number, revision desc'
+    # Customers always type the part NUMBER in m2o pickers, never the part
+    # name. Routing rec_name to part_number makes both quick-create and
+    # "Create and edit..." land the typed string in the correct field.
+    _rec_name = 'part_number'
+    _rec_names_search = ['part_number', 'name']
 
     display_name = fields.Char(
         string='Display Name',
@@ -44,10 +49,26 @@ class FpPartCatalog(models.Model):
     revision_ids = fields.One2many(
         'fp.part.catalog', 'parent_part_id', string='Revision History',
     )
+    # User-facing material picker. Customers want custom materials
+    # (e.g. "Aluminium 6061", "Stainless 316") so this is a m2o into
+    # `fp.part.material`. The legacy `substrate_material` Selection
+    # below is now a stored compute that mirrors `material_id.category`,
+    # which keeps pricing rules / portal / import wizard working
+    # untouched (they still match against the category keys).
+    material_id = fields.Many2one(
+        'fp.part.material', string='Material', tracking=True,
+        ondelete='restrict',
+        help='Pick from the material library or create a custom entry '
+             '(e.g. "Aluminium 6061", "Stainless 316", "Brass C360").',
+    )
     substrate_material = fields.Selection(
         [('aluminium', 'Aluminium'), ('steel', 'Steel'), ('stainless', 'Stainless Steel'),
          ('copper', 'Copper'), ('titanium', 'Titanium'), ('other', 'Other')],
-        string='Substrate Material', default='steel',
+        string='Material Category', default='steel',
+        compute='_compute_substrate_material',
+        store=True, readonly=False,
+        help='Auto-derived from the selected material. Drives pricing '
+             'rule matching and density defaults.',
     )
     geometry_source = fields.Selection(
         [('3d_model', '3D Model'), ('manual', 'Manual Measurements'), ('pdf_drawing', 'PDF Drawing')],
@@ -76,6 +97,13 @@ class FpPartCatalog(models.Model):
         string='Surface Area UoM', default='sq_in',
     )
     weight = fields.Float(string='Weight (kg)', digits=(12, 4))
+    x_fc_default_lead_time_days = fields.Integer(
+        string='Default Lead Time (days)',
+        help='Optional. How many days from the order\'s planned-start-date '
+             'this part typically needs. Used as a smart default on order '
+             'lines when no explicit deadline is set. Leave 0 to fall back '
+             'to the order\'s customer deadline.',
+    )
     dimensions_length = fields.Float(string='Length', digits=(12, 4))
     dimensions_width = fields.Float(string='Width', digits=(12, 4))
     dimensions_height = fields.Float(string='Height', digits=(12, 4))
@@ -224,13 +252,34 @@ class FpPartCatalog(models.Model):
         'other': 7.85,  # default to steel
     }
 
-    @api.depends('volume_mm3', 'substrate_material')
+    @api.depends('material_id', 'material_id.category')
+    def _compute_substrate_material(self):
+        """Mirror the m2o material's category onto the legacy field.
+
+        Editable: existing parts without a material_id keep whatever
+        value they had (default 'steel'), and admins can still flip
+        the category by hand if needed.
+        """
+        for rec in self:
+            if rec.material_id:
+                rec.substrate_material = rec.material_id.category
+            elif not rec.substrate_material:
+                rec.substrate_material = 'steel'
+
+    @api.depends('volume_mm3', 'substrate_material', 'material_id', 'material_id.density')
     def _compute_material_weight(self):
         for rec in self:
-            if not rec.volume_mm3 or not rec.substrate_material:
+            if not rec.volume_mm3:
+                rec.material_weight_kg = 0.0
+                continue
+            # Prefer per-material density override; fall back to category default.
+            if rec.material_id:
+                density = rec.material_id.effective_density()
+            elif rec.substrate_material:
+                density = self._SUBSTRATE_DENSITY.get(rec.substrate_material, 7.85)
+            else:
                 rec.material_weight_kg = 0.0
                 continue
-            density = self._SUBSTRATE_DENSITY.get(rec.substrate_material, 7.85)
             # mm³ × g/cm³ × 1e-6 = kg
             rec.material_weight_kg = round(rec.volume_mm3 * density * 1e-6, 4)
 
@@ -292,6 +341,27 @@ class FpPartCatalog(models.Model):
          'Part number must be unique per customer.'),
     ]
 
+    @api.model
+    def default_get(self, fields_list):
+        """Re-route the m2o-typed string into part_number.
+
+        Odoo 19's m2o "Create and edit..." passes the typed text via
+        context as `default_name` regardless of the target model's
+        `_rec_name`. Customers always type the part NUMBER in the part
+        picker, so we swap it across when part_number wasn't provided
+        explicitly. The legacy `default_name` is dropped so the Part
+        Name field stays empty for the user to fill in (or leave blank).
+        """
+        ctx = self.env.context
+        if ctx.get('default_name') and not ctx.get('default_part_number'):
+            # with_context merges, so explicitly clear default_name to
+            # stop the typed string from also seeding the Part Name.
+            self = self.with_context(
+                default_part_number=ctx['default_name'],
+                default_name=False,
+            )
+        return super().default_get(fields_list)
+
     def write(self, vals):
         """Track changes to attachments and propagate to linked configurators."""
         # Snapshot before write

fusion_plating/fusion_plating_configurator/models/fp_part_material.py

@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+# Copyright 2026 Nexa Systems Inc.
+# License OPL-1 (Odoo Proprietary License v1.0)
+# Part of the Fusion Plating product family.
+
+from odoo import api, fields, models
+
+
+class FpPartMaterial(models.Model):
+    """Custom material library.
+
+    Lets shops define their own materials (e.g. "Aluminium 6061",
+    "Stainless 316", "Brass C360") instead of being limited to the
+    fixed Selection. Each material maps to a `category` that drives
+    legacy pricing-rule matching and the default density used for
+    material-weight rollups.
+    """
+    _name = 'fp.part.material'
+    _description = 'Fusion Plating — Part Material'
+    _order = 'sequence, name'
+    _rec_name = 'name'
+
+    name = fields.Char(string='Material', required=True, translate=False)
+    sequence = fields.Integer(string='Sequence', default=10)
+    category = fields.Selection(
+        [('aluminium', 'Aluminium'), ('steel', 'Steel'),
+         ('stainless', 'Stainless Steel'), ('copper', 'Copper'),
+         ('titanium', 'Titanium'), ('other', 'Other')],
+        string='Category', required=True, default='other',
+        help='Used for pricing-rule matching and to pick a default '
+             'density when one is not set explicitly.',
+    )
+    density = fields.Float(
+        string='Density (g/cm³)', digits=(8, 4),
+        help='Override the category default. Leave 0 to use the '
+             'category density (Aluminium 2.70, Steel 7.85, '
+             'Stainless 8.00, Copper 8.96, Titanium 4.51).',
+    )
+    notes = fields.Char(string='Notes', help='Internal note (alloy spec, source, etc.).')
+    active = fields.Boolean(string='Active', default=True)
+
+    _CATEGORY_DENSITY = {
+        'aluminium': 2.70,
+        'steel': 7.85,
+        'stainless': 8.00,
+        'copper': 8.96,
+        'titanium': 4.51,
+        'other': 7.85,
+    }
+
+    _sql_constraints = [
+        ('fp_part_material_name_uniq', 'unique(name)',
+         'Material name must be unique.'),
+    ]
+
+    def effective_density(self):
+        """Return density override if set, else the category default."""
+        self.ensure_one()
+        if self.density and self.density > 0:
+            return self.density
+        return self._CATEGORY_DENSITY.get(self.category, 7.85)

fusion_plating/fusion_plating_configurator/models/fp_quote_configurator.py

@@ -116,9 +116,13 @@ class FpQuoteConfigurator(models.Model):
         help='Surface area minus masked area, using the values on this quote.',
     )
 
-    @api.depends('volume_mm3', 'substrate_material')
+    @api.depends('volume_mm3', 'substrate_material', 'material_id', 'material_id.density')
     def _compute_material_weight_kg(self):
-        """Compute weight from part volume × THIS QUOTE'S substrate density."""
+        """Compute weight from part volume × THIS QUOTE'S substrate density.
+
+        Prefer the per-material density override; fall back to the
+        category default when only the legacy Selection is set.
+        """
         density_map = {
             'aluminium': 2.70,
             'steel': 7.85,
@@ -128,10 +132,16 @@ class FpQuoteConfigurator(models.Model):
             'other': 7.85,
         }
         for rec in self:
-            if not rec.volume_mm3 or not rec.substrate_material:
+            if not rec.volume_mm3:
+                rec.material_weight_kg = 0.0
+                continue
+            if rec.material_id:
+                density = rec.material_id.effective_density()
+            elif rec.substrate_material:
+                density = density_map.get(rec.substrate_material, 7.85)
+            else:
                 rec.material_weight_kg = 0.0
                 continue
-            density = density_map.get(rec.substrate_material, 7.85)
             rec.material_weight_kg = round(rec.volume_mm3 * density * 1e-6, 4)
 
     @api.depends('surface_area', 'surface_area_uom', 'masking_area_sqin')
@@ -252,12 +262,35 @@ class FpQuoteConfigurator(models.Model):
          ('complex', 'Complex'), ('very_complex', 'Very Complex')],
         string='Complexity', default='simple',
     )
+    # Single source of truth: pick a material from the shared library.
+    # `substrate_material` below is now a stored compute mirroring
+    # `material_id.category` so legacy consumers (pricing rules, portal,
+    # data exports) keep working unchanged.
+    material_id = fields.Many2one(
+        'fp.part.material', string='Material',
+        ondelete='restrict',
+        help='Picks from the shared material library — same picker as '
+             'the Part Catalog. Create custom alloys (e.g. "Aluminium '
+             '6061") on the fly.',
+    )
     substrate_material = fields.Selection(
         [('aluminium', 'Aluminium'), ('steel', 'Steel'), ('stainless', 'Stainless Steel'),
          ('copper', 'Copper'), ('titanium', 'Titanium'), ('other', 'Other')],
-        string='Substrate', default='steel',
+        string='Material Category',
+        compute='_compute_substrate_material',
+        store=True, readonly=False, default='steel',
+        help='Auto-derived from the selected material. Drives pricing '
+             'rule matching and density defaults.',
     )
 
+    @api.depends('material_id', 'material_id.category')
+    def _compute_substrate_material(self):
+        for rec in self:
+            if rec.material_id:
+                rec.substrate_material = rec.material_id.category
+            elif not rec.substrate_material:
+                rec.substrate_material = 'steel'
+
     # ----- Options ----------------------------------------------------------
     rush_order = fields.Boolean(string='Rush Order')
     turnaround_days = fields.Integer(string='Turnaround (days)')
@@ -302,7 +335,13 @@ class FpQuoteConfigurator(models.Model):
             self.surface_area_uom = cat.surface_area_uom
             self.complexity = cat.complexity
             self.masking_zones = cat.masking_zones
-            self.substrate_material = cat.substrate_material
+            # Pull the m2o material from the part — substrate_material
+            # auto-derives via the compute. Fall back to the legacy
+            # Selection only if the part has no material_id yet.
+            if cat.material_id:
+                self.material_id = cat.material_id
+            else:
+                self.substrate_material = cat.substrate_material
             # Copy masking area too (for effective-area calculation)
             self.masking_area_sqin = cat.masking_area_sqin
 
@@ -896,21 +935,26 @@ class FpQuoteConfigurator(models.Model):
     def action_save_to_catalog(self):
         """Push this quote's geometry/material edits back to the master part catalog.
 
-        Writes: substrate_material, surface_area, surface_area_uom,
+        Writes: material_id (preferred) / substrate_material (fallback),
-                masking_area_sqin, masking_zones, complexity.
+                surface_area, surface_area_uom, masking_area_sqin,
+                masking_zones, complexity.
         Only available when a part catalog entry is linked.
         """
         self.ensure_one()
         if not self.part_catalog_id:
             raise UserError(_('No part catalog entry linked to this configurator.'))
-        self.part_catalog_id.write({
+        vals = {
-            'substrate_material': self.substrate_material,
             'surface_area': self.surface_area,
             'surface_area_uom': self.surface_area_uom,
             'masking_area_sqin': self.masking_area_sqin,
             'masking_zones': self.masking_zones,
             'complexity': self.complexity,
-        })
+        }
+        if self.material_id:
+            vals['material_id'] = self.material_id.id
+        else:
+            vals['substrate_material'] = self.substrate_material
+        self.part_catalog_id.write(vals)
         self.message_post(
             body=Markup(_('Geometry and material saved back to part catalog <b>%s</b>.')) % self.part_catalog_id.name,
             message_type='notification',

fusion_plating/fusion_plating_configurator/models/sale_order.py

@@ -124,6 +124,22 @@ class SaleOrder(models.Model):
         string='Deadline',
         compute='_compute_deadline_countdown',
     )
+    x_fc_order_completion_date = fields.Date(
+        string='Order Completion Date',
+        compute='_compute_order_completion_date',
+        store=True,
+        help='When the LATEST line is actually due. Auto-rolled up from '
+             'each line\'s effective deadline. Distinct from Customer '
+             'Deadline (what we promised) — this reflects shop reality.',
+    )
+    x_fc_is_late_forecast = fields.Boolean(
+        string='Late Forecast',
+        compute='_compute_is_late_forecast',
+        store=True,
+        help='True when the rolled-up Order Completion Date sits past the '
+             'Customer Deadline. Suppressed on blanket orders since their '
+             'spans are intentionally long.',
+    )
     x_fc_margin_amount = fields.Monetary(
         string='Margin',
         compute='_compute_margin', currency_field='currency_id',
@@ -503,6 +519,38 @@ class SaleOrder(models.Model):
                 'overdue %s' % phrase if past else 'in %s' % phrase
             )
 
+    @api.depends(
+        'order_line.x_fc_effective_part_deadline',
+        'order_line.x_fc_archived',
+    )
+    def _compute_order_completion_date(self):
+        """Roll up = max(line.x_fc_effective_part_deadline) over non-
+        archived lines. Empty / all-archived order returns False."""
+        for rec in self:
+            dates = [
+                line.x_fc_effective_part_deadline
+                for line in rec.order_line
+                if line.x_fc_effective_part_deadline and not line.x_fc_archived
+            ]
+            rec.x_fc_order_completion_date = max(dates) if dates else False
+
+    @api.depends(
+        'x_fc_order_completion_date',
+        'commitment_date',
+        'x_fc_is_blanket_order',
+    )
+    def _compute_is_late_forecast(self):
+        for rec in self:
+            if rec.x_fc_is_blanket_order:
+                rec.x_fc_is_late_forecast = False
+                continue
+            commit = rec.commitment_date.date() if rec.commitment_date else False
+            rec.x_fc_is_late_forecast = bool(
+                rec.x_fc_order_completion_date
+                and commit
+                and rec.x_fc_order_completion_date > commit
+            )
+
     @api.depends('order_line.price_subtotal', 'amount_untaxed')
     def _compute_margin(self):
         """Margin = untaxed total − rolled-up cost from coating configs.

fusion_plating/fusion_plating_configurator/models/sale_order_line.py

@@ -3,6 +3,8 @@
 # License OPL-1 (Odoo Proprietary License v1.0)
 # Part of the Fusion Plating product family.
 
+from datetime import timedelta
+
 from odoo import _, api, fields, models
 from odoo.exceptions import ValidationError
 
@@ -63,7 +65,36 @@ class SaleOrderLine(models.Model):
     x_fc_treatment_ids = fields.Many2many(
         'fp.treatment', string='Additional Treatments',
     )
-    x_fc_part_deadline = fields.Date(string='Part Deadline')
+    x_fc_part_deadline = fields.Date(
+        string='Part Deadline Override',
+        help='Absolute-date manual override. When set, beats the days-offset '
+             'and the part\'s default lead time. Leave blank to fall through '
+             'to the offset, then part default, then the order\'s customer '
+             'deadline.',
+    )
+    x_fc_part_deadline_offset_days = fields.Integer(
+        string='Days Offset',
+        help='Manual override expressed as "+N days from the order\'s '
+             'customer deadline". Use this when you think in days rather '
+             'than absolute dates. Ignored if Part Deadline Override is set.',
+    )
+    x_fc_effective_part_deadline = fields.Date(
+        string='Effective Deadline',
+        compute='_compute_effective_part_deadline',
+        store=True,
+        help='Computed deadline that actually drives shop scheduling. '
+             'Resolution: explicit override → days offset → part default '
+             'lead time → order customer deadline.',
+    )
+    x_fc_effective_internal_deadline = fields.Date(
+        string='Shop Target',
+        compute='_compute_effective_internal_deadline',
+        store=True,
+        help='Internal deadline for this line — effective customer '
+             'deadline minus the order\'s shop buffer (commitment_date − '
+             'internal_deadline gap). Clamped so it never exceeds the '
+             'effective customer deadline.',
+    )
     x_fc_rush_order = fields.Boolean(string='Rush')
     x_fc_wo_group_tag = fields.Char(
         string='Work Order Group',
@@ -181,6 +212,94 @@ class SaleOrderLine(models.Model):
     def _compute_serial_count(self):
         for line in self:
             line.x_fc_serial_count = len(line.x_fc_serial_ids)
+
+    # ------------------------------------------------------------------
+    # Effective deadlines (Sub 12d)
+    # ------------------------------------------------------------------
+    @api.depends(
+        'x_fc_part_deadline',
+        'x_fc_part_deadline_offset_days',
+        'x_fc_part_catalog_id',
+        'x_fc_part_catalog_id.x_fc_default_lead_time_days',
+        'order_id.commitment_date',
+        'order_id.x_fc_planned_start_date',
+    )
+    def _compute_effective_part_deadline(self):
+        """Resolution chain (first match wins):
+        1. explicit absolute-date override (x_fc_part_deadline)
+        2. days offset from commitment_date (x_fc_part_deadline_offset_days)
+        3. part's default lead time from planned_start_date
+        4. order's commitment_date (= customer profile cascade)
+        5. planned_start_date as last resort (orphan order with no deadline)
+        """
+        for line in self:
+            order = line.order_id
+            # commitment_date is a Datetime in Odoo standard; coerce to
+            # date for arithmetic with our Date fields.
+            commit_dt = order.commitment_date if order else False
+            commit = commit_dt.date() if commit_dt else False
+            start = (
+                order.x_fc_planned_start_date if order
+                else False
+            ) or fields.Date.context_today(line)
+
+            # 1. absolute-date override
+            if line.x_fc_part_deadline:
+                line.x_fc_effective_part_deadline = line.x_fc_part_deadline
+                continue
+            # 2. days offset from commitment
+            if line.x_fc_part_deadline_offset_days and commit:
+                line.x_fc_effective_part_deadline = (
+                    commit + timedelta(days=line.x_fc_part_deadline_offset_days)
+                )
+                continue
+            # 3. part default lead time from planned_start
+            part_lead = (
+                line.x_fc_part_catalog_id
+                and line.x_fc_part_catalog_id.x_fc_default_lead_time_days
+            )
+            if part_lead:
+                line.x_fc_effective_part_deadline = (
+                    start + timedelta(days=part_lead)
+                )
+                continue
+            # 4. order commitment (which itself derives from customer profile)
+            if commit:
+                line.x_fc_effective_part_deadline = commit
+                continue
+            # 5. last resort — planned start so the field is never null
+            line.x_fc_effective_part_deadline = start
+
+    @api.depends(
+        'x_fc_effective_part_deadline',
+        'order_id.commitment_date',
+        'order_id.x_fc_internal_deadline',
+    )
+    def _compute_effective_internal_deadline(self):
+        """Apply the order's customer-vs-internal buffer to the line's
+        effective customer deadline. Buffer = commitment_date −
+        x_fc_internal_deadline (the gap implied by customer profile).
+        Clamp result so it never exceeds the customer deadline.
+        """
+        for line in self:
+            eff = line.x_fc_effective_part_deadline
+            if not eff:
+                line.x_fc_effective_internal_deadline = False
+                continue
+            order = line.order_id
+            commit_dt = order.commitment_date if order else False
+            commit = commit_dt.date() if commit_dt else False
+            internal = order.x_fc_internal_deadline if order else False
+            if commit and internal and commit >= internal:
+                buffer_days = (commit - internal).days
+                target = eff - timedelta(days=buffer_days)
+                # Clamp: internal can never sit after customer date
+                line.x_fc_effective_internal_deadline = (
+                    target if target <= eff else eff
+                )
+            else:
+                # No buffer info → fall back to the customer date itself
+                line.x_fc_effective_internal_deadline = eff
     x_fc_job_number = fields.Char(
         string='Job #',
         copy=False,

fusion_plating/fusion_plating_configurator/security/ir.model.access.csv

@@ -49,3 +49,6 @@ access_fp_serial_bulk_add_manager,fp.serial.bulk.add.manager,model_fp_serial_bul
 access_fp_coating_thickness_user,fp.coating.thickness.user,model_fp_coating_thickness,base.group_user,1,0,0,0
 access_fp_coating_thickness_estimator,fp.coating.thickness.estimator,model_fp_coating_thickness,fusion_plating_configurator.group_fp_estimator,1,1,1,0
 access_fp_coating_thickness_manager,fp.coating.thickness.manager,model_fp_coating_thickness,fusion_plating.group_fusion_plating_manager,1,1,1,1
+access_fp_part_material_user,fp.part.material.user,model_fp_part_material,base.group_user,1,0,0,0
+access_fp_part_material_estimator,fp.part.material.estimator,model_fp_part_material,fusion_plating_configurator.group_fp_estimator,1,1,1,0
+access_fp_part_material_manager,fp.part.material.manager,model_fp_part_material,fusion_plating.group_fusion_plating_manager,1,1,1,1

fusion_plating/fusion_plating_configurator/views/fp_coating_thickness_views.xml

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2026 Nexa Systems Inc.
+    License OPL-1 (Odoo Proprietary License v1.0)
+    Part of the Fusion Plating product family.
+
+    Standalone views for fp.coating.thickness so SO-line m2o pickers
+    can offer "Create and edit..." — the inline-on-coating-config
+    editor was the only way to add thicknesses pre-Sub-12d.
+-->
+<odoo>
+
+    <record id="view_fp_coating_thickness_list" model="ir.ui.view">
+        <field name="name">fp.coating.thickness.list</field>
+        <field name="model">fp.coating.thickness</field>
+        <field name="arch" type="xml">
+            <list string="Coating Thicknesses" decoration-muted="not active">
+                <field name="sequence" widget="handle"/>
+                <field name="coating_config_id"/>
+                <field name="value" string="Nominal"/>
+                <field name="value_min" string="Min" optional="show"/>
+                <field name="value_max" string="Max" optional="show"/>
+                <field name="uom"/>
+                <field name="display_name" string="Label"/>
+                <field name="active" widget="boolean_toggle"/>
+            </list>
+        </field>
+    </record>
+
+    <record id="view_fp_coating_thickness_form" model="ir.ui.view">
+        <field name="name">fp.coating.thickness.form</field>
+        <field name="model">fp.coating.thickness</field>
+        <field name="arch" type="xml">
+            <form string="Coating Thickness">
+                <sheet>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" invisible="active"/>
+                    <div class="oe_title">
+                        <label for="display_name" string="Thickness"/>
+                        <h2><field name="display_name" readonly="1" placeholder="Auto-generated from value + UoM"/></h2>
+                    </div>
+                    <group>
+                        <group string="Spec">
+                            <field name="coating_config_id"
+                                   options="{'no_create_edit': True}"/>
+                            <field name="value" string="Nominal"/>
+                            <field name="uom"/>
+                        </group>
+                        <group string="Acceptance Band (optional)">
+                            <field name="value_min" string="Min"/>
+                            <field name="value_max" string="Max"/>
+                            <div colspan="2" class="text-muted">
+                                Set Min/Max when the customer spec is a
+                                range (e.g. AMS-2404 Class 4 = 0.001"–0.0015").
+                                QC readings outside the band fail.
+                            </div>
+                        </group>
+                        <group>
+                            <field name="sequence"/>
+                            <field name="active" widget="boolean_toggle"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="view_fp_coating_thickness_search" model="ir.ui.view">
+        <field name="name">fp.coating.thickness.search</field>
+        <field name="model">fp.coating.thickness</field>
+        <field name="arch" type="xml">
+            <search>
+                <field name="coating_config_id"/>
+                <field name="display_name"/>
+                <field name="uom"/>
+                <separator/>
+                <filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
+                <group>
+                    <filter string="Coating" name="group_coating"
+                            context="{'group_by':'coating_config_id'}"/>
+                    <filter string="UoM" name="group_uom"
+                            context="{'group_by':'uom'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="action_fp_coating_thickness" model="ir.actions.act_window">
+        <field name="name">Coating Thicknesses</field>
+        <field name="res_model">fp.coating.thickness</field>
+        <field name="view_mode">list,form</field>
+        <field name="search_view_id" ref="view_fp_coating_thickness_search"/>
+    </record>
+
+</odoo>

fusion_plating/fusion_plating_configurator/views/fp_configurator_menu.xml

@@ -111,4 +111,10 @@
               action="action_fp_treatment"
               sequence="40"/>
 
+    <menuitem id="menu_fp_part_materials"
+              name="Materials"
+              parent="menu_fp_configurator"
+              action="action_fp_part_material"
+              sequence="50"/>
+
 </odoo>

fusion_plating/fusion_plating_configurator/views/fp_part_catalog_views.xml

@@ -16,7 +16,8 @@
                 <field name="name" string="Part Name"/>
                 <field name="partner_id"/>
                 <field name="revision"/>
-                <field name="substrate_material"/>
+                <field name="material_id" string="Material"/>
+                <field name="substrate_material" optional="hide"/>
                 <field name="surface_area"/>
                 <field name="complexity"/>
                 <field name="active" widget="boolean_toggle"/>
@@ -116,7 +117,9 @@
                             <field name="partner_id"/>
                             <field name="revision"/>
                             <field name="revision_number"/>
-                            <field name="substrate_material"/>
+                            <field name="material_id"
+                                   options="{'no_quick_create': True}"/>
+                            <field name="substrate_material" invisible="1"/>
                             <field name="geometry_source"/>
                             <field name="is_latest_revision" invisible="1"/>
                             <field name="parent_part_id" invisible="not parent_part_id"/>
@@ -135,6 +138,7 @@
                             <field name="effective_area_sqin" readonly="1"/>
                             <field name="weight"/>
                             <field name="material_weight_kg" readonly="1"/>
+                            <field name="x_fc_default_lead_time_days"/>
                         </group>
                     </group>
                     <group string="Quality &amp; Delivery" name="quality_delivery">
@@ -324,6 +328,7 @@
                 <field name="name"/>
                 <field name="part_number"/>
                 <field name="partner_id"/>
+                <field name="material_id" string="Material"/>
                 <separator/>
                 <filter string="Aluminium" name="material_aluminium" domain="[('substrate_material','=','aluminium')]"/>
                 <filter string="Steel" name="material_steel" domain="[('substrate_material','=','steel')]"/>
@@ -340,7 +345,8 @@
                 <filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
                 <group>
                     <filter string="Customer" name="group_partner" context="{'group_by':'partner_id'}"/>
-                    <filter string="Material" name="group_material" context="{'group_by':'substrate_material'}"/>
+                    <filter string="Material" name="group_material" context="{'group_by':'material_id'}"/>
+                    <filter string="Material Category" name="group_material_category" context="{'group_by':'substrate_material'}"/>
                     <filter string="Complexity" name="group_complexity" context="{'group_by':'complexity'}"/>
                 </group>
             </search>

fusion_plating/fusion_plating_configurator/views/fp_part_material_views.xml

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2026 Nexa Systems Inc.
+    License OPL-1 (Odoo Proprietary License v1.0)
+    Part of the Fusion Plating product family.
+-->
+<odoo>
+
+    <record id="view_fp_part_material_list" model="ir.ui.view">
+        <field name="name">fp.part.material.list</field>
+        <field name="model">fp.part.material</field>
+        <field name="arch" type="xml">
+            <list string="Materials" editable="bottom" decoration-muted="not active">
+                <field name="sequence" widget="handle"/>
+                <field name="name"/>
+                <field name="category"/>
+                <field name="density" string="Density (g/cm³)"/>
+                <field name="notes" optional="show"/>
+                <field name="active" widget="boolean_toggle"/>
+            </list>
+        </field>
+    </record>
+
+    <record id="view_fp_part_material_form" model="ir.ui.view">
+        <field name="name">fp.part.material.form</field>
+        <field name="model">fp.part.material</field>
+        <field name="arch" type="xml">
+            <form string="Material">
+                <sheet>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" invisible="active"/>
+                    <div class="oe_title">
+                        <label for="name" string="Material"/>
+                        <h1><field name="name" placeholder="e.g. Aluminium 6061"/></h1>
+                    </div>
+                    <group>
+                        <group>
+                            <field name="category"/>
+                            <field name="density"/>
+                            <field name="sequence"/>
+                            <field name="active" widget="boolean_toggle"/>
+                        </group>
+                        <group>
+                            <field name="notes" placeholder="Alloy spec, source, supplier note..."/>
+                        </group>
+                    </group>
+                    <div class="text-muted">
+                        Leave Density at 0 to use the category default
+                        (Aluminium 2.70, Steel 7.85, Stainless 8.00,
+                        Copper 8.96, Titanium 4.51 g/cm³).
+                    </div>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="view_fp_part_material_search" model="ir.ui.view">
+        <field name="name">fp.part.material.search</field>
+        <field name="model">fp.part.material</field>
+        <field name="arch" type="xml">
+            <search>
+                <field name="name"/>
+                <field name="category"/>
+                <separator/>
+                <filter string="Aluminium" name="cat_aluminium" domain="[('category','=','aluminium')]"/>
+                <filter string="Steel" name="cat_steel" domain="[('category','=','steel')]"/>
+                <filter string="Stainless" name="cat_stainless" domain="[('category','=','stainless')]"/>
+                <filter string="Copper" name="cat_copper" domain="[('category','=','copper')]"/>
+                <filter string="Titanium" name="cat_titanium" domain="[('category','=','titanium')]"/>
+                <filter string="Other" name="cat_other" domain="[('category','=','other')]"/>
+                <separator/>
+                <filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
+                <group>
+                    <filter string="Category" name="group_category" context="{'group_by':'category'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="action_fp_part_material" model="ir.actions.act_window">
+        <field name="name">Materials</field>
+        <field name="res_model">fp.part.material</field>
+        <field name="view_mode">list,form</field>
+        <field name="search_view_id" ref="view_fp_part_material_search"/>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">No materials yet</p>
+            <p>Define the materials your shop processes. Each material
+            picks a category (Aluminium, Steel, etc.) used for pricing
+            rules and density-based weight calculations.</p>
+        </field>
+    </record>
+
+</odoo>

fusion_plating/fusion_plating_configurator/views/fp_quote_configurator_views.xml

@@ -251,7 +251,9 @@
                                            string="Effective Plating Area"
                                            readonly="1"/>
                                     <field name="thickness_requested"/>
-                                    <field name="substrate_material"/>
+                                    <field name="material_id"
+                                           options="{'no_quick_create': True}"/>
+                                    <field name="substrate_material" invisible="1"/>
                                     <field name="masking_zones"/>
                                     <field name="turnaround_days"/>
                                 </group>

fusion_plating/fusion_plating_configurator/views/sale_order_views.xml

@@ -123,8 +123,10 @@
                             <field name="x_fc_process_variant_id" optional="show"
                                    string="Process"/>
                             <field name="product_uom_qty" string="Qty"/>
-                            <field name="x_fc_part_deadline" optional="show"
+                            <field name="x_fc_effective_part_deadline" optional="show"
-                                   string="Part Deadline"/>
+                                   string="Effective Deadline"/>
+                            <field name="x_fc_part_deadline" optional="hide"
+                                   string="Part Deadline Override"/>
                             <field name="x_fc_rush_order" optional="hide"/>
                             <field name="x_fc_job_number" optional="show"
                                    string="Job #"/>
@@ -188,6 +190,16 @@
                             <field name="x_fc_internal_deadline"/>
                             <field name="commitment_date" string="Customer Deadline"/>
                             <field name="x_fc_deadline_countdown" readonly="1"/>
+                            <label for="x_fc_order_completion_date"/>
+                            <div class="o_row">
+                                <field name="x_fc_order_completion_date"
+                                       readonly="1" class="oe_inline"/>
+                                <span class="badge text-bg-danger ms-2"
+                                      invisible="not x_fc_is_late_forecast">
+                                    <i class="fa fa-exclamation-triangle me-1"/>Late
+                                </span>
+                                <field name="x_fc_is_late_forecast" invisible="1"/>
+                            </div>
                             <field name="x_fc_is_blanket_order"/>
                             <field name="x_fc_block_partial_shipments"/>
                         </group>
@@ -250,24 +262,25 @@
                        widget="boolean_toggle"
                        invisible="not x_fc_process_variant_id"
                        optional="hide"/>
-                <button name="action_customize_process" type="object"
-                        string="Customize" icon="fa-pencil-square-o"
-                        class="btn-link"
-                        invisible="not x_fc_process_variant_id"/>
                 <field name="x_fc_thickness_id"
-                       options="{'no_create': True}"
+                       options="{'no_quick_create': True}"
+                       context="{'default_coating_config_id': x_fc_coating_config_id}"
+                       domain="[('coating_config_id', '=', x_fc_coating_config_id)]"
                        invisible="not x_fc_coating_config_id"
                        optional="show"/>
                 <field name="x_fc_serial_ids"
                        widget="many2many_tags"
                        options="{'no_quick_create': False, 'color_field': 'state_color'}"
+                       domain="[('part_id', '=', x_fc_part_catalog_id)]"
                        optional="show"/>
                 <field name="x_fc_serial_count"
-                       string="# SN"
+                       string="Serial Count"
                        optional="hide"/>
                 <button name="action_open_serial_bulk_add" type="object"
-                        string="Bulk Add Serials" icon="fa-list-ol"
+                        title="Bulk add serials"
-                        class="btn-link"/>
+                        icon="fa-list-ol"
+                        class="btn-link"
+                        invisible="not x_fc_part_catalog_id or x_fc_serial_count &gt; 0"/>
                 <field name="x_fc_job_number" optional="show"/>
                 <field name="x_fc_revision_pick_id"
                        string="Revision"
@@ -278,7 +291,14 @@
                        readonly="1"
                        optional="hide"/>
                 <field name="x_fc_treatment_ids" widget="many2many_tags" optional="hide"/>
-                <field name="x_fc_part_deadline" optional="hide"/>
+                <field name="x_fc_part_deadline" string="Part Deadline Override" optional="hide"/>
+                <field name="x_fc_part_deadline_offset_days" string="Days Offset" optional="hide"/>
+                <field name="x_fc_effective_part_deadline" string="Effective Deadline"
+                       optional="show"
+                       readonly="1"/>
+                <field name="x_fc_effective_internal_deadline" string="Shop Target"
+                       optional="hide"
+                       readonly="1"/>
                 <field name="x_fc_wo_group_tag" optional="hide"/>
                 <field name="x_fc_start_at_node_id" optional="hide"/>
                 <field name="x_fc_is_one_off" optional="hide"/>
@@ -294,7 +314,8 @@
         <field name="model">sale.order</field>
         <field name="arch" type="xml">
             <list string="Sale Orders" decoration-info="state == 'draft'"
-                  decoration-muted="state == 'cancel'">
+                  decoration-muted="state == 'cancel'"
+                  decoration-danger="x_fc_is_late_forecast">
                 <header>
                     <button name="%(action_fp_direct_order_wizard)d"
                             type="action"
@@ -308,6 +329,8 @@
                 <field name="x_fc_customer_job_number" optional="show"/>
                 <field name="x_fc_internal_deadline" optional="show"/>
                 <field name="commitment_date" string="Customer Deadline" optional="show"/>
+                <field name="x_fc_order_completion_date" string="Completion" optional="show"/>
+                <field name="x_fc_is_late_forecast" optional="hide" widget="boolean_toggle"/>
                 <field name="x_fc_deadline_countdown" optional="show"/>
                 <field name="x_fc_wo_completion" optional="show"/>
                 <field name="x_fc_planned_start_date" optional="hide"/>
@@ -484,6 +507,8 @@
                 <separator/>
                 <filter name="blanket_orders" string="Blanket Orders"
                         domain="[('x_fc_is_blanket_order', '=', True)]"/>
+                <filter name="late_forecast" string="Will Be Late"
+                        domain="[('x_fc_is_late_forecast', '=', True)]"/>
                 <filter name="rush_lines" string="Has Rush Line"
                         domain="[('order_line.x_fc_rush_order', '=', True)]"/>
                 <filter name="overdue" string="Overdue"

fusion_plating/fusion_plating_configurator/wizard/fp_add_from_so_wizard.py

@@ -64,6 +64,7 @@ class FpAddFromSoWizard(models.TransientModel):
                 'quantity': int(src.product_uom_qty) or 1,
                 'unit_price': src.price_unit or 0.0,
                 'part_deadline': src.x_fc_part_deadline,
+                'part_deadline_offset_days': src.x_fc_part_deadline_offset_days,
                 'rush_order': src.x_fc_rush_order,
                 'wo_group_tag': src.x_fc_wo_group_tag or False,
                 'line_description': src.name,

fusion_plating/fusion_plating_configurator/wizard/fp_direct_order_line.py

@@ -3,6 +3,8 @@
 # License OPL-1 (Odoo Proprietary License v1.0)
 # Part of the Fusion Plating product family.
 
+from datetime import timedelta
+
 from odoo import _, api, fields, models
 from odoo.exceptions import UserError
 
@@ -222,8 +224,27 @@ class FpDirectOrderLine(models.Model):
 
     # ---- Scheduling / fulfilment ----
     part_deadline = fields.Date(
-        string='Part Deadline',
+        string='Part Deadline Override',
-        help='Per-line deadline. Defaults to SO customer deadline if blank.',
+        help='Absolute-date manual override. Beats days-offset and the '
+             'part default lead time. Leave blank to fall through.',
+    )
+    part_deadline_offset_days = fields.Integer(
+        string='Days Offset',
+        help='Manual override expressed as "+N days from the order\'s '
+             'customer deadline". Ignored if Part Deadline Override is set.',
+    )
+    effective_part_deadline = fields.Date(
+        string='Effective Deadline',
+        compute='_compute_effective_part_deadline',
+        store=True,
+        help='Resolution: explicit override → days offset → part default '
+             'lead time → order customer deadline.',
+    )
+    effective_internal_deadline = fields.Date(
+        string='Shop Target',
+        compute='_compute_effective_internal_deadline',
+        store=True,
+        help='Effective customer deadline minus the order\'s shop buffer.',
     )
     rush_order = fields.Boolean(string='Rush')
     wo_group_tag = fields.Char(
@@ -323,6 +344,68 @@ class FpDirectOrderLine(models.Model):
         for rec in self:
             rec.serial_count = len(rec.serial_ids)
 
+    @api.depends(
+        'part_deadline',
+        'part_deadline_offset_days',
+        'part_catalog_id',
+        'part_catalog_id.x_fc_default_lead_time_days',
+        'wizard_id.customer_deadline',
+        'wizard_id.planned_start_date',
+    )
+    def _compute_effective_part_deadline(self):
+        """Mirror of SaleOrderLine._compute_effective_part_deadline."""
+        for line in self:
+            wiz = line.wizard_id
+            commit = wiz.customer_deadline if wiz else False
+            start = (
+                wiz.planned_start_date if wiz else False
+            ) or fields.Date.context_today(line)
+
+            if line.part_deadline:
+                line.effective_part_deadline = line.part_deadline
+                continue
+            if line.part_deadline_offset_days and commit:
+                line.effective_part_deadline = (
+                    commit + timedelta(days=line.part_deadline_offset_days)
+                )
+                continue
+            part_lead = (
+                line.part_catalog_id
+                and line.part_catalog_id.x_fc_default_lead_time_days
+            )
+            if part_lead:
+                line.effective_part_deadline = (
+                    start + timedelta(days=part_lead)
+                )
+                continue
+            if commit:
+                line.effective_part_deadline = commit
+                continue
+            line.effective_part_deadline = start
+
+    @api.depends(
+        'effective_part_deadline',
+        'wizard_id.customer_deadline',
+        'wizard_id.internal_deadline',
+    )
+    def _compute_effective_internal_deadline(self):
+        for line in self:
+            eff = line.effective_part_deadline
+            if not eff:
+                line.effective_internal_deadline = False
+                continue
+            wiz = line.wizard_id
+            commit = wiz.customer_deadline if wiz else False
+            internal = wiz.internal_deadline if wiz else False
+            if commit and internal and commit >= internal:
+                buffer_days = (commit - internal).days
+                target = eff - timedelta(days=buffer_days)
+                line.effective_internal_deadline = (
+                    target if target <= eff else eff
+                )
+            else:
+                line.effective_internal_deadline = eff
+
     @api.depends('serial_ids')
     def _compute_primary_serial(self):
         for rec in self:

fusion_plating/fusion_plating_configurator/wizard/fp_direct_order_wizard.py

@@ -557,6 +557,7 @@ class FpDirectOrderWizard(models.Model):
                 'x_fc_coating_config_id': line.coating_config_id.id,
                 'x_fc_treatment_ids': [(6, 0, line.treatment_ids.ids)],
                 'x_fc_part_deadline': line.part_deadline,
+                'x_fc_part_deadline_offset_days': line.part_deadline_offset_days,
                 'x_fc_rush_order': line.rush_order,
                 'x_fc_wo_group_tag': line.wo_group_tag or False,
                 'x_fc_part_wo_description': line.part_wo_description or False,

fusion_plating/fusion_plating_configurator/wizard/fp_direct_order_wizard_views.xml

@@ -165,10 +165,6 @@
                                            widget="boolean_toggle"
                                            invisible="not process_variant_id"
                                            optional="hide"/>
-                                    <button name="action_customize_process" type="object"
-                                            string="Customize" icon="fa-pencil-square-o"
-                                            class="btn-link"
-                                            invisible="not process_variant_id"/>
                                     <field name="effective_process_id"
                                            string="Effective Process"
                                            readonly="1"
@@ -178,19 +174,24 @@
                                            readonly="1"
                                            optional="hide"/>
                                     <field name="thickness_id"
-                                           options="{'no_create': True}"
+                                           options="{'no_quick_create': True}"
+                                           context="{'default_coating_config_id': coating_config_id}"
+                                           domain="[('coating_config_id', '=', coating_config_id)]"
                                            invisible="not coating_config_id"
                                            optional="show"/>
                                     <field name="serial_ids"
                                            widget="many2many_tags"
                                            options="{'no_quick_create': False, 'color_field': 'state_color'}"
+                                           domain="[('part_id', '=', part_catalog_id)]"
                                            optional="show"/>
                                     <field name="serial_count"
-                                           string="# SN"
+                                           string="Serial Count"
                                            optional="hide"/>
                                     <button name="action_open_serial_bulk_add" type="object"
-                                            string="Bulk Add Serials" icon="fa-list-ol"
+                                            title="Bulk add serials"
-                                            class="btn-link"/>
+                                            icon="fa-list-ol"
+                                            class="btn-link"
+                                            invisible="not part_catalog_id or serial_count &gt; 0"/>
                                     <field name="job_number" optional="hide"/>
                                     <field name="treatment_ids"
                                            widget="many2many_tags"
@@ -207,7 +208,20 @@
                                            widget="monetary"
                                            options="{'currency_field': 'currency_id'}"
                                            sum="Total"/>
-                                    <field name="part_deadline"/>
+                                    <field name="effective_part_deadline"
+                                           string="Effective Deadline"
+                                           optional="show"
+                                           readonly="1"/>
+                                    <field name="part_deadline"
+                                           string="Part Deadline Override"
+                                           optional="hide"/>
+                                    <field name="part_deadline_offset_days"
+                                           string="Days Offset"
+                                           optional="hide"/>
+                                    <field name="effective_internal_deadline"
+                                           string="Shop Target"
+                                           optional="hide"
+                                           readonly="1"/>
                                     <field name="wo_group_tag" optional="show"/>
                                     <field name="rush_order" optional="hide"/>
                                     <field name="currency_id" column_invisible="1"/>

fusion_plating/fusion_plating_jobs/__manifest__.py

@@ -3,7 +3,7 @@
 # License OPL-1 (Odoo Proprietary License v1.0)
 {
     'name': 'Fusion Plating — Native Jobs',
-    'version': '19.0.8.11.0',
+    'version': '19.0.8.12.0',
     'category': 'Manufacturing/Plating',
     'summary': 'Native plating job model — replaces mrp.production / mrp.workorder bridge.',
     'author': 'Nexa Systems Inc.',

fusion_plating/fusion_plating_jobs/wizards/fp_job_step_input_wizard.py

@@ -31,17 +31,21 @@ from odoo.addons.fusion_plating.models._fp_uom_selection import FP_UOM_SELECTION
 # Same selection list as fp.step.template.input.input_type so authored
 # rows + ad-hoc rows pick from the same vocabulary.
 _FP_INPUT_TYPE_SELECTION = [
-    ('text',          'Text'),
+    ('text',                   'Text'),
-    ('number',        'Number'),
+    ('number',                 'Number'),
-    ('boolean',       'Yes/No'),
+    ('boolean',                'Yes/No'),
-    ('selection',     'Selection'),
+    ('selection',              'Selection'),
-    ('date',          'Date / Time'),
+    ('date',                   'Date / Time'),
-    ('signature',     'Signature'),
+    ('signature',              'Signature'),
-    ('time_hms',      'Time (HH:MM:SS)'),
+    ('time_hms',               'Time (HH:MM:SS)'),
-    ('time_seconds',  'Time (seconds)'),
+    ('time_seconds',           'Time (seconds)'),
-    ('temperature',   'Temperature'),
+    ('temperature',            'Temperature'),
-    ('thickness',     'Thickness'),
+    ('thickness',              'Thickness'),
-    ('pass_fail',     'Pass / Fail'),
+    ('pass_fail',              'Pass / Fail'),
+    ('photo',                  'Photo'),
+    ('multi_point_thickness',  'Multi-Point Thickness (avg)'),
+    ('bath_chemistry_panel',   'Bath Chemistry Panel'),
+    ('ph',                     'pH'),
 ]
 
 
@@ -72,11 +76,18 @@ class FpJobStepInputWizard(models.TransientModel):
             return defaults
         defaults['step_id'] = step.id
         node = step.recipe_node_id
+        # Sub 12d — master switch — when off, return no input rows.
+        if hasattr(node, 'collect_measurements') and not node.collect_measurements:
+            defaults['line_ids'] = []
+            return defaults
         # Filter to step_input prompts only — transition inputs go on the
-        # Move wizard, not here.
+        # Move wizard, not here. Also filter to collect=True (per-recipe
+        # opt-out, default True).
         inputs = node.input_ids
         if 'kind' in inputs._fields:
             inputs = inputs.filtered(lambda i: i.kind == 'step_input')
+        if 'collect' in inputs._fields:
+            inputs = inputs.filtered(lambda i: i.collect)
         defaults['line_ids'] = [(0, 0, {
             'node_input_id': inp.id,
             'name': inp.name,
@@ -119,6 +130,7 @@ class FpJobStepInputWizard(models.TransientModel):
             'moved_by_user_id': self.env.user.id,
         })
         ValueModel = self.env['fp.job.step.move.input.value']
+        Attachment = self.env['ir.attachment']
         captured = 0
         for line in self.line_ids:
             if not line._has_value():
@@ -131,6 +143,33 @@ class FpJobStepInputWizard(models.TransientModel):
                 'value_boolean': line.value_boolean,
                 'value_date': line.value_date or False,
             }
+            # Sub 12d — composite + photo input types serialise differently.
+            if line.is_photo_type and line.photo_value:
+                att = Attachment.create({
+                    'name': line.photo_filename or 'photo.jpg',
+                    'datas': line.photo_value,
+                    'res_model': 'fp.job.step.move',
+                    'res_id': move.id,
+                })
+                vals['value_attachment_id'] = att.id
+            elif line.is_multi_point_type:
+                import json
+                pts = [line.point_1, line.point_2, line.point_3,
+                       line.point_4, line.point_5]
+                non_empty = [p for p in pts if p]
+                avg = sum(non_empty) / len(non_empty) if non_empty else 0.0
+                vals['value_text'] = json.dumps({
+                    'readings': pts, 'avg': avg,
+                })
+                vals['value_number'] = avg
+            elif line.is_panel_type:
+                import json
+                vals['value_text'] = json.dumps({
+                    'ph': line.panel_ph,
+                    'concentration': line.panel_concentration,
+                    'temperature': line.panel_temperature,
+                    'bath_id': line.panel_bath_id or '',
+                })
             # For ad-hoc rows (no node_input_id), preserve the operator's
             # typed prompt label in value_text so the chronological CoC
             # report still shows what was measured. Format: "Prompt: value"
@@ -203,6 +242,35 @@ class FpJobStepInputWizardLine(models.TransientModel):
     value_boolean = fields.Boolean(string='Yes/No')
     value_date = fields.Datetime(string='Date / Time')
 
+    # Sub 12d — composite + photo input types
+    photo_value = fields.Binary(string='Photo', attachment=True)
+    photo_filename = fields.Char(string='Photo Filename')
+    point_1 = fields.Float(string='R1')
+    point_2 = fields.Float(string='R2')
+    point_3 = fields.Float(string='R3')
+    point_4 = fields.Float(string='R4')
+    point_5 = fields.Float(string='R5')
+    point_avg = fields.Float(
+        string='Average',
+        compute='_compute_point_avg',
+        store=False,
+    )
+    panel_ph = fields.Float(string='Panel pH')
+    panel_concentration = fields.Float(string='Panel Concentration')
+    panel_temperature = fields.Float(string='Panel Temperature')
+    panel_bath_id = fields.Char(string='Panel Bath ID')
+
+    @api.depends('point_1', 'point_2', 'point_3', 'point_4', 'point_5')
+    def _compute_point_avg(self):
+        for rec in self:
+            pts = [
+                p for p in (
+                    rec.point_1, rec.point_2, rec.point_3,
+                    rec.point_4, rec.point_5,
+                ) if p
+            ]
+            rec.point_avg = sum(pts) / len(pts) if pts else 0.0
+
     is_authored = fields.Boolean(
         compute='_compute_is_authored',
         help='True when this row originated from an authored recipe input. '
@@ -233,20 +301,39 @@ class FpJobStepInputWizardLine(models.TransientModel):
         compute='_compute_type_flags',
     )
 
+    is_photo_type = fields.Boolean(compute='_compute_type_flags')
+    is_multi_point_type = fields.Boolean(compute='_compute_type_flags')
+    is_panel_type = fields.Boolean(compute='_compute_type_flags')
+
     @api.depends('input_type')
     def _compute_type_flags(self):
         numeric_types = {
             'number', 'temperature', 'thickness',
-            'time_seconds',
+            'time_seconds', 'ph',
         }
         for rec in self:
             it = rec.input_type or 'text'
             rec.is_boolean_type = it in ('boolean', 'pass_fail')
             rec.is_date_type = it == 'date'
             rec.is_numeric_type = it in numeric_types
+            rec.is_photo_type = it == 'photo'
+            rec.is_multi_point_type = it == 'multi_point_thickness'
+            rec.is_panel_type = it == 'bath_chemistry_panel'
 
     def _has_value(self):
         self.ensure_one()
+        if self.is_photo_type:
+            return bool(self.photo_value)
+        if self.is_multi_point_type:
+            return any([
+                self.point_1, self.point_2, self.point_3,
+                self.point_4, self.point_5,
+            ])
+        if self.is_panel_type:
+            return any([
+                self.panel_ph, self.panel_concentration,
+                self.panel_temperature, self.panel_bath_id,
+            ])
         return any([
             self.value_text,
             self.value_number,

fusion_plating/fusion_plating_jobs/wizards/fp_job_step_input_wizard_views.xml

@@ -22,6 +22,9 @@
                             <field name="is_boolean_type" column_invisible="1"/>
                             <field name="is_date_type" column_invisible="1"/>
                             <field name="is_numeric_type" column_invisible="1"/>
+                            <field name="is_photo_type" column_invisible="1"/>
+                            <field name="is_multi_point_type" column_invisible="1"/>
+                            <field name="is_panel_type" column_invisible="1"/>
                             <field name="name"
                                    string="Measurement"
                                    readonly="is_authored"
@@ -33,15 +36,6 @@
                                    string="Unit"
                                    readonly="is_authored"
                                    optional="show"/>
-                            <!-- Distinct column labels so the operator
-                                 reads which input matches the row's
-                                 type. List-view columns are static in
-                                 Odoo — labelling each by its purpose
-                                 removes the "four identical Value
-                                 columns" guesswork from the previous
-                                 layout. Only the cell matching the
-                                 row's type stays editable; others sit
-                                 blank. -->
                             <field name="value_number"
                                    string="Number"
                                    invisible="not is_numeric_type"/>
@@ -54,7 +48,33 @@
                                    invisible="not is_date_type"/>
                             <field name="value_text"
                                    string="Text"
-                                   invisible="is_numeric_type or is_boolean_type or is_date_type"/>
+                                   invisible="is_numeric_type or is_boolean_type or is_date_type or is_photo_type or is_multi_point_type or is_panel_type"/>
+                            <field name="photo_value"
+                                   string="Photo"
+                                   widget="image"
+                                   options="{'preview_image': 'photo_value'}"
+                                   invisible="not is_photo_type"/>
+                            <field name="photo_filename" column_invisible="1"/>
+                            <field name="point_1" string="R1"
+                                   invisible="not is_multi_point_type" optional="show"/>
+                            <field name="point_2" string="R2"
+                                   invisible="not is_multi_point_type" optional="show"/>
+                            <field name="point_3" string="R3"
+                                   invisible="not is_multi_point_type" optional="show"/>
+                            <field name="point_4" string="R4"
+                                   invisible="not is_multi_point_type" optional="hide"/>
+                            <field name="point_5" string="R5"
+                                   invisible="not is_multi_point_type" optional="hide"/>
+                            <field name="point_avg" string="Avg" readonly="1"
+                                   invisible="not is_multi_point_type"/>
+                            <field name="panel_ph" string="pH"
+                                   invisible="not is_panel_type"/>
+                            <field name="panel_concentration" string="Conc"
+                                   invisible="not is_panel_type"/>
+                            <field name="panel_temperature" string="Temp"
+                                   invisible="not is_panel_type"/>
+                            <field name="panel_bath_id" string="Bath"
+                                   invisible="not is_panel_type"/>
                             <field name="target_min" optional="hide"/>
                             <field name="target_max" optional="hide"/>
                         </list>

fusion_plating/fusion_plating_reports/__manifest__.py

@@ -3,7 +3,7 @@
 # License OPL-1 (Odoo Proprietary License v1.0)
 {
     'name': 'Fusion Plating — Reports',
-    'version': '19.0.10.1.3',
+    'version': '19.0.10.2.0',
     'category': 'Manufacturing/Plating',
     'summary': 'PDF reports for Fusion Plating: quote, SO, WO, packing, BoL, CoC, invoice, receipt, quality + compliance.',
     'depends': [

fusion_plating/fusion_plating_reports/report/report_coc_chronological.xml

@@ -95,7 +95,7 @@
             <t t-foreach="moves" t-as="mv">
                 <t t-set="dest" t-value="mv.to_step_id"/>
                 <t t-set="tank_code" t-value="(mv.to_tank_id and mv.to_tank_id.code) or (dest and dest.tank_id and dest.tank_id.code) or ''"/>
-                <t t-set="captured" t-value="(dest and dest.input_ids.filtered(lambda i: (i.kind or 'step_input') == 'step_input').sorted('sequence')) or []"/>
+                <t t-set="captured" t-value="(dest and dest.input_ids.filtered(lambda i: (i.kind or 'step_input') == 'step_input' and (not hasattr(i, 'collect') or i.collect)).sorted('sequence')) or []"/>
 
                 <h3>
                     <span t-esc="(dest and dest.name) or '—'"/>
@@ -138,7 +138,17 @@
                                 <t t-set="cv" t-value="captured_values_by_input.get(inp.id)"/>
                                 <t t-set="actual_str" t-value="''"/>
                                 <t t-if="cv">
-                                    <t t-if="cv.value_text">
+                                    <t t-if="inp.input_type == 'multi_point_thickness' and cv.value_text">
+                                        <t t-set="_payload" t-value="cv.value_text"/>
+                                        <t t-set="actual_str" t-value="_payload"/>
+                                    </t>
+                                    <t t-elif="inp.input_type == 'bath_chemistry_panel' and cv.value_text">
+                                        <t t-set="actual_str" t-value="cv.value_text"/>
+                                    </t>
+                                    <t t-elif="inp.input_type == 'ph' and cv.value_number">
+                                        <t t-set="actual_str" t-value="'pH %.2f' % cv.value_number"/>
+                                    </t>
+                                    <t t-elif="cv.value_text">
                                         <t t-set="actual_str" t-value="cv.value_text"/>
                                     </t>
                                     <t t-elif="cv.value_number">