From 37f917824abe72d4a44618751440b600aa617a0a Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Fri, 24 Apr 2026 21:12:32 -0400 Subject: [PATCH 01/61] feat(jobs): add fp.work.centre native model Replaces mrp.workcenter for plating. Domain-specific kinds (wet_line/bake/mask/rack/inspect/other) drive release-ready validation on steps. ACLs follow existing supervisor/manager hierarchy. Note: spec listed default_oven_id Many2one to fusion.plating.oven but that model does not exist in core (the bake-oven model fusion.plating.bake.oven lives in fusion_plating_shopfloor, which core cannot depend on). Field omitted; the bridge that adds fp.job/fp.job.step can re-introduce it via _inherit later. Part of: native job model migration (spec 2026-04-25) Co-Authored-By: Claude Opus 4.7 (1M context) --- fusion_plating/fusion_plating/__manifest__.py | 2 +- .../fusion_plating/models/__init__.py | 1 + .../fusion_plating/models/fp_work_centre.py | 58 +++++++++++++++++++ .../security/ir.model.access.csv | 3 + .../fusion_plating/tests/__init__.py | 2 + .../tests/test_fp_work_centre.py | 29 ++++++++++ 6 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 fusion_plating/fusion_plating/models/fp_work_centre.py create mode 100644 fusion_plating/fusion_plating/tests/__init__.py create mode 100644 fusion_plating/fusion_plating/tests/test_fp_work_centre.py diff --git a/fusion_plating/fusion_plating/__manifest__.py b/fusion_plating/fusion_plating/__manifest__.py index f1b5344f..485ddd3e 100644 --- a/fusion_plating/fusion_plating/__manifest__.py +++ b/fusion_plating/fusion_plating/__manifest__.py @@ -5,7 +5,7 @@ { 'name': 'Fusion Plating', - 'version': '19.0.8.0.0', + 'version': '19.0.8.1.0', 'category': 'Manufacturing/Plating', 'summary': 'Core plating / metal finishing ERP: facilities, processes, tanks, baths, jobs, operators.', 'description': """ diff --git a/fusion_plating/fusion_plating/models/__init__.py b/fusion_plating/fusion_plating/models/__init__.py index a8df88f7..6c4a2388 100644 --- a/fusion_plating/fusion_plating/models/__init__.py +++ b/fusion_plating/fusion_plating/models/__init__.py @@ -7,6 +7,7 @@ from . import fp_process_category from . import fp_process_type from . import fp_facility from . import fp_work_center +from . import fp_work_centre from . import fp_tank from . import fp_bath from . import fp_bath_log diff --git a/fusion_plating/fusion_plating/models/fp_work_centre.py b/fusion_plating/fusion_plating/models/fp_work_centre.py new file mode 100644 index 00000000..8f61270c --- /dev/null +++ b/fusion_plating/fusion_plating/models/fp_work_centre.py @@ -0,0 +1,58 @@ +# -*- coding: utf-8 -*- +# Copyright 2026 Nexa Systems Inc. +# License OPL-1 (Odoo Proprietary License v1.0) +# +# fp.work.centre — native plating work-centre model. +# +# Replaces mrp.workcenter for the plating flow. Plating work centres +# are domain-specific (a tank line, a bake oven, a rack station — not +# assembly cells). Each centre has a 'kind' that drives release-ready +# validation on fp.job.step (e.g. wet_line -> bath+tank required). + +from odoo import fields, models + + +class FpWorkCentre(models.Model): + _name = 'fp.work.centre' + _description = 'Plating Work Centre' + _order = 'sequence, code, name' + + name = fields.Char(required=True) + code = fields.Char(required=True, help='Short code used on stickers and reports.') + sequence = fields.Integer(default=10) + facility_id = fields.Many2one( + 'fusion.plating.facility', + string='Facility', + ) + kind = fields.Selection( + [ + ('wet_line', 'Wet Line'), + ('bake', 'Bake Oven'), + ('mask', 'Masking'), + ('rack', 'Racking'), + ('inspect', 'Inspection'), + ('other', 'Other'), + ], + required=True, + default='other', + ) + cost_per_hour = fields.Monetary( + currency_field='currency_id', + help='Used for fp.job.step cost rollups.', + ) + currency_id = fields.Many2one( + 'res.currency', + default=lambda self: self.env.company.currency_id, + ) + default_bath_id = fields.Many2one('fusion.plating.bath') + default_tank_id = fields.Many2one('fusion.plating.tank') + # NOTE: `default_oven_id` from the spec/plan is omitted here — the + # `fusion.plating.bake.oven` model lives in fusion_plating_shopfloor, + # which the core module cannot depend on. The bridge module that + # introduces fp.job/fp.job.step (Task 1.x) can re-introduce this + # field via _inherit if/when the bake-oven coupling is needed. + active = fields.Boolean(default=True) + + _sql_constraints = [ + ('unique_code', 'UNIQUE(code)', 'Work centre code must be unique.'), + ] diff --git a/fusion_plating/fusion_plating/security/ir.model.access.csv b/fusion_plating/fusion_plating/security/ir.model.access.csv index 715972b2..d98349b1 100644 --- a/fusion_plating/fusion_plating/security/ir.model.access.csv +++ b/fusion_plating/fusion_plating/security/ir.model.access.csv @@ -44,3 +44,6 @@ access_fp_replenishment_suggestion_manager,fp.replenishment.suggestion.manager,m access_fp_operator_cert_operator,fp.operator.cert.operator,model_fp_operator_certification,group_fusion_plating_operator,1,0,0,0 access_fp_operator_cert_supervisor,fp.operator.cert.supervisor,model_fp_operator_certification,group_fusion_plating_supervisor,1,1,1,0 access_fp_operator_cert_manager,fp.operator.cert.manager,model_fp_operator_certification,group_fusion_plating_manager,1,1,1,1 +access_fp_work_centre_user,fp.work.centre.user,model_fp_work_centre,base.group_user,1,0,0,0 +access_fp_work_centre_supervisor,fp.work.centre.supervisor,model_fp_work_centre,fusion_plating.group_fusion_plating_supervisor,1,1,1,0 +access_fp_work_centre_manager,fp.work.centre.manager,model_fp_work_centre,fusion_plating.group_fusion_plating_manager,1,1,1,1 diff --git a/fusion_plating/fusion_plating/tests/__init__.py b/fusion_plating/fusion_plating/tests/__init__.py new file mode 100644 index 00000000..061a2c72 --- /dev/null +++ b/fusion_plating/fusion_plating/tests/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +from . import test_fp_work_centre diff --git a/fusion_plating/fusion_plating/tests/test_fp_work_centre.py b/fusion_plating/fusion_plating/tests/test_fp_work_centre.py new file mode 100644 index 00000000..c13f557c --- /dev/null +++ b/fusion_plating/fusion_plating/tests/test_fp_work_centre.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +from odoo.tests.common import TransactionCase + + +class TestFpWorkCentre(TransactionCase): + def test_create_work_centre_minimal(self): + wc = self.env['fp.work.centre'].create({ + 'name': 'Bath Line 1', + 'code': 'BL1', + 'kind': 'wet_line', + }) + self.assertEqual(wc.name, 'Bath Line 1') + self.assertEqual(wc.kind, 'wet_line') + self.assertTrue(wc.active) + + def test_facility_required_for_active_centre(self): + wc = self.env['fp.work.centre'].create({ + 'name': 'Test', + 'code': 'T', + 'kind': 'other', + }) + self.assertFalse(wc.facility_id) + + def test_kind_selection_values(self): + kinds = dict( + self.env['fp.work.centre']._fields['kind'].selection + ) + for k in ('wet_line', 'bake', 'mask', 'rack', 'inspect', 'other'): + self.assertIn(k, kinds) From 5970dfe57b60bfb06a1d9c524afaf49093df9d5e Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Fri, 24 Apr 2026 21:19:59 -0400 Subject: [PATCH 02/61] refactor(jobs): address code review feedback on fp.work.centre MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ACL: use group_fusion_plating_operator for read-only tier instead of base.group_user, matching the established hierarchy in the rest of ir.model.access.csv - Test: rename test_facility_required_for_active_centre → test_facility_optional_at_create. Old name claimed the opposite of what the assertion checks. - Manifest version bumped 19.0.8.1.0 → 19.0.8.1.1. Part of: native job model migration (spec 2026-04-25) Co-Authored-By: Claude Opus 4.7 (1M context) --- fusion_plating/fusion_plating/__manifest__.py | 2 +- fusion_plating/fusion_plating/security/ir.model.access.csv | 2 +- fusion_plating/fusion_plating/tests/test_fp_work_centre.py | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fusion_plating/fusion_plating/__manifest__.py b/fusion_plating/fusion_plating/__manifest__.py index 485ddd3e..24ebc965 100644 --- a/fusion_plating/fusion_plating/__manifest__.py +++ b/fusion_plating/fusion_plating/__manifest__.py @@ -5,7 +5,7 @@ { 'name': 'Fusion Plating', - 'version': '19.0.8.1.0', + 'version': '19.0.8.1.1', 'category': 'Manufacturing/Plating', 'summary': 'Core plating / metal finishing ERP: facilities, processes, tanks, baths, jobs, operators.', 'description': """ diff --git a/fusion_plating/fusion_plating/security/ir.model.access.csv b/fusion_plating/fusion_plating/security/ir.model.access.csv index d98349b1..6d104220 100644 --- a/fusion_plating/fusion_plating/security/ir.model.access.csv +++ b/fusion_plating/fusion_plating/security/ir.model.access.csv @@ -44,6 +44,6 @@ access_fp_replenishment_suggestion_manager,fp.replenishment.suggestion.manager,m access_fp_operator_cert_operator,fp.operator.cert.operator,model_fp_operator_certification,group_fusion_plating_operator,1,0,0,0 access_fp_operator_cert_supervisor,fp.operator.cert.supervisor,model_fp_operator_certification,group_fusion_plating_supervisor,1,1,1,0 access_fp_operator_cert_manager,fp.operator.cert.manager,model_fp_operator_certification,group_fusion_plating_manager,1,1,1,1 -access_fp_work_centre_user,fp.work.centre.user,model_fp_work_centre,base.group_user,1,0,0,0 +access_fp_work_centre_operator,fp.work.centre.operator,model_fp_work_centre,fusion_plating.group_fusion_plating_operator,1,0,0,0 access_fp_work_centre_supervisor,fp.work.centre.supervisor,model_fp_work_centre,fusion_plating.group_fusion_plating_supervisor,1,1,1,0 access_fp_work_centre_manager,fp.work.centre.manager,model_fp_work_centre,fusion_plating.group_fusion_plating_manager,1,1,1,1 diff --git a/fusion_plating/fusion_plating/tests/test_fp_work_centre.py b/fusion_plating/fusion_plating/tests/test_fp_work_centre.py index c13f557c..ffe1108f 100644 --- a/fusion_plating/fusion_plating/tests/test_fp_work_centre.py +++ b/fusion_plating/fusion_plating/tests/test_fp_work_centre.py @@ -13,7 +13,9 @@ class TestFpWorkCentre(TransactionCase): self.assertEqual(wc.kind, 'wet_line') self.assertTrue(wc.active) - def test_facility_required_for_active_centre(self): + def test_facility_optional_at_create(self): + # Facility is soft-required (warning at confirm, not constraint + # at create) — verify a centre without facility still creates. wc = self.env['fp.work.centre'].create({ 'name': 'Test', 'code': 'T', From 26928713d5b65797ccf0fa3ec075a942bccb1055 Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Fri, 24 Apr 2026 21:29:36 -0400 Subject: [PATCH 03/61] feat(jobs): add fp.job native model with state machine Header model replacing mrp.production. mail.thread for chatter, priority/state/deadline tracking, sequence WH/JOB/00001+. Tests cover create, confirm, cancel, and forbidden double-confirm. State machine: draft -> confirmed -> in_progress -> done v ^ cancelled (rework reverts here) on_hold can be entered from confirmed or in_progress. Step relations come in Task 1.5; SO/recipe/portal/cost extension fields come in Task 1.4. Part of: native job model migration (spec 2026-04-25) Co-Authored-By: Claude Opus 4.7 (1M context) --- fusion_plating/fusion_plating/__manifest__.py | 3 +- .../fusion_plating/data/fp_job_sequences.xml | 14 +++ .../fusion_plating/models/__init__.py | 1 + .../fusion_plating/models/fp_job.py | 108 ++++++++++++++++++ .../security/ir.model.access.csv | 3 + .../fusion_plating/tests/__init__.py | 1 + .../tests/test_fp_job_state_machine.py | 46 ++++++++ 7 files changed, 175 insertions(+), 1 deletion(-) create mode 100644 fusion_plating/fusion_plating/data/fp_job_sequences.xml create mode 100644 fusion_plating/fusion_plating/models/fp_job.py create mode 100644 fusion_plating/fusion_plating/tests/test_fp_job_state_machine.py diff --git a/fusion_plating/fusion_plating/__manifest__.py b/fusion_plating/fusion_plating/__manifest__.py index 24ebc965..73014a4e 100644 --- a/fusion_plating/fusion_plating/__manifest__.py +++ b/fusion_plating/fusion_plating/__manifest__.py @@ -5,7 +5,7 @@ { 'name': 'Fusion Plating', - 'version': '19.0.8.1.1', + 'version': '19.0.8.2.0', 'category': 'Manufacturing/Plating', 'summary': 'Core plating / metal finishing ERP: facilities, processes, tanks, baths, jobs, operators.', 'description': """ @@ -82,6 +82,7 @@ Copyright (c) 2026 Nexa Systems Inc. All rights reserved. 'security/fp_security.xml', 'security/ir.model.access.csv', 'data/fp_sequence_data.xml', + 'data/fp_job_sequences.xml', 'data/fp_process_category_data.xml', 'views/fp_process_type_views.xml', 'views/fp_work_center_views.xml', diff --git a/fusion_plating/fusion_plating/data/fp_job_sequences.xml b/fusion_plating/fusion_plating/data/fp_job_sequences.xml new file mode 100644 index 00000000..775838f0 --- /dev/null +++ b/fusion_plating/fusion_plating/data/fp_job_sequences.xml @@ -0,0 +1,14 @@ + + + + + Plating Job Sequence + fp.job + WH/JOB/ + 5 + 1 + 1 + + + diff --git a/fusion_plating/fusion_plating/models/__init__.py b/fusion_plating/fusion_plating/models/__init__.py index 6c4a2388..54bc58cc 100644 --- a/fusion_plating/fusion_plating/models/__init__.py +++ b/fusion_plating/fusion_plating/models/__init__.py @@ -16,6 +16,7 @@ from . import fp_bath_parameter from . import fp_bath_replenishment_rule from . import fp_process_node from . import fp_rack +from . import fp_job from . import fp_operator_certification from . import fp_tz from . import res_company diff --git a/fusion_plating/fusion_plating/models/fp_job.py b/fusion_plating/fusion_plating/models/fp_job.py new file mode 100644 index 00000000..aab0e553 --- /dev/null +++ b/fusion_plating/fusion_plating/models/fp_job.py @@ -0,0 +1,108 @@ +# -*- coding: utf-8 -*- +# Copyright 2026 Nexa Systems Inc. +# License OPL-1 (Odoo Proprietary License v1.0) +# +# fp.job — native plating job model. +# +# Replaces mrp.production for plating. One record per shop-floor job. +# Header data lives here; per-operation detail on fp.job.step (Task 1.5). +# Recipe template (fusion.plating.process.node) is unchanged — this +# model just instantiates from it via fp.job.step.recipe_node_id. +# +# State machine: +# draft -> confirmed -> in_progress -> done +# | ^ +# v | +# cancelled (rework reverts here) +# on_hold can be entered from confirmed or in_progress. + +from odoo import _, api, fields, models +from odoo.exceptions import UserError + + +class FpJob(models.Model): + _name = 'fp.job' + _description = 'Plating Job' + _inherit = ['mail.thread', 'mail.activity.mixin'] + _order = 'priority desc, date_deadline asc, id desc' + _rec_name = 'name' + + name = fields.Char( + required=True, + copy=False, + readonly=True, + default=lambda self: _('New'), + index=True, + ) + state = fields.Selection( + [ + ('draft', 'Draft'), + ('confirmed', 'Confirmed'), + ('in_progress', 'In Progress'), + ('on_hold', 'On Hold'), + ('done', 'Done'), + ('cancelled', 'Cancelled'), + ], + default='draft', + required=True, + tracking=True, + index=True, + ) + priority = fields.Selection( + [ + ('low', 'Low'), + ('normal', 'Normal'), + ('high', 'High'), + ('rush', 'Rush'), + ], + default='normal', + tracking=True, + ) + partner_id = fields.Many2one( + 'res.partner', + string='Customer', + required=True, + tracking=True, + ) + product_id = fields.Many2one('product.product', string='Reference Product') + qty = fields.Float(string='Quantity', required=True, default=1.0) + qty_done = fields.Float(string='Quantity Completed') + qty_scrapped = fields.Float(string='Quantity Scrapped') + date_deadline = fields.Datetime(string='Deadline', tracking=True) + date_planned_start = fields.Datetime(string='Planned Start') + date_started = fields.Datetime(string='Actual Start', readonly=True) + date_finished = fields.Datetime(string='Actual Finish', readonly=True) + origin = fields.Char(string='Source SO', help='Sale Order name for traceability.') + sale_order_id = fields.Many2one('sale.order', string='Sale Order') + facility_id = fields.Many2one('fusion.plating.facility', string='Facility') + manager_id = fields.Many2one('res.users', string='Plating Manager') + company_id = fields.Many2one( + 'res.company', + default=lambda self: self.env.company, + required=True, + ) + + @api.model_create_multi + def create(self, vals_list): + for vals in vals_list: + if vals.get('name', _('New')) == _('New'): + vals['name'] = self.env['ir.sequence'].next_by_code('fp.job') or _('New') + return super().create(vals_list) + + def action_confirm(self): + for job in self: + if job.state != 'draft': + raise UserError(_( + "Job %s is in state '%s' - only draft jobs can be confirmed." + ) % (job.name, job.state)) + job.state = 'confirmed' + return True + + def action_cancel(self): + for job in self: + if job.state == 'done': + raise UserError(_( + "Job %s is done - cannot cancel." + ) % job.name) + job.state = 'cancelled' + return True diff --git a/fusion_plating/fusion_plating/security/ir.model.access.csv b/fusion_plating/fusion_plating/security/ir.model.access.csv index 6d104220..4adae4dc 100644 --- a/fusion_plating/fusion_plating/security/ir.model.access.csv +++ b/fusion_plating/fusion_plating/security/ir.model.access.csv @@ -47,3 +47,6 @@ access_fp_operator_cert_manager,fp.operator.cert.manager,model_fp_operator_certi access_fp_work_centre_operator,fp.work.centre.operator,model_fp_work_centre,fusion_plating.group_fusion_plating_operator,1,0,0,0 access_fp_work_centre_supervisor,fp.work.centre.supervisor,model_fp_work_centre,fusion_plating.group_fusion_plating_supervisor,1,1,1,0 access_fp_work_centre_manager,fp.work.centre.manager,model_fp_work_centre,fusion_plating.group_fusion_plating_manager,1,1,1,1 +access_fp_job_operator,fp.job.operator,model_fp_job,fusion_plating.group_fusion_plating_operator,1,1,0,0 +access_fp_job_supervisor,fp.job.supervisor,model_fp_job,fusion_plating.group_fusion_plating_supervisor,1,1,1,0 +access_fp_job_manager,fp.job.manager,model_fp_job,fusion_plating.group_fusion_plating_manager,1,1,1,1 diff --git a/fusion_plating/fusion_plating/tests/__init__.py b/fusion_plating/fusion_plating/tests/__init__.py index 061a2c72..b2a7f2e0 100644 --- a/fusion_plating/fusion_plating/tests/__init__.py +++ b/fusion_plating/fusion_plating/tests/__init__.py @@ -1,2 +1,3 @@ # -*- coding: utf-8 -*- from . import test_fp_work_centre +from . import test_fp_job_state_machine diff --git a/fusion_plating/fusion_plating/tests/test_fp_job_state_machine.py b/fusion_plating/fusion_plating/tests/test_fp_job_state_machine.py new file mode 100644 index 00000000..4f1242d1 --- /dev/null +++ b/fusion_plating/fusion_plating/tests/test_fp_job_state_machine.py @@ -0,0 +1,46 @@ +# -*- coding: utf-8 -*- +from odoo.tests.common import TransactionCase +from odoo.exceptions import UserError + + +class TestFpJobStateMachine(TransactionCase): + def setUp(self): + super().setUp() + self.partner = self.env['res.partner'].create({'name': 'Test Customer'}) + self.product = self.env['product.product'].create({'name': 'Widget'}) + + def _make_job(self, **kw): + vals = { + 'partner_id': self.partner.id, + 'product_id': self.product.id, + 'qty': 10.0, + } + vals.update(kw) + return self.env['fp.job'].create(vals) + + def test_create_lands_in_draft(self): + job = self._make_job() + self.assertEqual(job.state, 'draft') + self.assertTrue(job.name and job.name.startswith('WH/JOB/')) + + def test_action_confirm_moves_to_confirmed(self): + job = self._make_job() + job.action_confirm() + self.assertEqual(job.state, 'confirmed') + + def test_cannot_confirm_twice(self): + job = self._make_job() + job.action_confirm() + with self.assertRaises(UserError): + job.action_confirm() + + def test_cancel_from_draft(self): + job = self._make_job() + job.action_cancel() + self.assertEqual(job.state, 'cancelled') + + def test_cannot_confirm_after_cancel(self): + job = self._make_job() + job.action_cancel() + with self.assertRaises(UserError): + job.action_confirm() From 93e0be4b4861a8cddecaa9c567b18ae06c57695f Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Fri, 24 Apr 2026 21:30:23 -0400 Subject: [PATCH 04/61] docs(jobs): tighten spec/plan after Task 1.2 review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Spec §5.3: document that default_oven_id is deferred to the fusion_plating_jobs bridge module (fusion.plating.bake.oven lives in shopfloor; core can't depend on it). - Plan: align ACL blocks for Tasks 1.2/1.3/1.5/1.7 to use group_fusion_plating_operator for the lowest tier instead of base.group_user. Caught by the code-quality reviewer on Task 1.2; this prevents the same bug recurring in later tasks. - Plan Task 1.2 test name corrected: test_facility_required_for_active_centre → test_facility_optional_at_create. Co-Authored-By: Claude Opus 4.7 (1M context) --- .../plans/2026-04-25-fp-native-job-model.md | 13 +++++-------- .../specs/2026-04-25-fp-native-job-model-design.md | 3 ++- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/fusion_plating/docs/superpowers/plans/2026-04-25-fp-native-job-model.md b/fusion_plating/docs/superpowers/plans/2026-04-25-fp-native-job-model.md index cdeb4444..0b06ab9e 100644 --- a/fusion_plating/docs/superpowers/plans/2026-04-25-fp-native-job-model.md +++ b/fusion_plating/docs/superpowers/plans/2026-04-25-fp-native-job-model.md @@ -124,15 +124,15 @@ class TestFpWorkCentre(TransactionCase): self.assertEqual(wc.kind, 'wet_line') self.assertTrue(wc.active) - def test_facility_required_for_active_centre(self): - # Active centre without facility raises on confirm path - # (we treat facility as soft-required: warning, not constraint) + def test_facility_optional_at_create(self): + # Facility is soft-required (warning at confirm, not constraint + # at create) — verify a centre without facility still creates. wc = self.env['fp.work.centre'].create({ 'name': 'Test', 'code': 'T', 'kind': 'other', }) - self.assertFalse(wc.facility_id) # allowed at create time + self.assertFalse(wc.facility_id) def test_kind_selection_values(self): kinds = dict( @@ -221,7 +221,7 @@ from . import fp_work_centre Modify `fusion_plating/security/ir.model.access.csv` — append: ```csv -access_fp_work_centre_user,fp.work.centre.user,model_fp_work_centre,base.group_user,1,0,0,0 +access_fp_work_centre_operator,fp.work.centre.operator,model_fp_work_centre,fusion_plating.group_fusion_plating_operator,1,0,0,0 access_fp_work_centre_supervisor,fp.work.centre.supervisor,model_fp_work_centre,fusion_plating.group_fusion_plating_supervisor,1,1,1,0 access_fp_work_centre_manager,fp.work.centre.manager,model_fp_work_centre,fusion_plating.group_fusion_plating_manager,1,1,1,1 ``` @@ -477,7 +477,6 @@ Modify `fusion_plating/__manifest__.py` — add `'data/fp_job_sequences.xml'` to Modify `fusion_plating/security/ir.model.access.csv` — append: ```csv -access_fp_job_user,fp.job.user,model_fp_job,base.group_user,1,0,0,0 access_fp_job_operator,fp.job.operator,model_fp_job,fusion_plating.group_fusion_plating_operator,1,1,0,0 access_fp_job_supervisor,fp.job.supervisor,model_fp_job,fusion_plating.group_fusion_plating_supervisor,1,1,1,0 access_fp_job_manager,fp.job.manager,model_fp_job,fusion_plating.group_fusion_plating_manager,1,1,1,1 @@ -899,7 +898,6 @@ Modify `fusion_plating/models/fp_job.py` — add field after `qc_check_id`: Modify `fusion_plating/security/ir.model.access.csv` — append: ```csv -access_fp_job_step_user,fp.job.step.user,model_fp_job_step,base.group_user,1,0,0,0 access_fp_job_step_operator,fp.job.step.operator,model_fp_job_step,fusion_plating.group_fusion_plating_operator,1,1,0,0 access_fp_job_step_supervisor,fp.job.step.supervisor,model_fp_job_step,fusion_plating.group_fusion_plating_supervisor,1,1,1,0 access_fp_job_step_manager,fp.job.step.manager,model_fp_job_step,fusion_plating.group_fusion_plating_manager,1,1,1,1 @@ -1200,7 +1198,6 @@ Replace `button_start` and `button_finish` to manage timelogs and `duration_actu Modify `fusion_plating/security/ir.model.access.csv` — append: ```csv -access_fp_job_step_timelog_user,fp.job.step.timelog.user,model_fp_job_step_timelog,base.group_user,1,0,0,0 access_fp_job_step_timelog_operator,fp.job.step.timelog.operator,model_fp_job_step_timelog,fusion_plating.group_fusion_plating_operator,1,1,1,0 access_fp_job_step_timelog_manager,fp.job.step.timelog.manager,model_fp_job_step_timelog,fusion_plating.group_fusion_plating_manager,1,1,1,1 ``` diff --git a/fusion_plating/docs/superpowers/specs/2026-04-25-fp-native-job-model-design.md b/fusion_plating/docs/superpowers/specs/2026-04-25-fp-native-job-model-design.md index e02b73ca..65615a6c 100644 --- a/fusion_plating/docs/superpowers/specs/2026-04-25-fp-native-job-model-design.md +++ b/fusion_plating/docs/superpowers/specs/2026-04-25-fp-native-job-model-design.md @@ -220,7 +220,8 @@ domain-specific (a tank line, a bake oven, a rack station — not assembly cells | `facility_id` | Many2one(fp.facility) | Which facility | | `kind` | Selection | `wet_line`, `bake`, `mask`, `rack`, `inspect`, `other` | | `cost_per_hour` | Monetary | For margin calculations | -| `default_bath_id, default_tank_id, default_oven_id` | Many2one | Single-line shop convenience | +| `default_bath_id, default_tank_id` | Many2one(`fusion.plating.bath`/`.tank`) | Single-line shop convenience | +| `default_oven_id` | Many2one(`fusion.plating.bake.oven`) | **Deferred to `fusion_plating_jobs` bridge module via `_inherit`** — `bake.oven` is defined in `fusion_plating_shopfloor` which `fusion_plating` core cannot depend on. Bridge module *can* depend on shopfloor and adds this field there. | | `active` | Boolean | | This replaces `x_fc_mrp_workcenter_id` mapping that the recipe operations have today. From b45a134aa46b57a8c81c6f292602facd7abada15 Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Fri, 24 Apr 2026 21:36:58 -0400 Subject: [PATCH 05/61] refactor(jobs): address code review feedback on fp.job - Sequence: add noupdate="1" to fp_job_sequences.xml. Without it, every module update resets number_next to 1, corrupting the live job-number stream. Matches fp_sequence_data.xml convention. - action_cancel now raises UserError on an already-cancelled job instead of silently rewriting state. Audit-grade traceability expects explicit failures. - Added TODO marker for action_hold / action_resume / action_revert_to_confirmed so future authors don't bypass the state-machine guards. - Tests: added cannot_cancel_done (covers the dead-code UserError branch) and cannot_cancel_already_cancelled. Manifest version bumped 19.0.8.2.0 -> 19.0.8.2.1. Part of: native job model migration (spec 2026-04-25) Co-Authored-By: Claude Opus 4.7 (1M context) --- fusion_plating/fusion_plating/__manifest__.py | 2 +- .../fusion_plating/data/fp_job_sequences.xml | 5 ++++- fusion_plating/fusion_plating/models/fp_job.py | 14 +++++++++++++- .../tests/test_fp_job_state_machine.py | 18 ++++++++++++++++++ 4 files changed, 36 insertions(+), 3 deletions(-) diff --git a/fusion_plating/fusion_plating/__manifest__.py b/fusion_plating/fusion_plating/__manifest__.py index 73014a4e..b9e282ab 100644 --- a/fusion_plating/fusion_plating/__manifest__.py +++ b/fusion_plating/fusion_plating/__manifest__.py @@ -5,7 +5,7 @@ { 'name': 'Fusion Plating', - 'version': '19.0.8.2.0', + 'version': '19.0.8.2.1', 'category': 'Manufacturing/Plating', 'summary': 'Core plating / metal finishing ERP: facilities, processes, tanks, baths, jobs, operators.', 'description': """ diff --git a/fusion_plating/fusion_plating/data/fp_job_sequences.xml b/fusion_plating/fusion_plating/data/fp_job_sequences.xml index 775838f0..ae13baaf 100644 --- a/fusion_plating/fusion_plating/data/fp_job_sequences.xml +++ b/fusion_plating/fusion_plating/data/fp_job_sequences.xml @@ -1,5 +1,8 @@ - + + diff --git a/fusion_plating/fusion_plating/models/fp_job.py b/fusion_plating/fusion_plating/models/fp_job.py index aab0e553..d1305640 100644 --- a/fusion_plating/fusion_plating/models/fp_job.py +++ b/fusion_plating/fusion_plating/models/fp_job.py @@ -89,6 +89,14 @@ class FpJob(models.Model): vals['name'] = self.env['ir.sequence'].next_by_code('fp.job') or _('New') return super().create(vals_list) + # ------------------------------------------------------------------ + # State machine — actions + # ------------------------------------------------------------------ + # TODO(fp.job state-machine completeness): action_hold, action_resume, + # action_revert_to_confirmed (rework path) — to be added when shopfloor + # / rework workflows are wired up. For now, draft → confirmed and the + # cancel paths are the only enforced transitions; everything else is + # an explicit `state` write by privileged code. def action_confirm(self): for job in self: if job.state != 'draft': @@ -102,7 +110,11 @@ class FpJob(models.Model): for job in self: if job.state == 'done': raise UserError(_( - "Job %s is done - cannot cancel." + "Job %s is done — cannot cancel." + ) % job.name) + if job.state == 'cancelled': + raise UserError(_( + "Job %s is already cancelled." ) % job.name) job.state = 'cancelled' return True diff --git a/fusion_plating/fusion_plating/tests/test_fp_job_state_machine.py b/fusion_plating/fusion_plating/tests/test_fp_job_state_machine.py index 4f1242d1..47a9429e 100644 --- a/fusion_plating/fusion_plating/tests/test_fp_job_state_machine.py +++ b/fusion_plating/fusion_plating/tests/test_fp_job_state_machine.py @@ -44,3 +44,21 @@ class TestFpJobStateMachine(TransactionCase): job.action_cancel() with self.assertRaises(UserError): job.action_confirm() + + def test_cannot_cancel_done(self): + # Done jobs cannot be cancelled — covers the UserError branch in + # action_cancel. + job = self._make_job() + job.action_confirm() + # Force the state to 'done' for the test (no public action yet — + # done is set by step-completion logic landing in Task 1.5+). + job.state = 'done' + with self.assertRaises(UserError): + job.action_cancel() + + def test_cannot_cancel_already_cancelled(self): + # Idempotent re-cancel is now an explicit error. + job = self._make_job() + job.action_cancel() + with self.assertRaises(UserError): + job.action_cancel() From 335dc2488eb65c1a27bdf9de94cf41ea0d70fb58 Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Fri, 24 Apr 2026 21:44:28 -0400 Subject: [PATCH 06/61] feat(jobs): add core-safe extension fields to fp.job MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Scope was reduced from spec's full §5.1 list because 6 of the 10 plating-specific fields point to models in dependent modules (configurator, quality, portal, logistics, bridge_mrp). Adding those Many2ones in core would invert the dependency graph. They move to their owning modules via _inherit = 'fp.job' and get re-bundled by fusion_plating_jobs in Phase 2. This commit lands the core-safe subset: - sale_order_line_ids (sale_management is in core depends) - recipe_id, start_at_node_id (process.node is in core) - invoice_ids (account is reachable via sale_management → sale) - Cost rollup: quoted_revenue / actual_cost / margin / margin_pct with placeholder compute (actual_cost = 0 until Task 1.5 wires fp.job.step.cost_total) - current_location stub (full Bath/Oven rendering in Task 1.6) Tests cover the cost-rollup math and the current_location stub. Spec §5.1 has been re-tabulated with explicit 'Module' column. Manifest 19.0.8.2.1 → 19.0.8.3.0. Part of: native job model migration (spec 2026-04-25) Co-Authored-By: Claude Opus 4.7 (1M context) --- fusion_plating/fusion_plating/__manifest__.py | 2 +- .../fusion_plating/models/fp_job.py | 91 +++++++++++++++++++ .../tests/test_fp_job_state_machine.py | 24 +++++ 3 files changed, 116 insertions(+), 1 deletion(-) diff --git a/fusion_plating/fusion_plating/__manifest__.py b/fusion_plating/fusion_plating/__manifest__.py index b9e282ab..0b3116b7 100644 --- a/fusion_plating/fusion_plating/__manifest__.py +++ b/fusion_plating/fusion_plating/__manifest__.py @@ -5,7 +5,7 @@ { 'name': 'Fusion Plating', - 'version': '19.0.8.2.1', + 'version': '19.0.8.3.0', 'category': 'Manufacturing/Plating', 'summary': 'Core plating / metal finishing ERP: facilities, processes, tanks, baths, jobs, operators.', 'description': """ diff --git a/fusion_plating/fusion_plating/models/fp_job.py b/fusion_plating/fusion_plating/models/fp_job.py index d1305640..54efbc38 100644 --- a/fusion_plating/fusion_plating/models/fp_job.py +++ b/fusion_plating/fusion_plating/models/fp_job.py @@ -82,6 +82,97 @@ class FpJob(models.Model): required=True, ) + # ------------------------------------------------------------------ + # Source / recipe / invoicing — core-safe (target models reachable + # via current depends: sale_management → sale → account, and our + # own fusion.plating.process.node). + # + # Plating-specific extensions (part_catalog_id, coating_config_id, + # customer_spec_id, portal_job_id, delivery_id, qc_check_id) are + # deferred to their owning modules via _inherit = 'fp.job' to avoid + # inverting the dependency graph. See spec §5.1. + # ------------------------------------------------------------------ + sale_order_line_ids = fields.Many2many( + 'sale.order.line', + 'fp_job_sale_order_line_rel', + 'job_id', 'line_id', + string='Source SO Lines', + ) + recipe_id = fields.Many2one( + 'fusion.plating.process.node', + string='Recipe', + domain=[('node_type', '=', 'recipe')], + ) + start_at_node_id = fields.Many2one( + 'fusion.plating.process.node', + string='Start at Node', + help='Rework: start the job at this recipe node (skip earlier).', + ) + invoice_ids = fields.Many2many( + 'account.move', + 'fp_job_account_move_rel', + 'job_id', 'move_id', + string='Invoices', + ) + + # ------------------------------------------------------------------ + # Cost rollup — actual_cost stays at 0 until Task 1.5 wires step + # time × work_centre.cost_per_hour. quoted_revenue is a manual entry + # for now (will be filled by the SO → job hook in Phase 2). + # ------------------------------------------------------------------ + currency_id = fields.Many2one( + 'res.currency', + default=lambda self: self.env.company.currency_id, + ) + quoted_revenue = fields.Monetary( + currency_field='currency_id', + help='From source SO.', + ) + actual_cost = fields.Monetary( + currency_field='currency_id', + compute='_compute_costs', store=True, + ) + margin = fields.Monetary( + currency_field='currency_id', + compute='_compute_costs', store=True, + ) + margin_pct = fields.Float( + compute='_compute_costs', store=True, + ) + + @api.depends('quoted_revenue') + # NOTE: when fp.job.step lands in Task 1.5, this dependency expands + # to include 'step_ids.cost_total'. For now actual_cost is always 0. + def _compute_costs(self): + for job in self: + job.actual_cost = 0.0 + job.margin = job.quoted_revenue - job.actual_cost + job.margin_pct = ( + (job.margin / job.quoted_revenue * 100.0) + if job.quoted_revenue else 0.0 + ) + + # ------------------------------------------------------------------ + # current_location — operator-readable status string. Stub here; + # full "Queued: Bath 3" / "In progress: Oven A" rendering needs + # fp.job.step + fp.work.centre, which lands in Tasks 1.5/1.6. + # ------------------------------------------------------------------ + current_location = fields.Char( + compute='_compute_current_location', + help='Human-readable: "Queued: Bath 3" / "In progress: Oven A" / "Ready to ship".', + ) + + def _compute_current_location(self): + for job in self: + if job.state == 'draft': + job.current_location = 'Not started' + elif job.state == 'cancelled': + job.current_location = 'Cancelled' + elif job.state == 'done': + job.current_location = 'Done' + else: + job.current_location = job.state.replace('_', ' ').title() + @api.model_create_multi def create(self, vals_list): for vals in vals_list: diff --git a/fusion_plating/fusion_plating/tests/test_fp_job_state_machine.py b/fusion_plating/fusion_plating/tests/test_fp_job_state_machine.py index 47a9429e..4c06d7b2 100644 --- a/fusion_plating/fusion_plating/tests/test_fp_job_state_machine.py +++ b/fusion_plating/fusion_plating/tests/test_fp_job_state_machine.py @@ -62,3 +62,27 @@ class TestFpJobStateMachine(TransactionCase): job.action_cancel() with self.assertRaises(UserError): job.action_cancel() + + def test_current_location_for_draft(self): + job = self._make_job() + self.assertEqual(job.current_location, 'Not started') + + def test_current_location_for_done(self): + job = self._make_job() + # Force state to 'done' (no public action yet) + job.state = 'done' + # Recompute — Odoo's compute is auto on read + self.assertEqual(job.current_location, 'Done') + + def test_margin_zero_when_no_revenue(self): + job = self._make_job() + self.assertEqual(job.actual_cost, 0.0) + self.assertEqual(job.margin, 0.0) + self.assertEqual(job.margin_pct, 0.0) + + def test_margin_with_revenue(self): + job = self._make_job(quoted_revenue=1000.0) + self.assertEqual(job.quoted_revenue, 1000.0) + self.assertEqual(job.actual_cost, 0.0) + self.assertEqual(job.margin, 1000.0) + self.assertEqual(job.margin_pct, 100.0) From e4111ad000c3d980c27c2725af3426e3c5441cec Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Fri, 24 Apr 2026 21:51:23 -0400 Subject: [PATCH 07/61] refactor(jobs): address code review feedback on fp.job (Task 1.4) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Move NOTE comment from between @api.depends and the function into a proper docstring on _compute_costs. - Make currency_id required=True (default still in place — only a programmatic write would null it, but Monetary fields need a non-null anchor). - Add test_current_location_for_confirmed to cover the title-case fallback branch in _compute_current_location. Manifest 19.0.8.3.0 → 19.0.8.3.1. Part of: native job model migration (spec 2026-04-25) Co-Authored-By: Claude Opus 4.7 (1M context) --- fusion_plating/fusion_plating/__manifest__.py | 2 +- fusion_plating/fusion_plating/models/fp_job.py | 9 +++++++-- .../fusion_plating/tests/test_fp_job_state_machine.py | 6 ++++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/fusion_plating/fusion_plating/__manifest__.py b/fusion_plating/fusion_plating/__manifest__.py index 0b3116b7..09a96c4a 100644 --- a/fusion_plating/fusion_plating/__manifest__.py +++ b/fusion_plating/fusion_plating/__manifest__.py @@ -5,7 +5,7 @@ { 'name': 'Fusion Plating', - 'version': '19.0.8.3.0', + 'version': '19.0.8.3.1', 'category': 'Manufacturing/Plating', 'summary': 'Core plating / metal finishing ERP: facilities, processes, tanks, baths, jobs, operators.', 'description': """ diff --git a/fusion_plating/fusion_plating/models/fp_job.py b/fusion_plating/fusion_plating/models/fp_job.py index 54efbc38..5c917f45 100644 --- a/fusion_plating/fusion_plating/models/fp_job.py +++ b/fusion_plating/fusion_plating/models/fp_job.py @@ -122,6 +122,7 @@ class FpJob(models.Model): # ------------------------------------------------------------------ currency_id = fields.Many2one( 'res.currency', + required=True, default=lambda self: self.env.company.currency_id, ) quoted_revenue = fields.Monetary( @@ -141,9 +142,13 @@ class FpJob(models.Model): ) @api.depends('quoted_revenue') - # NOTE: when fp.job.step lands in Task 1.5, this dependency expands - # to include 'step_ids.cost_total'. For now actual_cost is always 0. def _compute_costs(self): + """Cost rollup for the job header. + + TODO(Task 1.5): when fp.job.step lands, expand @api.depends to + include 'step_ids.cost_total' so actual_cost rolls up + step time × work_centre.cost_per_hour automatically. + """ for job in self: job.actual_cost = 0.0 job.margin = job.quoted_revenue - job.actual_cost diff --git a/fusion_plating/fusion_plating/tests/test_fp_job_state_machine.py b/fusion_plating/fusion_plating/tests/test_fp_job_state_machine.py index 4c06d7b2..a2f750ea 100644 --- a/fusion_plating/fusion_plating/tests/test_fp_job_state_machine.py +++ b/fusion_plating/fusion_plating/tests/test_fp_job_state_machine.py @@ -86,3 +86,9 @@ class TestFpJobStateMachine(TransactionCase): self.assertEqual(job.actual_cost, 0.0) self.assertEqual(job.margin, 1000.0) self.assertEqual(job.margin_pct, 100.0) + + def test_current_location_for_confirmed(self): + job = self._make_job() + job.action_confirm() + # Forces compute via field read; expect title-cased state + self.assertEqual(job.current_location, 'Confirmed') From f7a4cba5a8732ab98f56d1842851be1163393584 Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Fri, 24 Apr 2026 21:54:35 -0400 Subject: [PATCH 08/61] =?UTF-8?q?docs(jobs):=20split=20fp.job=20=C2=A75.1?= =?UTF-8?q?=20fields=20by=20module=20ownership=20(Task=201.4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Originally Task 1.4 was to add all spec §5.1 extension fields to fp.job in core. The dependency-graph audit during implementation revealed that 6 of those fields point to models in dependent modules (configurator, quality, portal, logistics, bridge_mrp). Adding them in core would invert the dependency graph. Spec §5.1 now has a Module column. Core-safe fields stay in fusion_plating/models/fp_job.py; cross-module fields are deferred to their owning modules via _inherit = 'fp.job' in Phase 2. Plan Task 1.4 narrative updated to reflect the reduced scope. Co-Authored-By: Claude Opus 4.7 (1M context) --- .../plans/2026-04-25-fp-native-job-model.md | 53 +++++------ .../2026-04-25-fp-native-job-model-design.md | 95 ++++++++++--------- 2 files changed, 75 insertions(+), 73 deletions(-) diff --git a/fusion_plating/docs/superpowers/plans/2026-04-25-fp-native-job-model.md b/fusion_plating/docs/superpowers/plans/2026-04-25-fp-native-job-model.md index 0b06ab9e..257a1d99 100644 --- a/fusion_plating/docs/superpowers/plans/2026-04-25-fp-native-job-model.md +++ b/fusion_plating/docs/superpowers/plans/2026-04-25-fp-native-job-model.md @@ -453,7 +453,10 @@ Create `fusion_plating/data/fp_job_sequences.xml`: ```xml - + + @@ -513,11 +516,20 @@ Co-Authored-By: Claude Opus 4.7 (1M context) " --- -### Task 1.4: Add SO/origin/extension fields to `fp.job` +### Task 1.4: Add core-safe extension fields to `fp.job` -The full field list from spec §5.1 — added in chunks so each commit is reviewable. +**Scope reduction (2026-04-25):** Originally this task added all spec §5.1 fields. +But the dependency audit during Task 1.4 implementation revealed that 6 of those +fields point to models in modules that depend on `fusion_plating` core (configurator, +quality, portal, logistics, bridge_mrp). Adding them in core would invert the +dependency graph. **Per the updated spec §5.1**, those fields are deferred to their +owning modules via `_inherit = 'fp.job'` and re-bundled by `fusion_plating_jobs` in +Phase 2. -- [ ] **Step 1: Add SO + recipe + portal/delivery fields** +This task now lands ONLY the fields whose target models are reachable from core's +existing `depends` (sale_management → sale → account, and our own process.node): + +- [ ] **Step 1: Add SO + recipe core-safe fields** Modify `fusion_plating/models/fp_job.py` — add fields after `company_id`: @@ -528,19 +540,6 @@ Modify `fusion_plating/models/fp_job.py` — add fields after `company_id`: 'job_id', 'line_id', string='Source SO Lines', ) - part_catalog_id = fields.Many2one( - 'fp.part.catalog', - string='Part', - index=True, - ) - coating_config_id = fields.Many2one( - 'fp.coating.config', - string='Coating Configuration', - ) - customer_spec_id = fields.Many2one( - 'fusion.plating.customer.spec', - string='Customer Spec', - ) recipe_id = fields.Many2one( 'fusion.plating.process.node', string='Recipe', @@ -551,26 +550,22 @@ Modify `fusion_plating/models/fp_job.py` — add fields after `company_id`: string='Start at Node', help='Rework: start the job at this recipe node (skip earlier).', ) - portal_job_id = fields.Many2one( - 'fusion.plating.portal.job', - string='Portal Job', - ) - delivery_id = fields.Many2one( - 'fusion.plating.delivery', - string='Delivery', - ) invoice_ids = fields.Many2many( 'account.move', 'fp_job_account_move_rel', 'job_id', 'move_id', string='Invoices', ) - qc_check_id = fields.Many2one( - 'fp.quality.check', - string='Active QC Check', - ) ``` +**Deferred to bridge modules (DO NOT add in this task):** +- `part_catalog_id`, `coating_config_id` → owned by `fusion_plating_configurator` +- `customer_spec_id` → owned by `fusion_plating_quality` +- `portal_job_id` → owned by `fusion_plating_portal` +- `delivery_id` → owned by `fusion_plating_logistics` +- `qc_check_id` → owned by `fusion_plating_jobs` (Phase 2; the underlying model + `fusion.plating.quality.check` currently lives in `fusion_plating_bridge_mrp`) + - [ ] **Step 2: Add cost rollup fields (computed)** Append: diff --git a/fusion_plating/docs/superpowers/specs/2026-04-25-fp-native-job-model-design.md b/fusion_plating/docs/superpowers/specs/2026-04-25-fp-native-job-model-design.md index 65615a6c..9d58051a 100644 --- a/fusion_plating/docs/superpowers/specs/2026-04-25-fp-native-job-model-design.md +++ b/fusion_plating/docs/superpowers/specs/2026-04-25-fp-native-job-model-design.md @@ -96,50 +96,57 @@ process tree with cost/time aggregates. Replaces `mrp.production` for plating jobs. One record per shop-floor job. -| Field | Type | Notes | -|---|---|---| -| `name` | Char | Sequence: `WH/JOB/00033`. The legacy "WH/MO/00033" labels stay only on migrated records (see §7). | -| `state` | Selection | `draft`, `confirmed`, `in_progress`, `done`, `cancelled`, `on_hold` | -| `partner_id` | Many2one(res.partner) | Customer; copied from SO | -| `product_id` | Many2one(product.product) | Reference part product (for inventory only) | -| `part_catalog_id` | Many2one(fp.part.catalog) | The actual part being plated; primary identifier | -| `qty` | Float | Quantity to plate | -| `qty_done` | Float | Quantity completed | -| `qty_scrapped` | Float | Quantity scrapped (rolled up from holds) | -| `date_deadline` | Datetime | Promised completion date | -| `date_planned_start` | Datetime | Planned start | -| `date_started` | Datetime | Actual start (first step start) | -| `date_finished` | Datetime | Actual completion | -| `origin` | Char | SO name for traceability | -| `sale_order_id` | Many2one(sale.order) | Source SO | -| `sale_order_line_ids` | Many2many(sale.order.line) | Lines that fed this job (group_tag collapse) | -| `recipe_id` | Many2one(fusion.plating.process.node) | The recipe template used | -| `step_ids` | One2many(fp.job.step, job_id) | The operations | -| `step_count` | Integer | Computed | -| `step_done_count` | Integer | Computed | -| `step_progress_pct` | Float | Computed: `step_done_count / step_count * 100` | -| `current_step_id` | Many2one(fp.job.step) | The operation currently in progress (or next ready) | -| `coating_config_id` | Many2one(fp.coating.config) | The coating spec | -| `facility_id` | Many2one(fp.facility) | Hard gate at confirm | -| `manager_id` | Many2one(res.users) | Plating manager | -| `priority` | Selection | `low`, `normal`, `high`, `rush` (operator-relevant ordering) | -| `customer_spec_id` | Many2one(fp.customer.spec) | Optional spec | -| `portal_job_id` | Many2one(fp.portal.job) | Customer portal binding (renamed from `x_fc_portal_job_id`) | -| `delivery_id` | Many2one(fp.delivery) | The shipment | -| `invoice_ids` | Many2many(account.move) | Linked invoices | -| `certificate_ids` | One2many(fp.certificate, job_id) | Certs generated | -| `batch_ids` | One2many(fp.batch, job_id) | Batches that ran through | -| `quality_hold_ids` | One2many(fp.quality.hold, job_id) | Holds raised | -| `consumption_ids` | One2many(fp.job.consumption, job_id) | Consumables | -| `qc_check_id` | Many2one(fp.quality.check) | Active QC check | -| `quoted_revenue` | Monetary | From SO | -| `actual_cost` | Monetary | Computed from steps + consumables | -| `margin` | Monetary | Computed | -| `margin_pct` | Float | Computed | -| `start_at_node_id` | Many2one(fusion.plating.process.node) | Rework: start at this recipe node | -| `override_ids` | One2many(fp.job.node.override, job_id) | Per-job opt-in/out | -| `current_location` | Char | Computed: "Queued: Bath 3" / "In progress: Oven A" / "Ready to ship" | -| `mail.thread, mail.activity.mixin` | Inherits | Chatter | +**Module ownership:** `fp.job` lives in `fusion_plating` core. Cross-module fields +(referencing models from `fusion_plating_configurator`, `_portal`, `_logistics`, +`_quality`, `_bridge_mrp`) **cannot** live in core without inverting the dependency +graph. Each owning module extends `fp.job` via `_inherit` to add its field. The +Phase 2 module `fusion_plating_jobs` becomes the umbrella that pulls all the +extensions together. Ownership is called out in the **Module** column below. + +| Field | Type | Module | Notes | +|---|---|---|---| +| `name` | Char | core | Sequence: `WH/JOB/00033`. The legacy "WH/MO/00033" labels stay only on migrated records (see §7). | +| `state` | Selection | core | `draft`, `confirmed`, `in_progress`, `done`, `cancelled`, `on_hold` | +| `partner_id` | Many2one(res.partner) | core | Customer; copied from SO | +| `product_id` | Many2one(product.product) | core | Reference part product (for inventory only) | +| `qty` | Float | core | Quantity to plate | +| `qty_done` | Float | core | Quantity completed | +| `qty_scrapped` | Float | core | Quantity scrapped (rolled up from holds) | +| `date_deadline` | Datetime | core | Promised completion date | +| `date_planned_start` | Datetime | core | Planned start | +| `date_started` | Datetime | core | Actual start (first step start) | +| `date_finished` | Datetime | core | Actual completion | +| `origin` | Char | core | SO name for traceability | +| `sale_order_id` | Many2one(sale.order) | core | Source SO (sale_management is in core depends) | +| `sale_order_line_ids` | Many2many(sale.order.line) | core | Lines that fed this job (group_tag collapse) | +| `recipe_id` | Many2one(fusion.plating.process.node) | core | The recipe template used | +| `step_ids` | One2many(fp.job.step, job_id) | core | The operations | +| `step_count` | Integer | core | Computed | +| `step_done_count` | Integer | core | Computed | +| `step_progress_pct` | Float | core | Computed: `step_done_count / step_count * 100` | +| `current_step_id` | Many2one(fp.job.step) | core | The operation currently in progress (or next ready) | +| `facility_id` | Many2one(fusion.plating.facility) | core | Hard gate at confirm | +| `manager_id` | Many2one(res.users) | core | Plating manager | +| `priority` | Selection | core | `low`, `normal`, `high`, `rush` (operator-relevant ordering) | +| `invoice_ids` | Many2many(account.move) | core | Linked invoices (account is reachable via sale_management → sale → account) | +| `quoted_revenue` | Monetary | core | From SO | +| `actual_cost` | Monetary | core | Computed from steps + consumables | +| `margin` | Monetary | core | Computed | +| `margin_pct` | Float | core | Computed | +| `start_at_node_id` | Many2one(fusion.plating.process.node) | core | Rework: start at this recipe node | +| `current_location` | Char | core | Computed: "Queued: Bath 3" / "In progress: Oven A" / "Ready to ship" | +| `mail.thread, mail.activity.mixin` | Inherits | core | Chatter | +| `part_catalog_id` | Many2one(fp.part.catalog) | **`fusion_plating_configurator`** (`_inherit = 'fp.job'`) | The actual part being plated; primary identifier | +| `coating_config_id` | Many2one(fp.coating.config) | **`fusion_plating_configurator`** | The coating spec | +| `customer_spec_id` | Many2one(fusion.plating.customer.spec) | **`fusion_plating_quality`** | Optional spec | +| `portal_job_id` | Many2one(fusion.plating.portal.job) | **`fusion_plating_portal`** | Customer portal binding | +| `delivery_id` | Many2one(fusion.plating.delivery) | **`fusion_plating_logistics`** | The shipment | +| `qc_check_id` | Many2one(fusion.plating.quality.check) | **`fusion_plating_jobs`** (Phase 2) | Active QC check; model lives in current bridge_mrp, will move to jobs module | +| `certificate_ids` | One2many(fp.certificate, job_id) | **`fusion_plating_certificates`** | Certs generated | +| `batch_ids` | One2many(fp.batch, job_id) | **`fusion_plating_batch`** | Batches that ran through | +| `quality_hold_ids` | One2many(fp.quality.hold, job_id) | **`fusion_plating_quality`** | Holds raised | +| `consumption_ids` | One2many(fp.job.consumption, job_id) | **`fusion_plating_jobs`** (Phase 2) | Consumables | +| `override_ids` | One2many(fp.job.node.override, job_id) | **`fusion_plating_jobs`** (Phase 2) | Per-job opt-in/out | **State machine:** ``` From c41a488b58e51f260485f7f7f8fe8fc0cf10804b Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Fri, 24 Apr 2026 21:59:07 -0400 Subject: [PATCH 09/61] feat(jobs): add fp.job.step model with state machine MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Per-operation model replacing mrp.workorder for plating. Each step instantiates from a recipe operation node (recipe_node_id link). Container/step nodes from the recipe template are rendered at view time via that link — they don't get rows here. See spec §5.2 Option A. 7-state machine: pending → ready → in_progress → done, plus paused, skipped, cancelled. button_start/button_finish enforce the transitions. Job header gets step_ids + step_count, step_done_count, step_progress_pct, current_step_id (computed from steps). Equipment, audit fields, plating-spec fields, time logs, and release-ready validation come in Tasks 1.6 and 1.7. Manifest 19.0.8.3.1 → 19.0.8.4.0. Part of: native job model migration (spec 2026-04-25) Co-Authored-By: Claude Opus 4.7 (1M context) --- fusion_plating/fusion_plating/__manifest__.py | 2 +- .../fusion_plating/models/__init__.py | 1 + .../fusion_plating/models/fp_job.py | 39 +++++++ .../fusion_plating/models/fp_job_step.py | 100 ++++++++++++++++++ .../security/ir.model.access.csv | 3 + .../fusion_plating/tests/__init__.py | 1 + .../tests/test_fp_job_step_state_machine.py | 73 +++++++++++++ 7 files changed, 218 insertions(+), 1 deletion(-) create mode 100644 fusion_plating/fusion_plating/models/fp_job_step.py create mode 100644 fusion_plating/fusion_plating/tests/test_fp_job_step_state_machine.py diff --git a/fusion_plating/fusion_plating/__manifest__.py b/fusion_plating/fusion_plating/__manifest__.py index 09a96c4a..b5ccd317 100644 --- a/fusion_plating/fusion_plating/__manifest__.py +++ b/fusion_plating/fusion_plating/__manifest__.py @@ -5,7 +5,7 @@ { 'name': 'Fusion Plating', - 'version': '19.0.8.3.1', + 'version': '19.0.8.4.0', 'category': 'Manufacturing/Plating', 'summary': 'Core plating / metal finishing ERP: facilities, processes, tanks, baths, jobs, operators.', 'description': """ diff --git a/fusion_plating/fusion_plating/models/__init__.py b/fusion_plating/fusion_plating/models/__init__.py index 54bc58cc..600187ab 100644 --- a/fusion_plating/fusion_plating/models/__init__.py +++ b/fusion_plating/fusion_plating/models/__init__.py @@ -17,6 +17,7 @@ from . import fp_bath_replenishment_rule from . import fp_process_node from . import fp_rack from . import fp_job +from . import fp_job_step from . import fp_operator_certification from . import fp_tz from . import res_company diff --git a/fusion_plating/fusion_plating/models/fp_job.py b/fusion_plating/fusion_plating/models/fp_job.py index 5c917f45..511aca90 100644 --- a/fusion_plating/fusion_plating/models/fp_job.py +++ b/fusion_plating/fusion_plating/models/fp_job.py @@ -178,6 +178,45 @@ class FpJob(models.Model): else: job.current_location = job.state.replace('_', ' ').title() + # ------------------------------------------------------------------ + # Steps — One2many to fp.job.step (Task 1.5) + # ------------------------------------------------------------------ + step_ids = fields.One2many( + 'fp.job.step', + 'job_id', + string='Steps', + ) + step_count = fields.Integer(compute='_compute_step_counts') + step_done_count = fields.Integer(compute='_compute_step_counts') + step_progress_pct = fields.Float(compute='_compute_step_counts') + current_step_id = fields.Many2one( + 'fp.job.step', + compute='_compute_current_step', + ) + + @api.depends('step_ids', 'step_ids.state') + def _compute_step_counts(self): + for job in self: + job.step_count = len(job.step_ids) + job.step_done_count = len(job.step_ids.filtered(lambda s: s.state == 'done')) + job.step_progress_pct = ( + (job.step_done_count / job.step_count * 100.0) + if job.step_count else 0.0 + ) + + @api.depends('step_ids.state', 'step_ids.sequence') + def _compute_current_step(self): + for job in self: + in_prog = job.step_ids.filtered(lambda s: s.state == 'in_progress') + if in_prog: + job.current_step_id = in_prog.sorted('sequence')[:1] + continue + ready = job.step_ids.filtered(lambda s: s.state == 'ready') + if ready: + job.current_step_id = ready.sorted('sequence')[:1] + continue + job.current_step_id = False + @api.model_create_multi def create(self, vals_list): for vals in vals_list: diff --git a/fusion_plating/fusion_plating/models/fp_job_step.py b/fusion_plating/fusion_plating/models/fp_job_step.py new file mode 100644 index 00000000..363b3d0d --- /dev/null +++ b/fusion_plating/fusion_plating/models/fp_job_step.py @@ -0,0 +1,100 @@ +# -*- coding: utf-8 -*- +# Copyright 2026 Nexa Systems Inc. +# License OPL-1 (Odoo Proprietary License v1.0) +# +# fp.job.step — one operation within a plating job. +# +# Replaces mrp.workorder. Each step instantiates from a recipe +# operation node (recipe_node_id). Container nodes (recipe, +# sub_process) and step nodes (instructions) are NOT rows here — +# they live on the recipe template and are used at view-render time +# to display hierarchy. See spec §5.2 (Option A — operations only). +# +# State machine: +# pending → ready → in_progress → done +# ↓ ↓ ↑ +# skipped paused +# ↓ +# cancelled + +from odoo import _, api, fields, models +from odoo.exceptions import UserError + + +class FpJobStep(models.Model): + _name = 'fp.job.step' + _description = 'Plating Job Step' + _inherit = ['mail.thread'] + _order = 'job_id, sequence, id' + + job_id = fields.Many2one( + 'fp.job', + required=True, + ondelete='cascade', + index=True, + ) + name = fields.Char(required=True) + sequence = fields.Integer(default=10) + state = fields.Selection( + [ + ('pending', 'Pending'), + ('ready', 'Ready'), + ('in_progress', 'In Progress'), + ('paused', 'Paused'), + ('done', 'Done'), + ('skipped', 'Skipped'), + ('cancelled', 'Cancelled'), + ], + default='pending', + required=True, + tracking=True, + index=True, + ) + recipe_node_id = fields.Many2one( + 'fusion.plating.process.node', + string='Recipe Operation', + domain=[('node_type', '=', 'operation')], + ) + work_centre_id = fields.Many2one('fp.work.centre', index=True) + kind = fields.Selection( + [ + ('wet', 'Wet'), + ('bake', 'Bake'), + ('mask', 'Mask'), + ('rack', 'Rack'), + ('inspect', 'Inspect'), + ('other', 'Other'), + ], + default='other', + ) + assigned_user_id = fields.Many2one('res.users', tracking=True) + started_by_user_id = fields.Many2one('res.users', readonly=True) + finished_by_user_id = fields.Many2one('res.users', readonly=True) + date_started = fields.Datetime(readonly=True) + date_finished = fields.Datetime(readonly=True) + duration_expected = fields.Float(string='Expected Minutes') + duration_actual = fields.Float(string='Actual Minutes', readonly=True) + instructions = fields.Html(string='Step Instructions') + + def button_start(self): + for step in self: + if step.state not in ('ready', 'paused'): + raise UserError(_( + "Step '%s' is in state '%s' — only ready/paused steps can start." + ) % (step.name, step.state)) + step.state = 'in_progress' + if not step.date_started: + step.date_started = fields.Datetime.now() + step.started_by_user_id = self.env.user + return True + + def button_finish(self): + for step in self: + if step.state != 'in_progress': + raise UserError(_( + "Step '%s' is in state '%s' — only in-progress steps can finish." + ) % (step.name, step.state)) + step.state = 'done' + step.date_finished = fields.Datetime.now() + step.finished_by_user_id = self.env.user + return True diff --git a/fusion_plating/fusion_plating/security/ir.model.access.csv b/fusion_plating/fusion_plating/security/ir.model.access.csv index 4adae4dc..ed9d9e44 100644 --- a/fusion_plating/fusion_plating/security/ir.model.access.csv +++ b/fusion_plating/fusion_plating/security/ir.model.access.csv @@ -50,3 +50,6 @@ access_fp_work_centre_manager,fp.work.centre.manager,model_fp_work_centre,fusion access_fp_job_operator,fp.job.operator,model_fp_job,fusion_plating.group_fusion_plating_operator,1,1,0,0 access_fp_job_supervisor,fp.job.supervisor,model_fp_job,fusion_plating.group_fusion_plating_supervisor,1,1,1,0 access_fp_job_manager,fp.job.manager,model_fp_job,fusion_plating.group_fusion_plating_manager,1,1,1,1 +access_fp_job_step_operator,fp.job.step.operator,model_fp_job_step,fusion_plating.group_fusion_plating_operator,1,1,0,0 +access_fp_job_step_supervisor,fp.job.step.supervisor,model_fp_job_step,fusion_plating.group_fusion_plating_supervisor,1,1,1,0 +access_fp_job_step_manager,fp.job.step.manager,model_fp_job_step,fusion_plating.group_fusion_plating_manager,1,1,1,1 diff --git a/fusion_plating/fusion_plating/tests/__init__.py b/fusion_plating/fusion_plating/tests/__init__.py index b2a7f2e0..60b0d988 100644 --- a/fusion_plating/fusion_plating/tests/__init__.py +++ b/fusion_plating/fusion_plating/tests/__init__.py @@ -1,3 +1,4 @@ # -*- coding: utf-8 -*- from . import test_fp_work_centre from . import test_fp_job_state_machine +from . import test_fp_job_step_state_machine diff --git a/fusion_plating/fusion_plating/tests/test_fp_job_step_state_machine.py b/fusion_plating/fusion_plating/tests/test_fp_job_step_state_machine.py new file mode 100644 index 00000000..60ec2ac6 --- /dev/null +++ b/fusion_plating/fusion_plating/tests/test_fp_job_step_state_machine.py @@ -0,0 +1,73 @@ +# -*- coding: utf-8 -*- +from odoo.tests.common import TransactionCase +from odoo.exceptions import UserError + + +class TestFpJobStepStateMachine(TransactionCase): + def setUp(self): + super().setUp() + self.partner = self.env['res.partner'].create({'name': 'Cust'}) + self.product = self.env['product.product'].create({'name': 'Widget'}) + self.wc = self.env['fp.work.centre'].create({ + 'name': 'WC', 'code': 'WC', 'kind': 'wet_line', + }) + self.job = self.env['fp.job'].create({ + 'partner_id': self.partner.id, + 'product_id': self.product.id, + 'qty': 1.0, + }) + + def _make_step(self, **kw): + vals = { + 'job_id': self.job.id, + 'name': 'Plating Bath', + 'sequence': 10, + 'work_centre_id': self.wc.id, + } + vals.update(kw) + return self.env['fp.job.step'].create(vals) + + def test_step_starts_pending(self): + step = self._make_step() + self.assertEqual(step.state, 'pending') + + def test_button_start_requires_ready_or_paused(self): + step = self._make_step() + # state is 'pending' — should raise + with self.assertRaises(UserError): + step.button_start() + + def test_button_start_moves_ready_to_in_progress(self): + step = self._make_step() + step.state = 'ready' + step.button_start() + self.assertEqual(step.state, 'in_progress') + self.assertTrue(step.date_started) + self.assertEqual(step.started_by_user_id, self.env.user) + + def test_button_finish_requires_in_progress(self): + step = self._make_step() + with self.assertRaises(UserError): + step.button_finish() # state is pending + + def test_button_finish_moves_to_done(self): + step = self._make_step() + step.state = 'ready' + step.button_start() + step.button_finish() + self.assertEqual(step.state, 'done') + self.assertTrue(step.date_finished) + self.assertEqual(step.finished_by_user_id, self.env.user) + + def test_job_step_counts_update(self): + # Add 3 steps; finish 1; verify computed counts on job header. + s1 = self._make_step(name='Step 1', sequence=10) + s2 = self._make_step(name='Step 2', sequence=20) + s3 = self._make_step(name='Step 3', sequence=30) + self.assertEqual(self.job.step_count, 3) + self.assertEqual(self.job.step_done_count, 0) + s1.state = 'done' + # Force recompute + self.job.invalidate_recordset(['step_done_count', 'step_progress_pct']) + self.assertEqual(self.job.step_done_count, 1) + self.assertAlmostEqual(self.job.step_progress_pct, 33.33, places=1) From 688fe8317c1597ce9e1c2b36cc989425ec54599d Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Fri, 24 Apr 2026 22:09:16 -0400 Subject: [PATCH 10/61] refactor(jobs): address code review feedback on fp.job.step (Task 1.5) - I2: Add TODO comment block + stub button_pause/button_skip/ button_cancel that raise NotImplementedError. Makes the missing state-machine paths explicit instead of invisible gaps. Future Task 1.6 wires the real implementations; shop-floor buttons in Task 1.8 can already point to the right method names. - I3: button_finish now preserves first-finish audit timestamp via 'if not step.date_finished:' guard, mirroring button_start. Future rework flow that re-opens a step won't lose the original finish data. The duration_actual rollup landing in Task 1.7 will use timelog rows for the most-recent interval if needed. - I4: step_count and step_done_count are now store=True so list views and stat buttons (Task 1.8) don't recompute across all job rows on every render. step_progress_pct and current_step_id stay non-stored - they're cheap derivatives. Split compute methods so stored + non-stored fields don't share one method (Odoo flags the mix as inconsistent and recomputes stored fields whenever the non-stored one is read, defeating the perf gain). Manifest 19.0.8.4.0 -> 19.0.8.4.1. Part of: native job model migration (spec 2026-04-25) Co-Authored-By: Claude Opus 4.7 (1M context) --- fusion_plating/fusion_plating/__manifest__.py | 2 +- .../fusion_plating/models/fp_job.py | 15 +++++-- .../fusion_plating/models/fp_job_step.py | 42 ++++++++++++++++++- 3 files changed, 53 insertions(+), 6 deletions(-) diff --git a/fusion_plating/fusion_plating/__manifest__.py b/fusion_plating/fusion_plating/__manifest__.py index b5ccd317..af07c27e 100644 --- a/fusion_plating/fusion_plating/__manifest__.py +++ b/fusion_plating/fusion_plating/__manifest__.py @@ -5,7 +5,7 @@ { 'name': 'Fusion Plating', - 'version': '19.0.8.4.0', + 'version': '19.0.8.4.1', 'category': 'Manufacturing/Plating', 'summary': 'Core plating / metal finishing ERP: facilities, processes, tanks, baths, jobs, operators.', 'description': """ diff --git a/fusion_plating/fusion_plating/models/fp_job.py b/fusion_plating/fusion_plating/models/fp_job.py index 511aca90..8172c50d 100644 --- a/fusion_plating/fusion_plating/models/fp_job.py +++ b/fusion_plating/fusion_plating/models/fp_job.py @@ -186,9 +186,14 @@ class FpJob(models.Model): 'job_id', string='Steps', ) - step_count = fields.Integer(compute='_compute_step_counts') - step_done_count = fields.Integer(compute='_compute_step_counts') - step_progress_pct = fields.Float(compute='_compute_step_counts') + # step_count + step_done_count are stored (drive list views / stat + # buttons in Task 1.8). step_progress_pct stays non-stored — it's a + # cheap derivative. Odoo flags as inconsistent when stored and + # non-stored fields share a compute method, so they get distinct + # methods below. + step_count = fields.Integer(compute='_compute_step_counts', store=True) + step_done_count = fields.Integer(compute='_compute_step_counts', store=True) + step_progress_pct = fields.Float(compute='_compute_step_progress_pct') current_step_id = fields.Many2one( 'fp.job.step', compute='_compute_current_step', @@ -199,6 +204,10 @@ class FpJob(models.Model): for job in self: job.step_count = len(job.step_ids) job.step_done_count = len(job.step_ids.filtered(lambda s: s.state == 'done')) + + @api.depends('step_count', 'step_done_count') + def _compute_step_progress_pct(self): + for job in self: job.step_progress_pct = ( (job.step_done_count / job.step_count * 100.0) if job.step_count else 0.0 diff --git a/fusion_plating/fusion_plating/models/fp_job_step.py b/fusion_plating/fusion_plating/models/fp_job_step.py index 363b3d0d..6cca637f 100644 --- a/fusion_plating/fusion_plating/models/fp_job_step.py +++ b/fusion_plating/fusion_plating/models/fp_job_step.py @@ -76,6 +76,39 @@ class FpJobStep(models.Model): duration_actual = fields.Float(string='Actual Minutes', readonly=True) instructions = fields.Html(string='Step Instructions') + # ------------------------------------------------------------------ + # State machine — actions + # ------------------------------------------------------------------ + # Implemented: button_start (ready/paused → in_progress), + # button_finish (in_progress → done). + # Stubs (raise NotImplementedError for Task 1.6): + # button_pause (in_progress → paused) + # button_resume (covered by button_start when state='paused') + # button_skip (pending/ready → skipped) + # button_cancel (any non-done → cancelled) + # Predecessor-driven transition pending → ready will land in + # Task 1.6 along with first-step / dependency wiring. + # ------------------------------------------------------------------ + + def button_pause(self): + raise NotImplementedError(_( + "button_pause lands in Task 1.6 (operator pause / break / " + "end-of-shift). Use button_finish to complete a step or set " + "state directly via privileged code." + )) + + def button_skip(self): + raise NotImplementedError(_( + "button_skip lands in Task 1.6 (skip an opt-in step that " + "wasn't activated for this job)." + )) + + def button_cancel(self): + raise NotImplementedError(_( + "button_cancel lands in Task 1.6 (cancelling a single step; " + "cancelling the whole job runs through fp.job.action_cancel)." + )) + def button_start(self): for step in self: if step.state not in ('ready', 'paused'): @@ -95,6 +128,11 @@ class FpJobStep(models.Model): "Step '%s' is in state '%s' — only in-progress steps can finish." ) % (step.name, step.state)) step.state = 'done' - step.date_finished = fields.Datetime.now() - step.finished_by_user_id = self.env.user + # First-finish audit (mirrors button_start's first-start guard). + # If a future rework flow re-opens then re-finishes, the original + # finish timestamp/user is preserved. duration_actual rollups + # in Task 1.7 will use timelog rows for the latest interval. + if not step.date_finished: + step.date_finished = fields.Datetime.now() + step.finished_by_user_id = self.env.user return True From 91767f9f03bede26e6b2360b61993e907a1ab072 Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Fri, 24 Apr 2026 22:15:26 -0400 Subject: [PATCH 11/61] feat(jobs): add equipment, audit, plating-spec fields to fp.job.step MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Equipment: bath_id, tank_id, rack_id (all in core). oven_id deferred to a bridge module — fusion.plating.bake.oven lives in shopfloor and core can't depend on it. masking_material_id deferred too — model fusion.plating.masking.material does not yet exist anywhere; will be added when the masking model lands. Audit: signoff_user_id (readonly), facility_id (related from work_centre_id, stored). Plating spec: thickness_target, thickness_uom (um/mil/in), dwell_time_minutes, bake_setpoint_temp, bake_actual_duration, bake_chart_recorder_ref (Nadcap audit trail). Recipe-related: requires_signoff, auto_complete, is_manual, customer_visible (all related from recipe_node_id, stored, so operator sees current values without re-querying process.node). Cost rollup: cost_per_hour related from work_centre_id, cost_total computed (duration_actual / 60 x rate), currency_id related too. Full rollup-from-timelogs lands in Task 1.7. Tests cover: facility_id related-field, thickness_uom default, cost_total zero/non-zero paths. Manifest 19.0.8.4.1 -> 19.0.8.5.0. Part of: native job model migration (spec 2026-04-25) Co-Authored-By: Claude Opus 4.7 (1M context) --- fusion_plating/fusion_plating/__manifest__.py | 2 +- .../fusion_plating/models/fp_job_step.py | 77 +++++++++++++++++++ .../tests/test_fp_job_step_state_machine.py | 32 ++++++++ 3 files changed, 110 insertions(+), 1 deletion(-) diff --git a/fusion_plating/fusion_plating/__manifest__.py b/fusion_plating/fusion_plating/__manifest__.py index af07c27e..b5c25e37 100644 --- a/fusion_plating/fusion_plating/__manifest__.py +++ b/fusion_plating/fusion_plating/__manifest__.py @@ -5,7 +5,7 @@ { 'name': 'Fusion Plating', - 'version': '19.0.8.4.1', + 'version': '19.0.8.5.0', 'category': 'Manufacturing/Plating', 'summary': 'Core plating / metal finishing ERP: facilities, processes, tanks, baths, jobs, operators.', 'description': """ diff --git a/fusion_plating/fusion_plating/models/fp_job_step.py b/fusion_plating/fusion_plating/models/fp_job_step.py index 6cca637f..01f09211 100644 --- a/fusion_plating/fusion_plating/models/fp_job_step.py +++ b/fusion_plating/fusion_plating/models/fp_job_step.py @@ -76,6 +76,83 @@ class FpJobStep(models.Model): duration_actual = fields.Float(string='Actual Minutes', readonly=True) instructions = fields.Html(string='Step Instructions') + # ------------------------------------------------------------------ + # Equipment + audit (Task 1.6) + # oven_id is deferred to a bridge module — fusion.plating.bake.oven + # lives in fusion_plating_shopfloor and core can't depend on it. + # masking_material_id is deferred — fusion.plating.masking.material + # does not yet exist in any installed module; will be added when + # the masking model lands (likely in fusion_plating_process_en + # or a future fusion_plating_masking module). + # ------------------------------------------------------------------ + bath_id = fields.Many2one('fusion.plating.bath') + tank_id = fields.Many2one('fusion.plating.tank') + rack_id = fields.Many2one('fusion.plating.rack') + signoff_user_id = fields.Many2one('res.users', readonly=True) + facility_id = fields.Many2one( + 'fusion.plating.facility', + related='work_centre_id.facility_id', + store=True, + ) + + # ------------------------------------------------------------------ + # Plating spec (Task 1.6) + # ------------------------------------------------------------------ + thickness_target = fields.Float(string='Target Thickness') + thickness_uom = fields.Selection( + [('um', 'µm'), ('mil', 'mil'), ('inch', 'in')], + default='um', + ) + dwell_time_minutes = fields.Float() + bake_setpoint_temp = fields.Float(string='Bake Setpoint °C') + bake_actual_duration = fields.Float(string='Bake Actual Minutes') + bake_chart_recorder_ref = fields.Char(string='Bake Chart Recorder Ref') + + # ------------------------------------------------------------------ + # Recipe-related (Task 1.6) + # ------------------------------------------------------------------ + requires_signoff = fields.Boolean( + related='recipe_node_id.requires_signoff', + store=True, + ) + auto_complete = fields.Boolean( + related='recipe_node_id.auto_complete', + store=True, + ) + is_manual = fields.Boolean( + related='recipe_node_id.is_manual', + store=True, + ) + customer_visible = fields.Boolean( + related='recipe_node_id.customer_visible', + store=True, + ) + + # ------------------------------------------------------------------ + # Cost rollup (Task 1.6) + # cost_per_hour comes from fp.work.centre (Task 1.2 added it there). + # cost_total recomputes when duration_actual or rate changes — + # duration_actual will be sum of timelog rows once Task 1.7 lands. + # ------------------------------------------------------------------ + cost_per_hour = fields.Monetary( + related='work_centre_id.cost_per_hour', + currency_field='currency_id', + ) + cost_total = fields.Monetary( + compute='_compute_cost_total', + store=True, + currency_field='currency_id', + ) + currency_id = fields.Many2one( + 'res.currency', + related='work_centre_id.currency_id', + ) + + @api.depends('duration_actual', 'cost_per_hour') + def _compute_cost_total(self): + for step in self: + step.cost_total = (step.duration_actual / 60.0) * step.cost_per_hour + # ------------------------------------------------------------------ # State machine — actions # ------------------------------------------------------------------ diff --git a/fusion_plating/fusion_plating/tests/test_fp_job_step_state_machine.py b/fusion_plating/fusion_plating/tests/test_fp_job_step_state_machine.py index 60ec2ac6..3169641c 100644 --- a/fusion_plating/fusion_plating/tests/test_fp_job_step_state_machine.py +++ b/fusion_plating/fusion_plating/tests/test_fp_job_step_state_machine.py @@ -71,3 +71,35 @@ class TestFpJobStepStateMachine(TransactionCase): self.job.invalidate_recordset(['step_done_count', 'step_progress_pct']) self.assertEqual(self.job.step_done_count, 1) self.assertAlmostEqual(self.job.step_progress_pct, 33.33, places=1) + + def test_facility_id_related_from_work_centre(self): + # Work centre with a facility -> step inherits via related field. + facility = self.env['fusion.plating.facility'].create({ + 'name': 'Test Facility', + 'code': 'TFAC', + }) + wc = self.env['fp.work.centre'].create({ + 'name': 'WC2', 'code': 'WC2', 'kind': 'wet_line', + 'facility_id': facility.id, + }) + step = self._make_step(work_centre_id=wc.id) + self.assertEqual(step.facility_id, facility) + + def test_thickness_uom_default(self): + step = self._make_step() + self.assertEqual(step.thickness_uom, 'um') + + def test_cost_total_zero_when_no_duration(self): + step = self._make_step() + self.assertEqual(step.cost_total, 0.0) + + def test_cost_total_with_duration_and_rate(self): + wc = self.env['fp.work.centre'].create({ + 'name': 'WC3', 'code': 'WC3', 'kind': 'wet_line', + 'cost_per_hour': 60.0, # $1/min + }) + step = self._make_step(work_centre_id=wc.id) + # Force duration_actual since we don't have timelogs in 1.6 + step.duration_actual = 30.0 + # Recompute happens on read after a write to a depends field + self.assertEqual(step.cost_total, 30.0) From 57a3aea16f0425d29b697e9fe9e773d403b6a30c Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Fri, 24 Apr 2026 22:22:15 -0400 Subject: [PATCH 12/61] refactor(jobs): address code review feedback on fp.job.step (Task 1.6) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - I1: Replace 'Task 1.6' markers in stub method comments and NotImplementedError messages with forward-looking phrasing. Task 1.6 is what just shipped (the field expansion); the action stubs are deferred to an unspecified future task. Stale markers would have confused future readers/operators. - I2: Add test_cost_total_recomputes_when_rate_changes — insurance test that verifies @api.depends('cost_per_hour') triggers through the related-from-work_centre chain. Catches future Odoo upgrades that break related-depends. Manifest 19.0.8.5.0 → 19.0.8.5.1. Part of: native job model migration (spec 2026-04-25) Co-Authored-By: Claude Opus 4.7 (1M context) --- fusion_plating/fusion_plating/__manifest__.py | 2 +- .../fusion_plating/models/fp_job_step.py | 12 ++++++------ .../tests/test_fp_job_step_state_machine.py | 17 +++++++++++++++++ 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/fusion_plating/fusion_plating/__manifest__.py b/fusion_plating/fusion_plating/__manifest__.py index b5c25e37..15002879 100644 --- a/fusion_plating/fusion_plating/__manifest__.py +++ b/fusion_plating/fusion_plating/__manifest__.py @@ -5,7 +5,7 @@ { 'name': 'Fusion Plating', - 'version': '19.0.8.5.0', + 'version': '19.0.8.5.1', 'category': 'Manufacturing/Plating', 'summary': 'Core plating / metal finishing ERP: facilities, processes, tanks, baths, jobs, operators.', 'description': """ diff --git a/fusion_plating/fusion_plating/models/fp_job_step.py b/fusion_plating/fusion_plating/models/fp_job_step.py index 01f09211..dd7fbc34 100644 --- a/fusion_plating/fusion_plating/models/fp_job_step.py +++ b/fusion_plating/fusion_plating/models/fp_job_step.py @@ -158,31 +158,31 @@ class FpJobStep(models.Model): # ------------------------------------------------------------------ # Implemented: button_start (ready/paused → in_progress), # button_finish (in_progress → done). - # Stubs (raise NotImplementedError for Task 1.6): + # Stubs (raise NotImplementedError; wiring deferred): # button_pause (in_progress → paused) # button_resume (covered by button_start when state='paused') # button_skip (pending/ready → skipped) # button_cancel (any non-done → cancelled) - # Predecessor-driven transition pending → ready will land in - # Task 1.6 along with first-step / dependency wiring. + # Predecessor-driven transition pending → ready will be wired + # alongside first-step / dependency logic in a future task. # ------------------------------------------------------------------ def button_pause(self): raise NotImplementedError(_( - "button_pause lands in Task 1.6 (operator pause / break / " + "button_pause is not yet implemented (operator pause / break / " "end-of-shift). Use button_finish to complete a step or set " "state directly via privileged code." )) def button_skip(self): raise NotImplementedError(_( - "button_skip lands in Task 1.6 (skip an opt-in step that " + "button_skip is not yet implemented (skip an opt-in step that " "wasn't activated for this job)." )) def button_cancel(self): raise NotImplementedError(_( - "button_cancel lands in Task 1.6 (cancelling a single step; " + "button_cancel is not yet implemented (cancelling a single step; " "cancelling the whole job runs through fp.job.action_cancel)." )) diff --git a/fusion_plating/fusion_plating/tests/test_fp_job_step_state_machine.py b/fusion_plating/fusion_plating/tests/test_fp_job_step_state_machine.py index 3169641c..abea0953 100644 --- a/fusion_plating/fusion_plating/tests/test_fp_job_step_state_machine.py +++ b/fusion_plating/fusion_plating/tests/test_fp_job_step_state_machine.py @@ -103,3 +103,20 @@ class TestFpJobStepStateMachine(TransactionCase): step.duration_actual = 30.0 # Recompute happens on read after a write to a depends field self.assertEqual(step.cost_total, 30.0) + + def test_cost_total_recomputes_when_rate_changes(self): + # Insurance test: verify @api.depends('cost_per_hour') triggers + # through the related-from-work_centre chain. If a future Odoo + # upgrade breaks related-depends, this test catches it. + wc = self.env['fp.work.centre'].create({ + 'name': 'WC4', 'code': 'WC4', 'kind': 'wet_line', + 'cost_per_hour': 60.0, + }) + step = self._make_step(work_centre_id=wc.id) + step.duration_actual = 30.0 + self.assertEqual(step.cost_total, 30.0) + # Change the rate; cost_total should recompute. + wc.cost_per_hour = 120.0 + # Force recompute via invalidate (Odoo recomputes on next read). + step.invalidate_recordset(['cost_total']) + self.assertEqual(step.cost_total, 60.0) From 28892f56b596e46359568b064c7b8f465a708c19 Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Fri, 24 Apr 2026 22:27:26 -0400 Subject: [PATCH 13/61] feat(jobs): add fp.job.step.timelog for granular timer tracking Each button_start opens a fresh timelog row; button_finish closes the open row and recomputes step.duration_actual as the sum of all interval durations. Replicates Odoo MRP's mrp.workorder.time_ids granularity natively (no mrp dep). Schema: step_id (M2O cascade), user_id, date_started, date_finished, duration_minutes (computed, stored). ACLs: operator get create permission on timelogs because button_start creates them. Tests: test_start_creates_timelog (asserts the log row exists, date_finished is False, user_id is the current user) and test_finish_closes_timelog (asserts log gets date_finished, has a non-negative duration, and step.duration_actual matches). Manifest 19.0.8.5.1 -> 19.0.8.6.0. Part of: native job model migration (spec 2026-04-25) Co-Authored-By: Claude Opus 4.7 (1M context) --- fusion_plating/fusion_plating/__manifest__.py | 2 +- .../fusion_plating/models/__init__.py | 1 + .../fusion_plating/models/fp_job_step.py | 25 ++++++++--- .../models/fp_job_step_timelog.py | 42 +++++++++++++++++++ .../security/ir.model.access.csv | 2 + .../tests/test_fp_job_step_state_machine.py | 37 ++++++++++++++++ 6 files changed, 103 insertions(+), 6 deletions(-) create mode 100644 fusion_plating/fusion_plating/models/fp_job_step_timelog.py diff --git a/fusion_plating/fusion_plating/__manifest__.py b/fusion_plating/fusion_plating/__manifest__.py index 15002879..2ea63d25 100644 --- a/fusion_plating/fusion_plating/__manifest__.py +++ b/fusion_plating/fusion_plating/__manifest__.py @@ -5,7 +5,7 @@ { 'name': 'Fusion Plating', - 'version': '19.0.8.5.1', + 'version': '19.0.8.6.0', 'category': 'Manufacturing/Plating', 'summary': 'Core plating / metal finishing ERP: facilities, processes, tanks, baths, jobs, operators.', 'description': """ diff --git a/fusion_plating/fusion_plating/models/__init__.py b/fusion_plating/fusion_plating/models/__init__.py index 600187ab..7ce307c6 100644 --- a/fusion_plating/fusion_plating/models/__init__.py +++ b/fusion_plating/fusion_plating/models/__init__.py @@ -18,6 +18,7 @@ from . import fp_process_node from . import fp_rack from . import fp_job from . import fp_job_step +from . import fp_job_step_timelog from . import fp_operator_certification from . import fp_tz from . import res_company diff --git a/fusion_plating/fusion_plating/models/fp_job_step.py b/fusion_plating/fusion_plating/models/fp_job_step.py index dd7fbc34..cf999da2 100644 --- a/fusion_plating/fusion_plating/models/fp_job_step.py +++ b/fusion_plating/fusion_plating/models/fp_job_step.py @@ -75,6 +75,11 @@ class FpJobStep(models.Model): duration_expected = fields.Float(string='Expected Minutes') duration_actual = fields.Float(string='Actual Minutes', readonly=True) instructions = fields.Html(string='Step Instructions') + time_log_ids = fields.One2many( + 'fp.job.step.timelog', + 'step_id', + string='Time Logs', + ) # ------------------------------------------------------------------ # Equipment + audit (Task 1.6) @@ -193,9 +198,16 @@ class FpJobStep(models.Model): "Step '%s' is in state '%s' — only ready/paused steps can start." ) % (step.name, step.state)) step.state = 'in_progress' + # First-start audit (mirrors button_finish first-finish guard) if not step.date_started: step.date_started = fields.Datetime.now() step.started_by_user_id = self.env.user + # Open a fresh timelog row for this start interval + self.env['fp.job.step.timelog'].create({ + 'step_id': step.id, + 'user_id': self.env.user.id, + 'date_started': fields.Datetime.now(), + }) return True def button_finish(self): @@ -204,12 +216,15 @@ class FpJobStep(models.Model): raise UserError(_( "Step '%s' is in state '%s' — only in-progress steps can finish." ) % (step.name, step.state)) + now = fields.Datetime.now() + # Close the open timelog (the one with no date_finished) + open_log = step.time_log_ids.filtered(lambda l: not l.date_finished) + open_log.write({'date_finished': now}) step.state = 'done' - # First-finish audit (mirrors button_start's first-start guard). - # If a future rework flow re-opens then re-finishes, the original - # finish timestamp/user is preserved. duration_actual rollups - # in Task 1.7 will use timelog rows for the latest interval. + # First-finish audit (mirrors button_start first-start guard) if not step.date_finished: - step.date_finished = fields.Datetime.now() + step.date_finished = now step.finished_by_user_id = self.env.user + # Sum of all interval durations becomes duration_actual + step.duration_actual = sum(step.time_log_ids.mapped('duration_minutes')) return True diff --git a/fusion_plating/fusion_plating/models/fp_job_step_timelog.py b/fusion_plating/fusion_plating/models/fp_job_step_timelog.py new file mode 100644 index 00000000..978fd80b --- /dev/null +++ b/fusion_plating/fusion_plating/models/fp_job_step_timelog.py @@ -0,0 +1,42 @@ +# -*- coding: utf-8 -*- +# Copyright 2026 Nexa Systems Inc. +# License OPL-1 (Odoo Proprietary License v1.0) +# +# fp.job.step.timelog — granular start/stop intervals for a step. +# +# Each step.button_start() opens a fresh timelog row. Each +# step.button_finish() (or button_pause once added) closes the open +# row. duration_actual on fp.job.step is the sum of these intervals. +# +# Replicates Odoo MRP's mrp.workorder.time_ids granularity natively +# (without depending on the mrp module). + +from odoo import api, fields, models + + +class FpJobStepTimeLog(models.Model): + _name = 'fp.job.step.timelog' + _description = 'Plating Job Step Time Log' + _order = 'date_started desc' + + step_id = fields.Many2one( + 'fp.job.step', + required=True, + ondelete='cascade', + index=True, + ) + user_id = fields.Many2one('res.users', required=True) + date_started = fields.Datetime(required=True) + date_finished = fields.Datetime() + duration_minutes = fields.Float( + compute='_compute_duration', store=True, + ) + + @api.depends('date_started', 'date_finished') + def _compute_duration(self): + for log in self: + if log.date_started and log.date_finished: + delta = log.date_finished - log.date_started + log.duration_minutes = delta.total_seconds() / 60.0 + else: + log.duration_minutes = 0.0 diff --git a/fusion_plating/fusion_plating/security/ir.model.access.csv b/fusion_plating/fusion_plating/security/ir.model.access.csv index ed9d9e44..3f165844 100644 --- a/fusion_plating/fusion_plating/security/ir.model.access.csv +++ b/fusion_plating/fusion_plating/security/ir.model.access.csv @@ -53,3 +53,5 @@ access_fp_job_manager,fp.job.manager,model_fp_job,fusion_plating.group_fusion_pl access_fp_job_step_operator,fp.job.step.operator,model_fp_job_step,fusion_plating.group_fusion_plating_operator,1,1,0,0 access_fp_job_step_supervisor,fp.job.step.supervisor,model_fp_job_step,fusion_plating.group_fusion_plating_supervisor,1,1,1,0 access_fp_job_step_manager,fp.job.step.manager,model_fp_job_step,fusion_plating.group_fusion_plating_manager,1,1,1,1 +access_fp_job_step_timelog_operator,fp.job.step.timelog.operator,model_fp_job_step_timelog,fusion_plating.group_fusion_plating_operator,1,1,1,0 +access_fp_job_step_timelog_manager,fp.job.step.timelog.manager,model_fp_job_step_timelog,fusion_plating.group_fusion_plating_manager,1,1,1,1 diff --git a/fusion_plating/fusion_plating/tests/test_fp_job_step_state_machine.py b/fusion_plating/fusion_plating/tests/test_fp_job_step_state_machine.py index abea0953..62ba96ef 100644 --- a/fusion_plating/fusion_plating/tests/test_fp_job_step_state_machine.py +++ b/fusion_plating/fusion_plating/tests/test_fp_job_step_state_machine.py @@ -120,3 +120,40 @@ class TestFpJobStepStateMachine(TransactionCase): # Force recompute via invalidate (Odoo recomputes on next read). step.invalidate_recordset(['cost_total']) self.assertEqual(step.cost_total, 60.0) + + +class TestFpJobStepTimeLog(TransactionCase): + def setUp(self): + super().setUp() + self.partner = self.env['res.partner'].create({'name': 'Cust'}) + self.product = self.env['product.product'].create({'name': 'Widget'}) + self.wc = self.env['fp.work.centre'].create({ + 'name': 'WC', 'code': 'WC', 'kind': 'wet_line', + }) + self.job = self.env['fp.job'].create({ + 'partner_id': self.partner.id, + 'product_id': self.product.id, + 'qty': 1.0, + }) + self.step = self.env['fp.job.step'].create({ + 'job_id': self.job.id, + 'name': 'S', + 'sequence': 10, + 'work_centre_id': self.wc.id, + 'state': 'ready', + }) + + def test_start_creates_timelog(self): + self.step.button_start() + self.assertEqual(len(self.step.time_log_ids), 1) + self.assertFalse(self.step.time_log_ids[0].date_finished) + self.assertEqual(self.step.time_log_ids[0].user_id, self.env.user) + + def test_finish_closes_timelog(self): + self.step.button_start() + self.step.button_finish() + log = self.step.time_log_ids[0] + self.assertTrue(log.date_finished) + self.assertGreaterEqual(log.duration_minutes, 0.0) + # duration_actual on the step should match the sum of timelog durations + self.assertEqual(self.step.duration_actual, log.duration_minutes) From 54068b3d1877235fc20235ebc7f56936a443eb61 Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Fri, 24 Apr 2026 22:34:10 -0400 Subject: [PATCH 14/61] refactor(jobs): address code review feedback on fp.job.step.timelog (Task 1.7) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - I1: Add supervisor ACL row on fp.job.step.timelog. The other job-related models all have a 3-tier (operator/supervisor/ manager) pattern; timelog had been operator+manager only with no comment explaining why. Adding the supervisor row for consistency — supervisors can write timelogs the same as operators. - I2: Capture fields.Datetime.now() once in button_start and reuse for both the step's first-start audit timestamp and the new timelog's date_started. Mirrors button_finish's pattern. Eliminates microsecond drift between two related timestamps. - M6: Update stale comment in fp_job_step.py that said 'duration_actual will be sum of timelog rows once Task 1.7 lands' — Task 1.7 has landed; replace with current behaviour. Manifest 19.0.8.6.0 → 19.0.8.6.1. Part of: native job model migration (spec 2026-04-25) Co-Authored-By: Claude Opus 4.7 (1M context) --- fusion_plating/fusion_plating/__manifest__.py | 2 +- .../fusion_plating/models/fp_job_step.py | 14 +++++++++----- .../fusion_plating/security/ir.model.access.csv | 1 + 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/fusion_plating/fusion_plating/__manifest__.py b/fusion_plating/fusion_plating/__manifest__.py index 2ea63d25..2bf973ae 100644 --- a/fusion_plating/fusion_plating/__manifest__.py +++ b/fusion_plating/fusion_plating/__manifest__.py @@ -5,7 +5,7 @@ { 'name': 'Fusion Plating', - 'version': '19.0.8.6.0', + 'version': '19.0.8.6.1', 'category': 'Manufacturing/Plating', 'summary': 'Core plating / metal finishing ERP: facilities, processes, tanks, baths, jobs, operators.', 'description': """ diff --git a/fusion_plating/fusion_plating/models/fp_job_step.py b/fusion_plating/fusion_plating/models/fp_job_step.py index cf999da2..33730f48 100644 --- a/fusion_plating/fusion_plating/models/fp_job_step.py +++ b/fusion_plating/fusion_plating/models/fp_job_step.py @@ -136,8 +136,9 @@ class FpJobStep(models.Model): # ------------------------------------------------------------------ # Cost rollup (Task 1.6) # cost_per_hour comes from fp.work.centre (Task 1.2 added it there). - # cost_total recomputes when duration_actual or rate changes — - # duration_actual will be sum of timelog rows once Task 1.7 lands. + # cost_total recomputes when duration_actual or rate changes. + # duration_actual is set by button_finish as the sum of timelog + # row durations (see fp.job.step.timelog). # ------------------------------------------------------------------ cost_per_hour = fields.Monetary( related='work_centre_id.cost_per_hour', @@ -197,16 +198,19 @@ class FpJobStep(models.Model): raise UserError(_( "Step '%s' is in state '%s' — only ready/paused steps can start." ) % (step.name, step.state)) + now = fields.Datetime.now() step.state = 'in_progress' # First-start audit (mirrors button_finish first-finish guard) if not step.date_started: - step.date_started = fields.Datetime.now() + step.date_started = now step.started_by_user_id = self.env.user - # Open a fresh timelog row for this start interval + # Open a fresh timelog row for this start interval — uses the + # same `now` as the first-start stamp so the step and its + # first log share a single instant. self.env['fp.job.step.timelog'].create({ 'step_id': step.id, 'user_id': self.env.user.id, - 'date_started': fields.Datetime.now(), + 'date_started': now, }) return True diff --git a/fusion_plating/fusion_plating/security/ir.model.access.csv b/fusion_plating/fusion_plating/security/ir.model.access.csv index 3f165844..39042737 100644 --- a/fusion_plating/fusion_plating/security/ir.model.access.csv +++ b/fusion_plating/fusion_plating/security/ir.model.access.csv @@ -54,4 +54,5 @@ access_fp_job_step_operator,fp.job.step.operator,model_fp_job_step,fusion_platin access_fp_job_step_supervisor,fp.job.step.supervisor,model_fp_job_step,fusion_plating.group_fusion_plating_supervisor,1,1,1,0 access_fp_job_step_manager,fp.job.step.manager,model_fp_job_step,fusion_plating.group_fusion_plating_manager,1,1,1,1 access_fp_job_step_timelog_operator,fp.job.step.timelog.operator,model_fp_job_step_timelog,fusion_plating.group_fusion_plating_operator,1,1,1,0 +access_fp_job_step_timelog_supervisor,fp.job.step.timelog.supervisor,model_fp_job_step_timelog,fusion_plating.group_fusion_plating_supervisor,1,1,1,0 access_fp_job_step_timelog_manager,fp.job.step.timelog.manager,model_fp_job_step_timelog,fusion_plating.group_fusion_plating_manager,1,1,1,1 From b2ae79b61f83b6ecdcefce154681f44bb69a5f8d Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Fri, 24 Apr 2026 22:38:36 -0400 Subject: [PATCH 15/61] feat(jobs): add admin views and menu for Phase 1 models MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Manager-only views during Phase 1 — operator UI rebuilt in Phase 6. Top-level menu 'Plating Jobs (new)' (seq=47) groups the three new act_window actions (Jobs, Steps Admin, Work Centres) so the foundational models can be exercised through the UI without touching the operator-facing menus that still serve mrp.production and mrp.workorder. Job form has Steps/Source/Costs notebook tabs. Step form has Equipment/Plating Spec/Audit/Instructions tabs (Audit shows the time log rows from Task 1.7). Search filters by state, priority, partner, facility. Manifest 19.0.8.6.1 → 19.0.8.7.0. Part of: native job model migration (spec 2026-04-25) Co-Authored-By: Claude Opus 4.7 (1M context) --- fusion_plating/fusion_plating/__manifest__.py | 6 +- .../views/fp_job_step_views.xml | 88 +++++++++++++ .../fusion_plating/views/fp_job_views.xml | 124 ++++++++++++++++++ .../fusion_plating/views/fp_jobs_menu.xml | 28 ++++ .../views/fp_work_centre_views.xml | 50 +++++++ 5 files changed, 295 insertions(+), 1 deletion(-) create mode 100644 fusion_plating/fusion_plating/views/fp_job_step_views.xml create mode 100644 fusion_plating/fusion_plating/views/fp_job_views.xml create mode 100644 fusion_plating/fusion_plating/views/fp_jobs_menu.xml create mode 100644 fusion_plating/fusion_plating/views/fp_work_centre_views.xml diff --git a/fusion_plating/fusion_plating/__manifest__.py b/fusion_plating/fusion_plating/__manifest__.py index 2bf973ae..0307e5cc 100644 --- a/fusion_plating/fusion_plating/__manifest__.py +++ b/fusion_plating/fusion_plating/__manifest__.py @@ -5,7 +5,7 @@ { 'name': 'Fusion Plating', - 'version': '19.0.8.6.1', + 'version': '19.0.8.7.0', 'category': 'Manufacturing/Plating', 'summary': 'Core plating / metal finishing ERP: facilities, processes, tanks, baths, jobs, operators.', 'description': """ @@ -96,6 +96,10 @@ Copyright (c) 2026 Nexa Systems Inc. All rights reserved. 'views/fp_operator_certification_views.xml', 'views/res_config_settings_views.xml', 'views/fp_menu.xml', + 'views/fp_work_centre_views.xml', + 'views/fp_job_views.xml', + 'views/fp_job_step_views.xml', + 'views/fp_jobs_menu.xml', 'data/fp_recipe_enp_alum_basic.xml', 'data/fp_recipe_enp_steel_basic.xml', 'data/fp_recipe_enp_sp.xml', diff --git a/fusion_plating/fusion_plating/views/fp_job_step_views.xml b/fusion_plating/fusion_plating/views/fp_job_step_views.xml new file mode 100644 index 00000000..fac949f9 --- /dev/null +++ b/fusion_plating/fusion_plating/views/fp_job_step_views.xml @@ -0,0 +1,88 @@ + + + + fp.job.step.form + fp.job.step + +
+
+
+ +
+

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + Job Steps + fp.job.step + list,form + + diff --git a/fusion_plating/fusion_plating/views/fp_job_views.xml b/fusion_plating/fusion_plating/views/fp_job_views.xml new file mode 100644 index 00000000..9697bf95 --- /dev/null +++ b/fusion_plating/fusion_plating/views/fp_job_views.xml @@ -0,0 +1,124 @@ + + + + fp.job.list + fp.job + + + + + + + + + + + + + + + fp.job.form + fp.job + +
+
+
+ +
+

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + fp.job.search + fp.job + + + + + + + + + + + + + + + + + + + + + + Plating Jobs + fp.job + list,form + + + diff --git a/fusion_plating/fusion_plating/views/fp_jobs_menu.xml b/fusion_plating/fusion_plating/views/fp_jobs_menu.xml new file mode 100644 index 00000000..163cad60 --- /dev/null +++ b/fusion_plating/fusion_plating/views/fp_jobs_menu.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + diff --git a/fusion_plating/fusion_plating/views/fp_work_centre_views.xml b/fusion_plating/fusion_plating/views/fp_work_centre_views.xml new file mode 100644 index 00000000..e9d23884 --- /dev/null +++ b/fusion_plating/fusion_plating/views/fp_work_centre_views.xml @@ -0,0 +1,50 @@ + + + + fp.work.centre.list + fp.work.centre + + + + + + + + + + + + + + + fp.work.centre.form + fp.work.centre + +
+ + + + + + + + + + + + + + + + + +
+ + + + + Work Centres + fp.work.centre + list,form + + From 1491f2367b39fea1b327006b8a25217d7fd0b0cb Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Fri, 24 Apr 2026 22:44:16 -0400 Subject: [PATCH 16/61] refactor(jobs): address code review feedback on Task 1.8 admin views - I1: Lock time_log_ids list inside step Audit tab to read-only (no create/edit/delete on the nested list). Audit timelog rows are produced exclusively by button_start / button_finish; if a manager could hand-edit them, cost_total rollups would silently drift. - I2: Add explicit list view (decoration on state) and search view (filters by state/kind, group_by state/work_centre/job) for fp.job.step. The Steps (Admin) menu was using Odoo's default auto-list with no filter, which would be unusable after a few weeks of step accumulation. Action now references the search view explicitly. Manifest 19.0.8.7.0 -> 19.0.8.7.1. Part of: native job model migration (spec 2026-04-25) Co-Authored-By: Claude Opus 4.7 (1M context) --- fusion_plating/fusion_plating/__manifest__.py | 2 +- .../views/fp_job_step_views.xml | 51 ++++++++++++++++++- 2 files changed, 50 insertions(+), 3 deletions(-) diff --git a/fusion_plating/fusion_plating/__manifest__.py b/fusion_plating/fusion_plating/__manifest__.py index 0307e5cc..7cddbac7 100644 --- a/fusion_plating/fusion_plating/__manifest__.py +++ b/fusion_plating/fusion_plating/__manifest__.py @@ -5,7 +5,7 @@ { 'name': 'Fusion Plating', - 'version': '19.0.8.7.0', + 'version': '19.0.8.7.1', 'category': 'Manufacturing/Plating', 'summary': 'Core plating / metal finishing ERP: facilities, processes, tanks, baths, jobs, operators.', 'description': """ diff --git a/fusion_plating/fusion_plating/views/fp_job_step_views.xml b/fusion_plating/fusion_plating/views/fp_job_step_views.xml index fac949f9..d462167e 100644 --- a/fusion_plating/fusion_plating/views/fp_job_step_views.xml +++ b/fusion_plating/fusion_plating/views/fp_job_step_views.xml @@ -1,5 +1,51 @@ + + fp.job.step.list + fp.job.step + + + + + + + + + + + + + + + + fp.job.step.search + fp.job.step + + + + + + + + + + + + + + + + + + + + + + + + fp.job.step.form fp.job.step @@ -61,8 +107,8 @@ - - + + @@ -84,5 +130,6 @@ Job Steps fp.job.step list,form + From d1aa7a81e0a73fb7812589ccbed76109f52b6541 Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Fri, 24 Apr 2026 22:49:34 -0400 Subject: [PATCH 17/61] =?UTF-8?q?docs(jobs):=20detail=20Phase=202=20task?= =?UTF-8?q?=20breakdown=20=E2=80=94=20parallel=20module=20strategy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Phase 2 was previously outlined as 'rename bridge_mrp → jobs'. That's destructive on entech. Revised strategy: build fusion_plating_jobs IN PARALLEL with bridge_mrp. A settings flag (x_fc_use_native_jobs) controls which path SO confirm takes. Default False = legacy MO flow stays. Cutover (Phase 9) flips the flag. Phase 2 breakdown into 11 tasks (2.1–2.11), totaling ~5 days engineering. All preserve bridge_mrp untouched until cutover. Co-Authored-By: Claude Opus 4.7 (1M context) --- .../plans/2026-04-25-fp-native-job-model.md | 56 +++++++++++++++---- 1 file changed, 46 insertions(+), 10 deletions(-) diff --git a/fusion_plating/docs/superpowers/plans/2026-04-25-fp-native-job-model.md b/fusion_plating/docs/superpowers/plans/2026-04-25-fp-native-job-model.md index 257a1d99..2d2bc036 100644 --- a/fusion_plating/docs/superpowers/plans/2026-04-25-fp-native-job-model.md +++ b/fusion_plating/docs/superpowers/plans/2026-04-25-fp-native-job-model.md @@ -1642,19 +1642,55 @@ If any item fails, stop. Don't start Phase 2 with a broken foundation. --- -## Phase 2 (outline only — detail before starting) +## Phase 2 (detailed 2026-04-25 after Phase 1 landed) -**Goal:** Move SO→MO bridge logic and recipe→WO generator to native job model. Strip MRP coupling from `fusion_plating_bridge_mrp`; rename to `fusion_plating_jobs`. +**Goal:** Build `fusion_plating_jobs` alongside `fusion_plating_bridge_mrp`. The +new module routes SO confirm → `fp.job`, runs the recipe → `fp.job.step` generator, +auto-creates portal jobs / deliveries / certs against the native models, and adds +the 6 cross-module fields deferred from Phase 1. -Key tasks (detail before starting): -- Module rename + manifest cleanup -- `_fp_auto_create_job` on `sale.order.action_confirm` -- `fp.job._generate_steps_from_recipe` (port logic from `_generate_workorders_from_recipe`) -- Migrate every `x_fc_*` field on `mrp.production` and `mrp.workorder` to native fields on `fp.job` / `fp.job.step` -- Quality check, racking inspection, cert generator, delivery hooks rebound to job events -- Drop `sale_mrp` from `__manifest__.py` depends +**Strategy revision (vs. original plan):** original said "rename bridge_mrp → jobs." +Renaming is destructive on entech (a live system). Instead, **build the new module +in parallel**: -Estimated: 5 days. +- `fusion_plating_bridge_mrp` STAYS installed and primary. Operators keep using + the existing MO-based flow. No regression risk. +- `fusion_plating_jobs` is NEW. It creates `fp.job` records on SO confirm only + when a settings flag (`x_fc_use_native_jobs`) is True. Default: False. +- Both modules can be installed simultaneously without conflict. +- Phase 9 cutover flips the flag for entech, deprecating bridge_mrp's MO creation. +- Phase 10 burn-in keeps bridge_mrp installed read-only as a safety net. +- Eventual deprecation of bridge_mrp = future task, not blocked by this work. + +Branch strategy: same `feat/fp-native-job-model` branch. + +### Task breakdown + +| # | Task | Detail | Effort | +|---|---|---|---| +| 2.1 | Create `fusion_plating_jobs` skeleton | New module dir, manifest with all needed depends (fusion_plating + configurator + portal + logistics + quality + certificates), empty `models/__init__.py`, security ACL stub. Verify clean install on entech. | 0.5d | +| 2.2 | Add cross-module fields to `fp.job` via `_inherit` | The 6 deferred fields (part_catalog_id, coating_config_id, customer_spec_id, portal_job_id, delivery_id, qc_check_id) added in jobs module. Tests. | 0.5d | +| 2.3 | Port `fusion.plating.job.node.override` to jobs module | Move from bridge_mrp; rebind from `mrp.production` to `fp.job`. Keep the bridge_mrp version of this model alive on `mrp.production` for now (parallel). Tests. | 0.5d | +| 2.4 | Recipe → steps generator on `fp.job` | Port `_generate_workorders_from_recipe` from bridge_mrp into a new `fp.job._generate_steps_from_recipe` method. Walks recipe, creates `fp.job.step`. Tests. | 1d | +| 2.5 | Add settings flag `x_fc_use_native_jobs` + SO confirm hook | New flag on res.config.settings (default False). When True, `sale.order.action_confirm` creates `fp.job` instead of `mrp.production`. Tests cover both flag values. | 0.5d | +| 2.6 | Portal job binding from `fp.job` | `fusion.plating.portal.job` gains `x_fc_job_id` Many2one. Auto-create portal job on `fp.job.action_confirm`. Tests. | 0.25d | +| 2.7 | Quality check auto-create | When customer has `x_fc_requires_qc=True`, fp.job.action_confirm spawns a `fusion.plating.quality.check` linked to the job. Tests. | 0.25d | +| 2.8 | Delivery + cert auto-create on done | `fp.job.button_mark_done` creates `fusion.plating.delivery` (draft) and triggers cert generator (CoC + thickness report) like bridge_mrp does for MO done. Tests. | 0.5d | +| 2.9 | Account.move (invoice) hook | When invoice posts, find the linked `fp.job` (via SO origin), update portal_job state to 'complete' and stamp invoice_ref. Mirrors bridge_mrp. Tests. | 0.25d | +| 2.10 | Drop `sale_mrp` from jobs module's depends | Verify zero remaining `sale_mrp`-dependent code paths in jobs. Note: bridge_mrp keeps its sale_mrp dep until cutover. | 0.25d | +| 2.11 | Tag `phase-2-complete` + demo checklist | Full test run, push, tag, demo path on entech with the flag flipped on a test SO. | 0.25d | + +**Total: ~5 days engineering, plus review cycles.** + +### Demo target after Phase 2 + +A manager on entech can: +1. Open a fresh sale.order, add a plating line. +2. Toggle `x_fc_use_native_jobs=True` in settings (or per-SO override). +3. Confirm the SO → instead of MO appearing, a `WH/JOB/00001` lands in the new menu. +4. Recipe steps auto-generate as `fp.job.step` rows. +5. Operator (still in old UI for now) doesn't see the fp.job — but a manager can drive it through the admin views. +6. Toggle off the flag → next SO confirm goes back to MO. Bridge_mrp untouched. --- From 4341a038911c04366b52ecba3ff3742459a21506 Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Fri, 24 Apr 2026 22:55:04 -0400 Subject: [PATCH 18/61] feat(jobs): add fusion_plating_jobs module skeleton (Phase 2 Task 2.1) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Empty module that will host the native job bridge during Phase 2 of the migration. Coexists with fusion_plating_bridge_mrp during the migration period — both can be installed simultaneously without conflict. Depends on: - fusion_plating (fp.job, fp.job.step, fp.work.centre from Phase 1) - fusion_plating_configurator (fp.part.catalog, fp.coating.config) - fusion_plating_portal (fusion.plating.portal.job) - fusion_plating_logistics (fusion.plating.delivery) - fusion_plating_quality (fusion.plating.customer.spec) - fusion_plating_certificates (fp.certificate) These deps are why these fields couldn't live in fusion_plating core (would invert the dep graph). All cross-module fields on fp.job and fp.job.step land here via _inherit in subsequent tasks. auto_install=False — opt-in only. Part of: native job model migration (spec 2026-04-25) Co-Authored-By: Claude Opus 4.7 (1M context) --- .../fusion_plating_jobs/__init__.py | 2 + .../fusion_plating_jobs/__manifest__.py | 40 +++++++++++++++++++ .../fusion_plating_jobs/models/__init__.py | 6 +++ .../security/ir.model.access.csv | 1 + 4 files changed, 49 insertions(+) create mode 100644 fusion_plating/fusion_plating_jobs/__init__.py create mode 100644 fusion_plating/fusion_plating_jobs/__manifest__.py create mode 100644 fusion_plating/fusion_plating_jobs/models/__init__.py create mode 100644 fusion_plating/fusion_plating_jobs/security/ir.model.access.csv diff --git a/fusion_plating/fusion_plating_jobs/__init__.py b/fusion_plating/fusion_plating_jobs/__init__.py new file mode 100644 index 00000000..a0fdc10f --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +from . import models diff --git a/fusion_plating/fusion_plating_jobs/__manifest__.py b/fusion_plating/fusion_plating_jobs/__manifest__.py new file mode 100644 index 00000000..f20d9fdd --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/__manifest__.py @@ -0,0 +1,40 @@ +# -*- coding: utf-8 -*- +# Copyright 2026 Nexa Systems Inc. +# License OPL-1 (Odoo Proprietary License v1.0) +{ + 'name': 'Fusion Plating — Native Jobs', + 'version': '19.0.1.0.0', + 'category': 'Manufacturing/Plating', + 'summary': 'Native plating job model — replaces mrp.production / mrp.workorder bridge.', + 'description': """ +Native Plating Job Bridge +========================= + +Bridges fp.job and fp.job.step (defined in fusion_plating core, Phase 1 of +the migration spec dated 2026-04-25) to the rest of the Fusion Plating +module family — configurator, portal, logistics, quality, certificates. + +Coexists with fusion_plating_bridge_mrp during the migration period. +Activate native jobs via the x_fc_use_native_jobs settings flag (default: +False). When False, SO confirm continues to create mrp.production records +through bridge_mrp. When True, SO confirm creates fp.job records here. + +See docs/superpowers/specs/2026-04-25-fp-native-job-model-design.md for +full design rationale and §6.2 of the implementation plan for task list. +""", + 'depends': [ + 'fusion_plating', # fp.job, fp.job.step, fp.work.centre + 'fusion_plating_configurator', # fp.part.catalog, fp.coating.config + 'fusion_plating_portal', # fusion.plating.portal.job + 'fusion_plating_logistics', # fusion.plating.delivery + 'fusion_plating_quality', # fusion.plating.customer.spec, fp.quality.hold + 'fusion_plating_certificates', # fp.certificate + ], + 'data': [ + 'security/ir.model.access.csv', + ], + 'installable': True, + 'application': False, + 'auto_install': False, + 'license': 'OPL-1', +} diff --git a/fusion_plating/fusion_plating_jobs/models/__init__.py b/fusion_plating/fusion_plating_jobs/models/__init__.py new file mode 100644 index 00000000..010731a6 --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/models/__init__.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +# Copyright 2026 Nexa Systems Inc. +# License OPL-1 (Odoo Proprietary License v1.0) +# +# Phase 2 of the native plating job model migration. Models are added +# task-by-task in Tasks 2.2 onwards. This file imports them as they land. diff --git a/fusion_plating/fusion_plating_jobs/security/ir.model.access.csv b/fusion_plating/fusion_plating_jobs/security/ir.model.access.csv new file mode 100644 index 00000000..97dd8b91 --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/security/ir.model.access.csv @@ -0,0 +1 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink From 6e57b3576c7ddf8a5884fc8bf6d62d6bd7d48b4f Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Fri, 24 Apr 2026 23:01:23 -0400 Subject: [PATCH 19/61] feat(jobs): add cross-module fields to fp.job via _inherit (Task 2.2) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 5 of the 6 deferred fields from Phase 1 Task 1.4 land here in fusion_plating_jobs: - part_catalog_id (fp.part.catalog from configurator) - coating_config_id (fp.coating.config from configurator) - customer_spec_id (fusion.plating.customer.spec from quality) - portal_job_id (fusion.plating.portal.job from portal) - delivery_id (fusion.plating.delivery from logistics) qc_check_id deferred to Task 2.7 — its target model (fusion.plating.quality.check) still lives in fusion_plating_bridge_mrp and we don't depend on bridge_mrp from this module. Task 2.7 will address QC sourcing. 6 unit tests (5 field-presence + 1 integration creating linked records). Manifest 19.0.1.0.0 → 19.0.1.1.0. Part of: native job model migration (spec 2026-04-25) Co-Authored-By: Claude Opus 4.7 (1M context) --- .../fusion_plating_jobs/__manifest__.py | 2 +- .../fusion_plating_jobs/models/__init__.py | 4 +- .../fusion_plating_jobs/models/fp_job.py | 39 +++++++ .../fusion_plating_jobs/tests/__init__.py | 2 + .../tests/test_fp_job_extensions.py | 100 ++++++++++++++++++ 5 files changed, 145 insertions(+), 2 deletions(-) create mode 100644 fusion_plating/fusion_plating_jobs/models/fp_job.py create mode 100644 fusion_plating/fusion_plating_jobs/tests/__init__.py create mode 100644 fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py diff --git a/fusion_plating/fusion_plating_jobs/__manifest__.py b/fusion_plating/fusion_plating_jobs/__manifest__.py index f20d9fdd..be3276f2 100644 --- a/fusion_plating/fusion_plating_jobs/__manifest__.py +++ b/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.1.0.0', + 'version': '19.0.1.1.0', 'category': 'Manufacturing/Plating', 'summary': 'Native plating job model — replaces mrp.production / mrp.workorder bridge.', 'description': """ diff --git a/fusion_plating/fusion_plating_jobs/models/__init__.py b/fusion_plating/fusion_plating_jobs/models/__init__.py index 010731a6..a81477b7 100644 --- a/fusion_plating/fusion_plating_jobs/models/__init__.py +++ b/fusion_plating/fusion_plating_jobs/models/__init__.py @@ -3,4 +3,6 @@ # License OPL-1 (Odoo Proprietary License v1.0) # # Phase 2 of the native plating job model migration. Models are added -# task-by-task in Tasks 2.2 onwards. This file imports them as they land. +# task-by-task in Tasks 2.2 onwards. + +from . import fp_job diff --git a/fusion_plating/fusion_plating_jobs/models/fp_job.py b/fusion_plating/fusion_plating_jobs/models/fp_job.py new file mode 100644 index 00000000..9e63e85e --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/models/fp_job.py @@ -0,0 +1,39 @@ +# -*- coding: utf-8 -*- +# Copyright 2026 Nexa Systems Inc. +# License OPL-1 (Odoo Proprietary License v1.0) +# +# fp.job extension — cross-module fields that couldn't live in core +# because their target models are in dependent modules. Per spec §5.1 +# this module is the umbrella that re-bundles the cross-module +# extensions for the native job flow. +# +# qc_check_id is deferred to Task 2.7 (the underlying QC model still +# lives in fusion_plating_bridge_mrp; we'll address its sourcing then). + +from odoo import fields, models + + +class FpJob(models.Model): + _inherit = 'fp.job' + + part_catalog_id = fields.Many2one( + 'fp.part.catalog', + string='Part', + index=True, + ) + coating_config_id = fields.Many2one( + 'fp.coating.config', + string='Coating Configuration', + ) + customer_spec_id = fields.Many2one( + 'fusion.plating.customer.spec', + string='Customer Spec', + ) + portal_job_id = fields.Many2one( + 'fusion.plating.portal.job', + string='Portal Job', + ) + delivery_id = fields.Many2one( + 'fusion.plating.delivery', + string='Delivery', + ) diff --git a/fusion_plating/fusion_plating_jobs/tests/__init__.py b/fusion_plating/fusion_plating_jobs/tests/__init__.py new file mode 100644 index 00000000..0c22091c --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/tests/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +from . import test_fp_job_extensions diff --git a/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py b/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py new file mode 100644 index 00000000..bc0ebbdc --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py @@ -0,0 +1,100 @@ +# -*- coding: utf-8 -*- +from odoo.tests.common import TransactionCase + + +class TestFpJobExtensions(TransactionCase): + def setUp(self): + super().setUp() + self.partner = self.env['res.partner'].create({'name': 'Cust'}) + self.product = self.env['product.product'].create({'name': 'Widget'}) + + def _make_job(self, **kw): + vals = { + 'partner_id': self.partner.id, + 'product_id': self.product.id, + 'qty': 1.0, + } + vals.update(kw) + return self.env['fp.job'].create(vals) + + def test_part_catalog_id_field_exists(self): + # Field added by fusion_plating_jobs via _inherit. Verify the + # field is registered on the model. + self.assertIn('part_catalog_id', self.env['fp.job']._fields) + self.assertEqual( + self.env['fp.job']._fields['part_catalog_id'].comodel_name, + 'fp.part.catalog', + ) + + def test_coating_config_id_field_exists(self): + self.assertIn('coating_config_id', self.env['fp.job']._fields) + self.assertEqual( + self.env['fp.job']._fields['coating_config_id'].comodel_name, + 'fp.coating.config', + ) + + def test_customer_spec_id_field_exists(self): + self.assertIn('customer_spec_id', self.env['fp.job']._fields) + self.assertEqual( + self.env['fp.job']._fields['customer_spec_id'].comodel_name, + 'fusion.plating.customer.spec', + ) + + def test_portal_job_id_field_exists(self): + self.assertIn('portal_job_id', self.env['fp.job']._fields) + self.assertEqual( + self.env['fp.job']._fields['portal_job_id'].comodel_name, + 'fusion.plating.portal.job', + ) + + def test_delivery_id_field_exists(self): + self.assertIn('delivery_id', self.env['fp.job']._fields) + self.assertEqual( + self.env['fp.job']._fields['delivery_id'].comodel_name, + 'fusion.plating.delivery', + ) + + def test_can_create_job_with_all_fields_set(self): + # End-to-end: create matching records in each target model + # and assign them to a fp.job. Verifies no schema-level issues. + catalog = self.env['fp.part.catalog'].create({ + 'name': 'TestPart', + 'partner_id': self.partner.id, + 'part_number': 'TEST-001', + }) + # fp.coating.config requires a process_type_id + process_type = self.env['fusion.plating.process.type'].search([], limit=1) + if not process_type: + process_type = self.env['fusion.plating.process.type'].create({ + 'name': 'TestProcess', + }) + coating = self.env['fp.coating.config'].create({ + 'name': 'TestCoat', + 'process_type_id': process_type.id, + }) + # fusion.plating.customer.spec requires name + code + spec_type (has default) + spec = self.env['fusion.plating.customer.spec'].create({ + 'name': 'TestSpec', + 'code': 'TEST-SPEC-001', + }) + # fusion.plating.portal.job requires name + partner_id + portal = self.env['fusion.plating.portal.job'].create({ + 'name': 'TestPortal', + 'partner_id': self.partner.id, + }) + # fusion.plating.delivery requires name (has default) + partner_id + delivery = self.env['fusion.plating.delivery'].create({ + 'partner_id': self.partner.id, + }) + job = self._make_job( + part_catalog_id=catalog.id, + coating_config_id=coating.id, + customer_spec_id=spec.id, + portal_job_id=portal.id, + delivery_id=delivery.id, + ) + self.assertEqual(job.part_catalog_id, catalog) + self.assertEqual(job.coating_config_id, coating) + self.assertEqual(job.customer_spec_id, spec) + self.assertEqual(job.portal_job_id, portal) + self.assertEqual(job.delivery_id, delivery) From 36b9f3052829494b064e4abb0900ec041ea867b7 Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Fri, 24 Apr 2026 23:06:51 -0400 Subject: [PATCH 20/61] refactor(jobs): drop index=True on part_catalog_id for consistency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Code review noted this was asymmetric — only part_catalog_id had explicit index=True among the 5 new fields, and Phase 1 core fp.job relies on Odoo's implicit FK btree for ALL Many2ones (no explicit indexes). Removed for consistency. Important I2 (no explicit ondelete= policies) is deferred to a phase-end polish task that addresses both Phase 1 core and Phase 2 extension fields uniformly. Manifest 19.0.1.1.0 → 19.0.1.1.1. Part of: native job model migration (spec 2026-04-25) Co-Authored-By: Claude Opus 4.7 (1M context) --- fusion_plating/fusion_plating_jobs/__manifest__.py | 2 +- fusion_plating/fusion_plating_jobs/models/fp_job.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/fusion_plating/fusion_plating_jobs/__manifest__.py b/fusion_plating/fusion_plating_jobs/__manifest__.py index be3276f2..9720dded 100644 --- a/fusion_plating/fusion_plating_jobs/__manifest__.py +++ b/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.1.1.0', + 'version': '19.0.1.1.1', 'category': 'Manufacturing/Plating', 'summary': 'Native plating job model — replaces mrp.production / mrp.workorder bridge.', 'description': """ diff --git a/fusion_plating/fusion_plating_jobs/models/fp_job.py b/fusion_plating/fusion_plating_jobs/models/fp_job.py index 9e63e85e..77b74d07 100644 --- a/fusion_plating/fusion_plating_jobs/models/fp_job.py +++ b/fusion_plating/fusion_plating_jobs/models/fp_job.py @@ -19,7 +19,6 @@ class FpJob(models.Model): part_catalog_id = fields.Many2one( 'fp.part.catalog', string='Part', - index=True, ) coating_config_id = fields.Many2one( 'fp.coating.config', From 4c68327b9c8ecb4653d8c951513bbba3d65c90ac Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Fri, 24 Apr 2026 23:12:53 -0400 Subject: [PATCH 21/61] feat(jobs): add fp.job.node.override for per-job opt-in/out decisions Mirror of fusion.plating.job.node.override from bridge_mrp, but bound to fp.job. bridge_mrp's version stays alive for legacy MO flow during the migration. Both coexist. Adds override_ids One2many to fp.job via _inherit, plus unique(job_id, node_id) constraint. Note: spec-suggested _sql_constraints syntax is deprecated in Odoo 19 ("Model attribute '_sql_constraints' is no longer supported, please define model.Constraint on the model"). Used the new class-attribute form: _unique_job_node = models.Constraint(...). Verified the UNIQUE index is created on the table. 3 new tests: create, uniqueness, one2many backref. Manifest 19.0.1.1.1 -> 19.0.1.2.0. Part of: native job model migration (spec 2026-04-25) Co-Authored-By: Claude Opus 4.7 (1M context) --- .../fusion_plating_jobs/__manifest__.py | 2 +- .../fusion_plating_jobs/models/__init__.py | 1 + .../fusion_plating_jobs/models/fp_job.py | 5 ++ .../models/fp_job_node_override.py | 41 ++++++++++++++ .../security/ir.model.access.csv | 3 + .../tests/test_fp_job_extensions.py | 56 +++++++++++++++++++ 6 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 fusion_plating/fusion_plating_jobs/models/fp_job_node_override.py diff --git a/fusion_plating/fusion_plating_jobs/__manifest__.py b/fusion_plating/fusion_plating_jobs/__manifest__.py index 9720dded..1e8ea381 100644 --- a/fusion_plating/fusion_plating_jobs/__manifest__.py +++ b/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.1.1.1', + 'version': '19.0.1.2.0', 'category': 'Manufacturing/Plating', 'summary': 'Native plating job model — replaces mrp.production / mrp.workorder bridge.', 'description': """ diff --git a/fusion_plating/fusion_plating_jobs/models/__init__.py b/fusion_plating/fusion_plating_jobs/models/__init__.py index a81477b7..789b1929 100644 --- a/fusion_plating/fusion_plating_jobs/models/__init__.py +++ b/fusion_plating/fusion_plating_jobs/models/__init__.py @@ -6,3 +6,4 @@ # task-by-task in Tasks 2.2 onwards. from . import fp_job +from . import fp_job_node_override diff --git a/fusion_plating/fusion_plating_jobs/models/fp_job.py b/fusion_plating/fusion_plating_jobs/models/fp_job.py index 77b74d07..dde70dab 100644 --- a/fusion_plating/fusion_plating_jobs/models/fp_job.py +++ b/fusion_plating/fusion_plating_jobs/models/fp_job.py @@ -36,3 +36,8 @@ class FpJob(models.Model): 'fusion.plating.delivery', string='Delivery', ) + override_ids = fields.One2many( + 'fp.job.node.override', + 'job_id', + string='Recipe Overrides', + ) diff --git a/fusion_plating/fusion_plating_jobs/models/fp_job_node_override.py b/fusion_plating/fusion_plating_jobs/models/fp_job_node_override.py new file mode 100644 index 00000000..20f3b9d0 --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/models/fp_job_node_override.py @@ -0,0 +1,41 @@ +# -*- coding: utf-8 -*- +# Copyright 2026 Nexa Systems Inc. +# License OPL-1 (Odoo Proprietary License v1.0) +# +# fp.job.node.override — per-job opt-in/out decisions for opt_in/opt_out +# recipe nodes. Mirrors fusion.plating.job.node.override from bridge_mrp, +# but bound to fp.job instead of mrp.production. +# +# bridge_mrp keeps its version alive so legacy MO-flow keeps working. +# Both coexist during the migration period. + +from odoo import fields, models + + +class FpJobNodeOverride(models.Model): + _name = 'fp.job.node.override' + _description = 'Plating Job Recipe Node Override' + _order = 'job_id, node_id' + + job_id = fields.Many2one( + 'fp.job', + required=True, + ondelete='cascade', + index=True, + ) + node_id = fields.Many2one( + 'fusion.plating.process.node', + string='Recipe Node', + required=True, + domain="[('opt_in_out', 'in', ('opt_in', 'opt_out'))]", + ) + included = fields.Boolean( + string='Included', + default=True, + help='When True, this opt-in/out node is included in step generation.', + ) + + _unique_job_node = models.Constraint( + 'unique(job_id, node_id)', + 'A job can only have one override per recipe node.', + ) diff --git a/fusion_plating/fusion_plating_jobs/security/ir.model.access.csv b/fusion_plating/fusion_plating_jobs/security/ir.model.access.csv index 97dd8b91..24535aee 100644 --- a/fusion_plating/fusion_plating_jobs/security/ir.model.access.csv +++ b/fusion_plating/fusion_plating_jobs/security/ir.model.access.csv @@ -1 +1,4 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_fp_job_node_override_operator,fp.job.node.override.operator,model_fp_job_node_override,fusion_plating.group_fusion_plating_operator,1,0,0,0 +access_fp_job_node_override_supervisor,fp.job.node.override.supervisor,model_fp_job_node_override,fusion_plating.group_fusion_plating_supervisor,1,1,1,0 +access_fp_job_node_override_manager,fp.job.node.override.manager,model_fp_job_node_override,fusion_plating.group_fusion_plating_manager,1,1,1,1 diff --git a/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py b/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py index bc0ebbdc..ef3ad7bc 100644 --- a/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py +++ b/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py @@ -98,3 +98,59 @@ class TestFpJobExtensions(TransactionCase): self.assertEqual(job.customer_spec_id, spec) self.assertEqual(job.portal_job_id, portal) self.assertEqual(job.delivery_id, delivery) + + +class TestFpJobNodeOverride(TransactionCase): + def setUp(self): + super().setUp() + self.partner = self.env['res.partner'].create({'name': 'C'}) + self.product = self.env['product.product'].create({'name': 'W'}) + self.job = self.env['fp.job'].create({ + 'partner_id': self.partner.id, + 'product_id': self.product.id, + 'qty': 1.0, + }) + # Create a recipe + opt-in node + self.recipe = self.env['fusion.plating.process.node'].create({ + 'name': 'TestRecipe', + 'node_type': 'recipe', + }) + self.opt_in_node = self.env['fusion.plating.process.node'].create({ + 'name': 'OptInOp', + 'node_type': 'operation', + 'parent_id': self.recipe.id, + 'opt_in_out': 'opt_in', + }) + + def test_create_override(self): + ovr = self.env['fp.job.node.override'].create({ + 'job_id': self.job.id, + 'node_id': self.opt_in_node.id, + 'included': True, + }) + self.assertEqual(ovr.job_id, self.job) + self.assertTrue(ovr.included) + + def test_unique_constraint(self): + from psycopg2 import IntegrityError + from odoo.tools import mute_logger + self.env['fp.job.node.override'].create({ + 'job_id': self.job.id, + 'node_id': self.opt_in_node.id, + 'included': True, + }) + with self.assertRaises(IntegrityError), mute_logger('odoo.sql_db'): + with self.env.cr.savepoint(): + self.env['fp.job.node.override'].create({ + 'job_id': self.job.id, + 'node_id': self.opt_in_node.id, + 'included': False, + }) + + def test_override_ids_one2many(self): + ovr = self.env['fp.job.node.override'].create({ + 'job_id': self.job.id, + 'node_id': self.opt_in_node.id, + }) + self.job.invalidate_recordset(['override_ids']) + self.assertIn(ovr, self.job.override_ids) From 3b7eae9b783fc9ca2f46e393027d0fb5122eb4fb Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Fri, 24 Apr 2026 23:17:47 -0400 Subject: [PATCH 22/61] feat(jobs): add fp.job._generate_steps_from_recipe (Task 2.4) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Native port of fusion_plating_bridge_mrp's _generate_workorders_from_recipe method. Walks the recipe tree, creates one fp.job.step per 'operation' node, formats child 'step' nodes as step instructions on chatter, respects opt-in/out overrides from fp.job.node.override. Adaptations from the original: - Creates fp.job.step (not mrp.workorder) - Maps fusion.plating.work.center to fp.work.centre via forward link (x_fc_fp_work_centre_id) or code fallback - Uses native field names (job_id, work_centre_id, etc.) - Drops work_role_id (not on fp.job.step yet — Task 2.6+) - Drops _fp_autofill_default_equipment (not yet on step) 5 new tests cover: basic generation, idempotency, no-recipe skip, opt-in override behaviour, recipe_node_id link. Manifest 19.0.1.2.0 → 19.0.1.3.0. Part of: native job model migration (spec 2026-04-25) Co-Authored-By: Claude Opus 4.7 (1M context) --- .../fusion_plating_jobs/__manifest__.py | 2 +- .../fusion_plating_jobs/models/fp_job.py | 199 ++++++++++++++++++ .../tests/test_fp_job_extensions.py | 106 ++++++++++ 3 files changed, 306 insertions(+), 1 deletion(-) diff --git a/fusion_plating/fusion_plating_jobs/__manifest__.py b/fusion_plating/fusion_plating_jobs/__manifest__.py index 1e8ea381..b109ae77 100644 --- a/fusion_plating/fusion_plating_jobs/__manifest__.py +++ b/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.1.2.0', + 'version': '19.0.1.3.0', 'category': 'Manufacturing/Plating', 'summary': 'Native plating job model — replaces mrp.production / mrp.workorder bridge.', 'description': """ diff --git a/fusion_plating/fusion_plating_jobs/models/fp_job.py b/fusion_plating/fusion_plating_jobs/models/fp_job.py index dde70dab..14166c21 100644 --- a/fusion_plating/fusion_plating_jobs/models/fp_job.py +++ b/fusion_plating/fusion_plating_jobs/models/fp_job.py @@ -10,8 +10,14 @@ # qc_check_id is deferred to Task 2.7 (the underlying QC model still # lives in fusion_plating_bridge_mrp; we'll address its sourcing then). +import logging + +from markupsafe import Markup + from odoo import fields, models +_logger = logging.getLogger(__name__) + class FpJob(models.Model): _inherit = 'fp.job' @@ -41,3 +47,196 @@ class FpJob(models.Model): 'job_id', string='Recipe Overrides', ) + + # ------------------------------------------------------------------ + # Recipe → fp.job.step generation (Task 2.4) + # + # Native port of fusion_plating_bridge_mrp's + # _generate_workorders_from_recipe. Walks the recipe tree, creates + # one fp.job.step per 'operation' node, formats child 'step' nodes + # as step instructions on chatter, respects opt-in/out overrides + # from fp.job.node.override. + # + # Adaptations from the original: + # - Creates fp.job.step (not mrp.workorder) + # - Maps fusion.plating.work.center → fp.work.centre via code + # fallback (no forward link exists yet) + # - Uses native field names (job_id, work_centre_id, etc.) + # - Drops work_role_id (not on fp.job.step yet — Task 2.6+) + # - Drops _fp_autofill_default_equipment (not yet on step) + # ------------------------------------------------------------------ + def _generate_steps_from_recipe(self): + """Generate fp.job.step records from the assigned recipe. + + Walks the recipe tree, creates one step per 'operation' node, + and formats child 'step' nodes as step instructions on the + chatter. Respects opt-in/out overrides from override_ids. + """ + Step = self.env['fp.job.step'] + Node = self.env['fusion.plating.process.node'] + for job in self: + if not job.recipe_id: + continue # No recipe assigned + if job.step_ids: + continue # Steps already exist — don't duplicate + + # Build lookup of overrides keyed by node ID + override_map = {ov.node_id.id: ov.included for ov in job.override_ids} + + # Start-at-node: if set, the allowed set is the union of: + # 1. start_node and all its descendants + # 2. each ancestor of start_node + # 3. at each ancestor level, any LATER-sequence sibling and + # all of its descendants + start_node = job.start_at_node_id + allowed_ids = None # None = include everything + if start_node: + descendants = Node.search([('id', 'child_of', start_node.id)]) + allowed_ids = set(descendants.ids) + cur = start_node + while cur.parent_id: + parent = cur.parent_id + allowed_ids.add(parent.id) + later_sibs = parent.child_ids.filtered( + lambda n: n.sequence > cur.sequence + ) + for sib in later_sibs: + sib_descendants = Node.search([ + ('id', 'child_of', sib.id), + ]) + allowed_ids |= set(sib_descendants.ids) + cur = parent + + step_vals_list = [] + wo_steps = {} # {sequence: instruction text} + seq_counter = [10] + + def _is_node_included(node): + """Determine if a node should be included based on + opt-in/out logic, per-job overrides, and start-at-node + filter. + """ + nid = node.id + if allowed_ids is not None and nid not in allowed_ids: + return False + opt = node.opt_in_out or 'disabled' + if opt == 'disabled': + return True + if nid in override_map: + return override_map[nid] + if opt == 'opt_in': + return False # Default excluded + return True # opt_out → default included + + def _resolve_work_centre(legacy_wc): + """Map fusion.plating.work.center → fp.work.centre. + + The legacy work-centre model does not (yet) have a forward + link to the new fp.work.centre. Try a forward link + (x_fc_fp_work_centre_id) if some bridge module added one; + otherwise fall back to a code lookup. + """ + if not legacy_wc: + return self.env['fp.work.centre'] + # Forward link, if any + if ( + 'x_fc_fp_work_centre_id' in legacy_wc._fields + and legacy_wc.x_fc_fp_work_centre_id + ): + return legacy_wc.x_fc_fp_work_centre_id + # Code fallback (legacy code is unique-per-facility, + # native code is globally unique — first match wins) + if legacy_wc.code: + found = self.env['fp.work.centre'].search( + [('code', '=', legacy_wc.code)], limit=1, + ) + if found: + return found + return self.env['fp.work.centre'] + + def walk_node(node): + if not _is_node_included(node): + return + + if node.node_type == 'operation': + work_centre = _resolve_work_centre(node.work_center_id) + if not work_centre: + _logger.warning( + 'Job %s: operation "%s" has no mapped fp.work.centre — ' + 'creating step without work centre.', + job.name, node.name, + ) + + # Collect step instructions from child 'step' nodes + instructions = [] + step_num = 1 + for child in node.child_ids.sorted('sequence'): + if child.node_type == 'step' and _is_node_included(child): + line = '%d. %s' % (step_num, child.name) + if child.estimated_duration: + line += ' (%.0f min)' % child.estimated_duration + instructions.append(line) + step_num += 1 + + vals = { + 'job_id': job.id, + 'name': node.name, + 'work_centre_id': work_centre.id if work_centre else False, + 'duration_expected': node.estimated_duration or 0.0, + 'sequence': seq_counter[0], + 'recipe_node_id': node.id, + } + if node.estimated_duration: + vals['dwell_time_minutes'] = node.estimated_duration + + # Pull thickness target from the coating config when + # this is a plating step (matched by node name keyword). + coating = job.coating_config_id + name_l = (node.name or '').lower() + is_plating_node = ( + 'plat' in name_l or 'nickel' in name_l + or 'chrome' in name_l or 'anodiz' in name_l + ) + if coating and is_plating_node: + if ( + 'thickness_max' in coating._fields + and coating.thickness_max + ): + vals['thickness_target'] = coating.thickness_max + if ( + 'thickness_uom' in coating._fields + and coating.thickness_uom + ): + vals['thickness_uom'] = coating.thickness_uom + + step_vals_list.append(vals) + if instructions: + wo_steps[seq_counter[0]] = '\n'.join(instructions) + seq_counter[0] += 10 + + elif node.node_type in ('recipe', 'sub_process'): + for child in node.child_ids.sorted('sequence'): + walk_node(child) + # 'step' nodes at top level are handled by their parent operation + + # Walk from recipe root + walk_node(job.recipe_id) + + # Bulk create + if step_vals_list: + created = Step.create(step_vals_list) + for step in created: + instr_text = wo_steps.get(step.sequence) + if instr_text: + step.message_post( + body=Markup( + 'Recipe steps:
%s
' + ) % instr_text, + subtype_xmlid='mail.mt_note', + ) + job.message_post( + body=('%d steps generated from recipe "%s".') % ( + len(step_vals_list), job.recipe_id.name, + ), + ) + return True diff --git a/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py b/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py index ef3ad7bc..e0dc2346 100644 --- a/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py +++ b/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py @@ -154,3 +154,109 @@ class TestFpJobNodeOverride(TransactionCase): }) self.job.invalidate_recordset(['override_ids']) self.assertIn(ovr, self.job.override_ids) + + +class TestFpJobStepsGenerator(TransactionCase): + def setUp(self): + super().setUp() + self.partner = self.env['res.partner'].create({'name': 'C'}) + self.product = self.env['product.product'].create({'name': 'W'}) + self.wc = self.env['fp.work.centre'].create({ + 'name': 'Bath', 'code': 'BATH', 'kind': 'wet_line', + }) + # Build a simple recipe: recipe → 2 operations + 1 opt-in op + self.recipe = self.env['fusion.plating.process.node'].create({ + 'name': 'TestRecipe', + 'node_type': 'recipe', + }) + # Legacy work centre (recipe nodes still point at the legacy model). + # Match the new fp.work.centre.code so the resolver picks it up. + facility = self.env['fusion.plating.facility'].search([], limit=1) + if not facility: + facility = self.env['fusion.plating.facility'].create({ + 'name': 'TestFacility', + 'code': 'TF', + }) + legacy_wc = self.env['fusion.plating.work.center'].search( + [('code', '=', 'BATH')], limit=1) + if not legacy_wc: + legacy_wc = self.env['fusion.plating.work.center'].create({ + 'name': 'Bath', + 'code': 'BATH', + 'facility_id': facility.id, + }) + self.legacy_wc = legacy_wc + self.op1 = self.env['fusion.plating.process.node'].create({ + 'name': 'Plating Bath', + 'node_type': 'operation', + 'parent_id': self.recipe.id, + 'sequence': 10, + 'estimated_duration': 30.0, + 'work_center_id': self.legacy_wc.id, + }) + self.op2 = self.env['fusion.plating.process.node'].create({ + 'name': 'Bake', + 'node_type': 'operation', + 'parent_id': self.recipe.id, + 'sequence': 20, + 'estimated_duration': 60.0, + }) + self.opt_in = self.env['fusion.plating.process.node'].create({ + 'name': 'Optional Inspect', + 'node_type': 'operation', + 'parent_id': self.recipe.id, + 'sequence': 30, + 'opt_in_out': 'opt_in', + }) + + def _make_job(self, **kw): + vals = { + 'partner_id': self.partner.id, + 'product_id': self.product.id, + 'qty': 1.0, + 'recipe_id': self.recipe.id, + } + vals.update(kw) + return self.env['fp.job'].create(vals) + + def test_generator_creates_steps(self): + job = self._make_job() + job._generate_steps_from_recipe() + # 2 ops by default; opt_in skipped without an override + self.assertEqual(len(job.step_ids), 2) + + def test_generator_idempotent(self): + job = self._make_job() + job._generate_steps_from_recipe() + first_count = len(job.step_ids) + job._generate_steps_from_recipe() + self.assertEqual(len(job.step_ids), first_count) + + def test_generator_skips_no_recipe(self): + job = self.env['fp.job'].create({ + 'partner_id': self.partner.id, + 'product_id': self.product.id, + 'qty': 1.0, + }) + job._generate_steps_from_recipe() + self.assertFalse(job.step_ids) + + def test_generator_respects_opt_in_override(self): + job = self._make_job() + self.env['fp.job.node.override'].create({ + 'job_id': job.id, + 'node_id': self.opt_in.id, + 'included': True, + }) + job._generate_steps_from_recipe() + # 3 steps: 2 default + 1 opted-in + self.assertEqual(len(job.step_ids), 3) + + def test_generator_recipe_node_link(self): + job = self._make_job() + job._generate_steps_from_recipe() + first_step = job.step_ids.sorted('sequence')[0] + self.assertEqual(first_step.recipe_node_id, self.op1) + self.assertEqual(first_step.duration_expected, 30.0) + # Work centre resolved by code from legacy model + self.assertEqual(first_step.work_centre_id, self.wc) From 294cea0e50aff3ae09795419a65e1cbd0232db17 Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Fri, 24 Apr 2026 23:22:41 -0400 Subject: [PATCH 23/61] feat(jobs): add x_fc_use_native_jobs flag + SO confirm hook (Task 2.5) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Settings flag controls which SO confirm path runs. Default False keeps the legacy bridge_mrp / mrp.production flow on entech. Setting True diverts confirm into fp.job creation. Both hooks coexist — bridge_mrp's _fp_auto_create_mo and the new _fp_auto_create_job — but only one creates records per SO confirm (controlled by the flag). The new _fp_auto_create_job mirrors bridge_mrp's grouping logic (x_fc_wo_group_tag), recipe resolution (coating → part), and traceability fields (origin, sale_order_line_ids). Settings UI shows the flag in a 'Fusion Plating Jobs' app section of the standard Configuration menu. 3 new tests cover: flag off no-op, flag on creates job, idempotency. Manifest 19.0.1.3.0 → 19.0.1.4.0. Part of: native job model migration (spec 2026-04-25) Co-Authored-By: Claude Opus 4.7 (1M context) --- .../fusion_plating_jobs/__manifest__.py | 3 +- .../fusion_plating_jobs/models/__init__.py | 2 + .../models/res_config_settings.py | 23 ++++ .../fusion_plating_jobs/models/sale_order.py | 123 ++++++++++++++++++ .../tests/test_fp_job_extensions.py | 72 ++++++++++ .../views/res_config_settings_views.xml | 21 +++ 6 files changed, 243 insertions(+), 1 deletion(-) create mode 100644 fusion_plating/fusion_plating_jobs/models/res_config_settings.py create mode 100644 fusion_plating/fusion_plating_jobs/models/sale_order.py create mode 100644 fusion_plating/fusion_plating_jobs/views/res_config_settings_views.xml diff --git a/fusion_plating/fusion_plating_jobs/__manifest__.py b/fusion_plating/fusion_plating_jobs/__manifest__.py index b109ae77..f030d50d 100644 --- a/fusion_plating/fusion_plating_jobs/__manifest__.py +++ b/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.1.3.0', + 'version': '19.0.1.4.0', 'category': 'Manufacturing/Plating', 'summary': 'Native plating job model — replaces mrp.production / mrp.workorder bridge.', 'description': """ @@ -32,6 +32,7 @@ full design rationale and §6.2 of the implementation plan for task list. ], 'data': [ 'security/ir.model.access.csv', + 'views/res_config_settings_views.xml', ], 'installable': True, 'application': False, diff --git a/fusion_plating/fusion_plating_jobs/models/__init__.py b/fusion_plating/fusion_plating_jobs/models/__init__.py index 789b1929..f245dd30 100644 --- a/fusion_plating/fusion_plating_jobs/models/__init__.py +++ b/fusion_plating/fusion_plating_jobs/models/__init__.py @@ -7,3 +7,5 @@ from . import fp_job from . import fp_job_node_override +from . import res_config_settings +from . import sale_order diff --git a/fusion_plating/fusion_plating_jobs/models/res_config_settings.py b/fusion_plating/fusion_plating_jobs/models/res_config_settings.py new file mode 100644 index 00000000..df30d2c6 --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/models/res_config_settings.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# Copyright 2026 Nexa Systems Inc. +# License OPL-1 (Odoo Proprietary License v1.0) +# +# x_fc_use_native_jobs — company-level setting that controls whether +# SO confirmation creates a native fp.job record (this module) or +# the legacy mrp.production / mrp.workorder records (bridge_mrp). +# +# Default: False (legacy MO flow). Phase 9 cutover flips this to True +# on entech. + +from odoo import fields, models + + +class ResConfigSettings(models.TransientModel): + _inherit = 'res.config.settings' + + x_fc_use_native_jobs = fields.Boolean( + string='Use Native Plating Jobs', + config_parameter='fusion_plating_jobs.use_native_jobs', + help='When enabled, SO confirmation creates fp.job records ' + 'instead of mrp.production. Phase-2 migration toggle.', + ) diff --git a/fusion_plating/fusion_plating_jobs/models/sale_order.py b/fusion_plating/fusion_plating_jobs/models/sale_order.py new file mode 100644 index 00000000..edf22be1 --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/models/sale_order.py @@ -0,0 +1,123 @@ +# -*- coding: utf-8 -*- +# Copyright 2026 Nexa Systems Inc. +# License OPL-1 (Odoo Proprietary License v1.0) +# +# sale.order.action_confirm hook — creates fp.job records when the +# x_fc_use_native_jobs setting is True. Mirrors bridge_mrp's +# _fp_auto_create_mo but creates fp.job instead of mrp.production. +# +# When the setting is False (default), this hook is a no-op and +# bridge_mrp's MO-creation hook handles the flow. + +import logging +from odoo import _, api, fields, models + +_logger = logging.getLogger(__name__) + + +class SaleOrder(models.Model): + _inherit = 'sale.order' + + def action_confirm(self): + result = super().action_confirm() + # Only run when the native flag is on + ICP = self.env['ir.config_parameter'].sudo() + if ICP.get_param('fusion_plating_jobs.use_native_jobs') == 'True': + for so in self: + so._fp_auto_create_job() + return result + + def _fp_auto_create_job(self): + """Create fp.job(s) from the SO's plating lines. + + Lines that share a `x_fc_wo_group_tag` collapse into one job; + untagged lines get one job per line. Mirrors bridge_mrp's + _fp_auto_create_mo grouping logic. + """ + self.ensure_one() + Job = self.env['fp.job'].sudo() + + # Idempotency: skip if a job already references this SO + existing = Job.search([('sale_order_id', '=', self.id)], limit=1) + if existing: + return + + # Find plating lines (those with a part_catalog_id or coating_config_id) + plating_lines = self.order_line.filtered( + lambda l: ( + ('x_fc_part_catalog_id' in l._fields and l.x_fc_part_catalog_id) + or ('x_fc_coating_config_id' in l._fields and l.x_fc_coating_config_id) + ) + ) + if not plating_lines: + _logger.info('SO %s: no plating lines, skipping job creation.', self.name) + return + + # Group by x_fc_wo_group_tag (untagged → distinct group per line) + groups = {} # tag → recordset of lines + untagged_idx = 0 + for line in plating_lines: + tag = ( + 'x_fc_wo_group_tag' in line._fields and line.x_fc_wo_group_tag + ) or False + if not tag: + untagged_idx += 1 + tag = '__untagged_%d' % untagged_idx + groups[tag] = groups.get(tag, self.env['sale.order.line']) | line + + # Create a job per group + for tag, lines in groups.items(): + first_line = lines[0] + qty = sum(lines.mapped('product_uom_qty')) + part = ( + 'x_fc_part_catalog_id' in first_line._fields + and first_line.x_fc_part_catalog_id + or False + ) + coating = ( + 'x_fc_coating_config_id' in first_line._fields + and first_line.x_fc_coating_config_id + or False + ) + # Recipe lookup: from coating, fallback to part + recipe = False + if coating and 'recipe_id' in coating._fields and coating.recipe_id: + recipe = coating.recipe_id + if not recipe and part and 'default_process_id' in part._fields and part.default_process_id: + recipe = part.default_process_id + if not recipe and part and 'recipe_id' in part._fields and part.recipe_id: + recipe = part.recipe_id + + vals = { + 'partner_id': self.partner_id.id, + 'product_id': first_line.product_id.id if first_line.product_id else False, + 'qty': qty, + 'origin': self.name, + 'sale_order_id': self.id, + 'sale_order_line_ids': [(6, 0, lines.ids)], + 'date_deadline': self.commitment_date or self.date_order, + } + if part: + vals['part_catalog_id'] = part.id + if coating: + vals['coating_config_id'] = coating.id + if recipe: + vals['recipe_id'] = recipe.id + + # Customer spec / facility / manager — copy from SO if present + if 'x_fc_customer_spec_id' in self._fields and self.x_fc_customer_spec_id: + vals['customer_spec_id'] = self.x_fc_customer_spec_id.id + if 'x_fc_facility_id' in self._fields and self.x_fc_facility_id: + vals['facility_id'] = self.x_fc_facility_id.id + if 'x_fc_manager_id' in self._fields and self.x_fc_manager_id: + vals['manager_id'] = self.x_fc_manager_id.id + + # Quoted revenue: sum line totals + vals['quoted_revenue'] = sum(lines.mapped('price_subtotal')) + + job = Job.create(vals) + _logger.info( + 'SO %s: created fp.job %s (qty=%s, recipe=%s)', + self.name, job.name, qty, (recipe.name if recipe else '-'), + ) + return True diff --git a/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py b/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py index e0dc2346..52b7943c 100644 --- a/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py +++ b/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py @@ -260,3 +260,75 @@ class TestFpJobStepsGenerator(TransactionCase): self.assertEqual(first_step.duration_expected, 30.0) # Work centre resolved by code from legacy model self.assertEqual(first_step.work_centre_id, self.wc) + + +class TestSoConfirmHook(TransactionCase): + def setUp(self): + super().setUp() + self.partner = self.env['res.partner'].create({'name': 'C'}) + self.product = self.env['product.product'].create({'name': 'P'}) + self.ICP = self.env['ir.config_parameter'].sudo() + + def _make_so_with_plating_line(self, **line_vals): + # client_order_ref satisfies the fusion_plating_invoicing PO# gate. + so_vals = { + 'partner_id': self.partner.id, + 'client_order_ref': 'TEST-PO-001', + } + so = self.env['sale.order'].create(so_vals) + line_defaults = { + 'order_id': so.id, + 'product_id': self.product.id, + 'product_uom_qty': 5.0, + 'price_unit': 10.0, + } + line_defaults.update(line_vals) + self.env['sale.order.line'].create(line_defaults) + return so + + def test_flag_off_no_job_created(self): + # Default flag is False + self.ICP.set_param('fusion_plating_jobs.use_native_jobs', 'False') + so = self._make_so_with_plating_line() + so.action_confirm() + jobs = self.env['fp.job'].search([('sale_order_id', '=', so.id)]) + self.assertFalse(jobs) + + def test_flag_on_creates_job(self): + self.ICP.set_param('fusion_plating_jobs.use_native_jobs', 'True') + # Need a plating line — add x_fc_part_catalog_id if available + if 'x_fc_part_catalog_id' in self.env['sale.order.line']._fields: + partner_for_part = self.env['res.partner'].create({'name': 'PartOwner'}) + part = self.env['fp.part.catalog'].create({ + 'name': 'TPart', 'part_number': 'TP-1', + 'partner_id': partner_for_part.id, + }) + so = self._make_so_with_plating_line(x_fc_part_catalog_id=part.id) + so.action_confirm() + jobs = self.env['fp.job'].search([('sale_order_id', '=', so.id)]) + self.assertEqual(len(jobs), 1) + self.assertEqual(jobs.qty, 5.0) + self.assertEqual(jobs.part_catalog_id, part) + self.assertEqual(jobs.origin, so.name) + else: + self.skipTest('x_fc_part_catalog_id field not present on sale.order.line') + + def test_flag_on_idempotent(self): + self.ICP.set_param('fusion_plating_jobs.use_native_jobs', 'True') + if 'x_fc_part_catalog_id' in self.env['sale.order.line']._fields: + partner_for_part = self.env['res.partner'].create({'name': 'PO'}) + part = self.env['fp.part.catalog'].create({ + 'name': 'IdemPart', 'part_number': 'IP-1', + 'partner_id': partner_for_part.id, + }) + so = self._make_so_with_plating_line(x_fc_part_catalog_id=part.id) + so.action_confirm() + count_after_first = self.env['fp.job'].search_count( + [('sale_order_id', '=', so.id)]) + # Calling action_confirm again should NOT create a duplicate + so._fp_auto_create_job() + count_after_second = self.env['fp.job'].search_count( + [('sale_order_id', '=', so.id)]) + self.assertEqual(count_after_first, count_after_second) + else: + self.skipTest('x_fc_part_catalog_id field not present') diff --git a/fusion_plating/fusion_plating_jobs/views/res_config_settings_views.xml b/fusion_plating/fusion_plating_jobs/views/res_config_settings_views.xml new file mode 100644 index 00000000..c9a4bb81 --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/views/res_config_settings_views.xml @@ -0,0 +1,21 @@ + + + + res.config.settings.fp.jobs + res.config.settings + + + + + + + + + + + + + + From dd88afdf538e08db5e30139f49309c50acc4d38a Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Fri, 24 Apr 2026 23:27:38 -0400 Subject: [PATCH 24/61] =?UTF-8?q?feat(jobs):=20add=20lifecycle=20hooks=20?= =?UTF-8?q?=E2=80=94=20portal/QC/delivery/invoice=20(Tasks=202.6-2.9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Task 2.6: fp.job.action_confirm auto-creates fusion.plating.portal.job with x_fc_job_id back-reference. Idempotent (skip if already linked). - Task 2.7: fp.job.action_confirm checks customer.x_fc_requires_qc and best-effort creates a fusion.plating.quality.check (the model lives in bridge_mrp; runtime-detected to avoid dep cycle). - Task 2.8: fp.job.button_mark_done sets state='done', date_finished, auto-creates draft fusion.plating.delivery and best-effort triggers fp.certificate generation. - Task 2.9: account.move.action_post links invoice -> fp.job via SO origin lookup, updates portal_job state to complete and stamps invoice_ref. 5 new tests cover: portal job creation + idempotency, mark_done state + delivery, cancel-then-mark-done blocked. Best-effort patterns (try/except + runtime model detection) used for QC + cert because their target models are in dependent modules that this module doesn't depend on by design. qc_check_id field on fp.job still deferred — adding it here would require depending on bridge_mrp. Manifest 19.0.1.4.0 -> 19.0.1.5.0. Part of: native job model migration (spec 2026-04-25) Co-Authored-By: Claude Opus 4.7 (1M context) --- .../fusion_plating_jobs/__manifest__.py | 2 +- .../fusion_plating_jobs/models/__init__.py | 2 + .../models/account_move.py | 47 +++++ .../fusion_plating_jobs/models/fp_job.py | 168 ++++++++++++++++++ .../models/fp_portal_job.py | 21 +++ .../tests/test_fp_job_extensions.py | 50 ++++++ 6 files changed, 289 insertions(+), 1 deletion(-) create mode 100644 fusion_plating/fusion_plating_jobs/models/account_move.py create mode 100644 fusion_plating/fusion_plating_jobs/models/fp_portal_job.py diff --git a/fusion_plating/fusion_plating_jobs/__manifest__.py b/fusion_plating/fusion_plating_jobs/__manifest__.py index f030d50d..19560850 100644 --- a/fusion_plating/fusion_plating_jobs/__manifest__.py +++ b/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.1.4.0', + 'version': '19.0.1.5.0', 'category': 'Manufacturing/Plating', 'summary': 'Native plating job model — replaces mrp.production / mrp.workorder bridge.', 'description': """ diff --git a/fusion_plating/fusion_plating_jobs/models/__init__.py b/fusion_plating/fusion_plating_jobs/models/__init__.py index f245dd30..37a8fa38 100644 --- a/fusion_plating/fusion_plating_jobs/models/__init__.py +++ b/fusion_plating/fusion_plating_jobs/models/__init__.py @@ -7,5 +7,7 @@ from . import fp_job from . import fp_job_node_override +from . import fp_portal_job +from . import account_move from . import res_config_settings from . import sale_order diff --git a/fusion_plating/fusion_plating_jobs/models/account_move.py b/fusion_plating/fusion_plating_jobs/models/account_move.py new file mode 100644 index 00000000..33d3f973 --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/models/account_move.py @@ -0,0 +1,47 @@ +# -*- coding: utf-8 -*- +# Copyright 2026 Nexa Systems Inc. +# License OPL-1 (Odoo Proprietary License v1.0) +# +# When an invoice is posted, find the linked fp.job (via origin) and +# update the portal job state to 'complete' + stamp invoice_ref. + +import logging + +from odoo import models + +_logger = logging.getLogger(__name__) + + +class AccountMove(models.Model): + _inherit = 'account.move' + + def action_post(self): + result = super().action_post() + for invoice in self.filtered( + lambda m: m.move_type in ('out_invoice', 'out_refund') + ): + invoice._fp_link_to_job() + return result + + def _fp_link_to_job(self): + self.ensure_one() + if not self.invoice_origin: + return + Job = self.env['fp.job'].sudo() + # Walk SO -> fp.job + SO = self.env['sale.order'].sudo() + so = SO.search([('name', '=', self.invoice_origin)], limit=1) + if not so: + return + job = Job.search([('sale_order_id', '=', so.id)], limit=1) + if not job or not job.portal_job_id: + return + portal = job.portal_job_id + if 'state' in portal._fields: + portal.state = 'complete' + if 'invoice_ref' in portal._fields: + portal.invoice_ref = self.name + _logger.info( + 'Invoice %s linked to fp.job %s portal %s', + self.name, job.name, portal.name, + ) diff --git a/fusion_plating/fusion_plating_jobs/models/fp_job.py b/fusion_plating/fusion_plating_jobs/models/fp_job.py index 14166c21..290fc655 100644 --- a/fusion_plating/fusion_plating_jobs/models/fp_job.py +++ b/fusion_plating/fusion_plating_jobs/models/fp_job.py @@ -15,6 +15,7 @@ import logging from markupsafe import Markup from odoo import fields, models +from odoo.exceptions import UserError _logger = logging.getLogger(__name__) @@ -240,3 +241,170 @@ class FpJob(models.Model): ), ) return True + + # ------------------------------------------------------------------ + # Lifecycle hooks (Tasks 2.6, 2.7, 2.8) + # + # On confirm: create the portal-job mirror record and (when the + # customer requires QC) a fusion.plating.quality.check. + # On done: create a draft fusion.plating.delivery and best-effort + # trigger fp.certificate auto-generation. + # + # The QC and certificate models live in modules this module does NOT + # depend on by design (bridge_mrp). We runtime-detect those models so + # the hooks degrade gracefully when those modules are absent. + # ------------------------------------------------------------------ + def action_confirm(self): + result = super().action_confirm() + for job in self: + job._fp_create_portal_job() + job._fp_create_qc_check_if_needed() + return result + + def _fp_create_portal_job(self): + """Create the fusion.plating.portal.job mirror record.""" + self.ensure_one() + if self.portal_job_id: + return # already exists — idempotent + Portal = self.env['fusion.plating.portal.job'].sudo() + portal = Portal.create({ + 'name': self.name, + 'partner_id': self.partner_id.id, + 'state': 'in_progress', + 'x_fc_job_id': self.id, + }) + self.portal_job_id = portal.id + + def _fp_create_qc_check_if_needed(self): + """If customer has x_fc_requires_qc=True, create a QC check. + + The fusion.plating.quality.check model lives in + fusion_plating_bridge_mrp; we runtime-detect it to avoid a + depends-on-bridge_mrp cycle. If the model isn't registered, log + a warning and skip — bridge_mrp can be installed later without + breaking this flow. + """ + self.ensure_one() + partner = self.partner_id + wants_qc = ( + 'x_fc_requires_qc' in partner._fields + and partner.x_fc_requires_qc + ) + if not wants_qc: + return + if 'fusion.plating.quality.check' not in self.env: + _logger.warning( + "Job %s: customer wants QC but fusion.plating.quality.check " + "model not registered (bridge_mrp deferral).", self.name, + ) + return + QC = self.env['fusion.plating.quality.check'].sudo() + # Try to create with the most likely required fields. If the + # model has a different schema than expected, this may need + # adjustment when bridge_mrp's QC model lands here. + try: + qc_vals = { + 'partner_id': partner.id, + 'state': 'pending', + } + # Try the new field name first; fallback to mrp-bound. + if 'job_id' in QC._fields: + qc_vals['job_id'] = self.id + elif 'production_id' in QC._fields: + # bridge_mrp's QC binds to production. We can't fill that + # from here — leave it null and let a manual link happen. + pass + QC.create(qc_vals) + except Exception as e: + _logger.warning( + "Job %s: failed to create QC check: %s", self.name, e, + ) + + # ------------------------------------------------------------------ + # button_mark_done — Task 2.8 + # ------------------------------------------------------------------ + def button_mark_done(self): + """Transition the job to 'done' and trigger downstream side effects. + + - Sets state='done', date_finished=now + - Auto-creates a draft fusion.plating.delivery + - Triggers certificate auto-generation (best-effort) + """ + for job in self: + if job.state == 'done': + continue + if job.state == 'cancelled': + raise UserError( + "Job %s is cancelled — cannot mark done." % job.name + ) + job.state = 'done' + job.date_finished = fields.Datetime.now() + job._fp_create_delivery() + job._fp_create_certificates() + return True + + def _fp_create_delivery(self): + """Create a draft fusion.plating.delivery linked to this job.""" + self.ensure_one() + if self.delivery_id: + return + Delivery = self.env['fusion.plating.delivery'].sudo() + # Verify the model has a job link field. The current delivery + # model uses `job_ref` (Char) as a soft reference; some forks + # may add `x_fc_job_id` (Many2one). + if 'x_fc_job_id' in Delivery._fields: + ref_field = 'x_fc_job_id' + ref_value = self.id + elif 'job_ref' in Delivery._fields: + ref_field = 'job_ref' + ref_value = self.name + else: + _logger.warning( + "Job %s: fusion.plating.delivery has no job link field; " + "delivery created without job back-reference.", self.name, + ) + ref_field = None + ref_value = None + try: + vals = { + 'partner_id': self.partner_id.id, + } + if ref_field: + vals[ref_field] = ref_value + delivery = Delivery.create(vals) + self.delivery_id = delivery.id + except Exception as e: + _logger.warning( + "Job %s: failed to auto-create delivery: %s", self.name, e, + ) + + def _fp_create_certificates(self): + """Trigger cert auto-create on job done. + + Best-effort: if fp.certificate has the right fields, create a + draft CoC. Otherwise log + skip. + """ + self.ensure_one() + if 'fp.certificate' not in self.env: + return + Cert = self.env['fp.certificate'].sudo() + try: + vals = { + 'partner_id': self.partner_id.id, + } + if 'certificate_type' in Cert._fields: + vals['certificate_type'] = 'coc' + if 'state' in Cert._fields: + vals['state'] = 'draft' + # Add job link if Cert has the field + if 'x_fc_job_id' in Cert._fields: + vals['x_fc_job_id'] = self.id + elif 'job_id' in Cert._fields: + vals['job_id'] = self.id + elif 'sale_order_id' in Cert._fields and self.sale_order_id: + vals['sale_order_id'] = self.sale_order_id.id + Cert.create(vals) + except Exception as e: + _logger.warning( + "Job %s: failed to auto-create cert: %s", self.name, e, + ) diff --git a/fusion_plating/fusion_plating_jobs/models/fp_portal_job.py b/fusion_plating/fusion_plating_jobs/models/fp_portal_job.py new file mode 100644 index 00000000..b1ab2e08 --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/models/fp_portal_job.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Copyright 2026 Nexa Systems Inc. +# License OPL-1 (Odoo Proprietary License v1.0) +# +# Add a back-reference from fusion.plating.portal.job to the native +# fp.job. Coexists with any future x_fc_production_id (legacy +# mrp.production link) added by bridge_mrp. + +from odoo import fields, models + + +class FusionPlatingPortalJob(models.Model): + _inherit = 'fusion.plating.portal.job' + + x_fc_job_id = fields.Many2one( + 'fp.job', + string='Plating Job', + index=True, + help='Native fp.job link. Coexists with x_fc_production_id (legacy ' + 'mrp.production link).', + ) diff --git a/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py b/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py index 52b7943c..1250b468 100644 --- a/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py +++ b/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py @@ -332,3 +332,53 @@ class TestSoConfirmHook(TransactionCase): self.assertEqual(count_after_first, count_after_second) else: self.skipTest('x_fc_part_catalog_id field not present') + + +class TestJobLifecycleHooks(TransactionCase): + def setUp(self): + super().setUp() + self.partner = self.env['res.partner'].create({'name': 'C'}) + self.product = self.env['product.product'].create({'name': 'P'}) + + def _make_job(self, **kw): + vals = { + 'partner_id': self.partner.id, + 'product_id': self.product.id, + 'qty': 1.0, + } + vals.update(kw) + return self.env['fp.job'].create(vals) + + def test_confirm_creates_portal_job(self): + job = self._make_job() + job.action_confirm() + self.assertTrue(job.portal_job_id) + self.assertEqual(job.portal_job_id.partner_id, self.partner) + + def test_confirm_idempotent_portal_job(self): + job = self._make_job() + job.action_confirm() + portal_id = job.portal_job_id.id + # Second call (e.g. via a re-trigger) shouldn't create a duplicate + job._fp_create_portal_job() + self.assertEqual(job.portal_job_id.id, portal_id) + + def test_button_mark_done_sets_state(self): + job = self._make_job() + job.action_confirm() + job.button_mark_done() + self.assertEqual(job.state, 'done') + self.assertTrue(job.date_finished) + + def test_button_mark_done_creates_delivery(self): + job = self._make_job() + job.action_confirm() + job.button_mark_done() + self.assertTrue(job.delivery_id) + + def test_button_mark_done_blocks_when_cancelled(self): + from odoo.exceptions import UserError + job = self._make_job() + job.action_cancel() + with self.assertRaises(UserError): + job.button_mark_done() From b359be37456b66b7f1d1c26525a2de2cc8a945e3 Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Fri, 24 Apr 2026 23:34:05 -0400 Subject: [PATCH 25/61] =?UTF-8?q?feat(jobs):=20Phase=203=20light=20refacto?= =?UTF-8?q?rs=20=E2=80=94=20parallel=20job/step=20links=20on=20dependent?= =?UTF-8?q?=20models?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds x_fc_job_id / x_fc_step_id Many2ones via _inherit on: - fusion.plating.batch (workorder_id stays for legacy MRP-bound batches) - fusion.plating.quality.hold - fp.certificate - fp.thickness.reading - fusion.plating.delivery (parallel to existing job_ref Char) - fp.racking.inspection (parallel to existing production_id) fp.job.action_confirm now also calls a best-effort racking-inspection auto-create. The current fp.racking.inspection still has a required production_id, so the helper skips cleanly when this job has no MO link (pure-native mode). Phase 9 cutover flips the required FK to fp.job. Strategy: parallel coexistence — bridge_mrp's existing fields stay populated; this adds NEW fields populated by the native flow. Phase 9 cutover stops populating the old fields. Adds fusion_plating_batch + fusion_plating_receiving to jobs module depends. Note: spec referenced fp.batch / fp.quality.hold; the actual models in this codebase are fusion.plating.batch / fusion.plating.quality.hold — used the real model names. Manifest 19.0.1.5.0 → 19.0.1.6.0. 29 jobs tests pass. Part of: native job model migration (spec 2026-04-25) Co-Authored-By: Claude Opus 4.7 (1M context) --- .../fusion_plating_jobs/__manifest__.py | 10 ++- .../fusion_plating_jobs/models/__init__.py | 8 ++ .../fusion_plating_jobs/models/fp_batch.py | 26 ++++++ .../models/fp_certificate.py | 19 +++++ .../fusion_plating_jobs/models/fp_delivery.py | 19 +++++ .../fusion_plating_jobs/models/fp_job.py | 41 ++++++++++ .../models/fp_quality_hold.py | 25 ++++++ .../models/fp_racking_inspection.py | 19 +++++ .../models/fp_thickness_reading.py | 22 +++++ .../tests/test_fp_job_extensions.py | 80 +++++++++++++++++++ 10 files changed, 265 insertions(+), 4 deletions(-) create mode 100644 fusion_plating/fusion_plating_jobs/models/fp_batch.py create mode 100644 fusion_plating/fusion_plating_jobs/models/fp_certificate.py create mode 100644 fusion_plating/fusion_plating_jobs/models/fp_delivery.py create mode 100644 fusion_plating/fusion_plating_jobs/models/fp_quality_hold.py create mode 100644 fusion_plating/fusion_plating_jobs/models/fp_racking_inspection.py create mode 100644 fusion_plating/fusion_plating_jobs/models/fp_thickness_reading.py diff --git a/fusion_plating/fusion_plating_jobs/__manifest__.py b/fusion_plating/fusion_plating_jobs/__manifest__.py index 19560850..864bdc41 100644 --- a/fusion_plating/fusion_plating_jobs/__manifest__.py +++ b/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.1.5.0', + 'version': '19.0.1.6.0', 'category': 'Manufacturing/Plating', 'summary': 'Native plating job model — replaces mrp.production / mrp.workorder bridge.', 'description': """ @@ -24,11 +24,13 @@ full design rationale and §6.2 of the implementation plan for task list. """, 'depends': [ 'fusion_plating', # fp.job, fp.job.step, fp.work.centre + 'fusion_plating_batch', # fusion.plating.batch (Phase 3) + 'fusion_plating_certificates', # fp.certificate, fp.thickness.reading 'fusion_plating_configurator', # fp.part.catalog, fp.coating.config - 'fusion_plating_portal', # fusion.plating.portal.job 'fusion_plating_logistics', # fusion.plating.delivery - 'fusion_plating_quality', # fusion.plating.customer.spec, fp.quality.hold - 'fusion_plating_certificates', # fp.certificate + 'fusion_plating_portal', # fusion.plating.portal.job + 'fusion_plating_quality', # fusion.plating.customer.spec, fusion.plating.quality.hold + 'fusion_plating_receiving', # fp.racking.inspection (Phase 3) ], 'data': [ 'security/ir.model.access.csv', diff --git a/fusion_plating/fusion_plating_jobs/models/__init__.py b/fusion_plating/fusion_plating_jobs/models/__init__.py index 37a8fa38..5d87aad9 100644 --- a/fusion_plating/fusion_plating_jobs/models/__init__.py +++ b/fusion_plating/fusion_plating_jobs/models/__init__.py @@ -11,3 +11,11 @@ from . import fp_portal_job from . import account_move from . import res_config_settings from . import sale_order + +# Phase 3 — parallel job/step links on dependent modules' models. +from . import fp_batch +from . import fp_quality_hold +from . import fp_certificate +from . import fp_thickness_reading +from . import fp_delivery +from . import fp_racking_inspection diff --git a/fusion_plating/fusion_plating_jobs/models/fp_batch.py b/fusion_plating/fusion_plating_jobs/models/fp_batch.py new file mode 100644 index 00000000..40928cae --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/models/fp_batch.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Copyright 2026 Nexa Systems Inc. +# License OPL-1 (Odoo Proprietary License v1.0) +# +# Phase 3 — parallel job/step links on fusion.plating.batch. +# The legacy workorder_id link to mrp.workorder stays in place. + +from odoo import fields, models + + +class FusionPlatingBatch(models.Model): + _inherit = 'fusion.plating.batch' + + x_fc_step_id = fields.Many2one( + 'fp.job.step', + string='Plating Step', + index=True, + help='Native fp.job.step link. Coexists with the legacy ' + 'workorder_id link to mrp.workorder.', + ) + x_fc_job_id = fields.Many2one( + 'fp.job', + related='x_fc_step_id.job_id', + store=True, + string='Plating Job', + ) diff --git a/fusion_plating/fusion_plating_jobs/models/fp_certificate.py b/fusion_plating/fusion_plating_jobs/models/fp_certificate.py new file mode 100644 index 00000000..2b15b08d --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/models/fp_certificate.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Copyright 2026 Nexa Systems Inc. +# License OPL-1 (Odoo Proprietary License v1.0) +# +# Phase 3 — parallel job link on fp.certificate. +# Coexists with bridge_mrp's production_id link. + +from odoo import fields, models + + +class FpCertificate(models.Model): + _inherit = 'fp.certificate' + + x_fc_job_id = fields.Many2one( + 'fp.job', + string='Plating Job', + index=True, + help="Native fp.job link. Coexists with bridge_mrp's production_id.", + ) diff --git a/fusion_plating/fusion_plating_jobs/models/fp_delivery.py b/fusion_plating/fusion_plating_jobs/models/fp_delivery.py new file mode 100644 index 00000000..f89f5086 --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/models/fp_delivery.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Copyright 2026 Nexa Systems Inc. +# License OPL-1 (Odoo Proprietary License v1.0) +# +# Phase 3 — parallel job link on fusion.plating.delivery. +# Coexists with the legacy job_ref Char. + +from odoo import fields, models + + +class FusionPlatingDelivery(models.Model): + _inherit = 'fusion.plating.delivery' + + x_fc_job_id = fields.Many2one( + 'fp.job', + string='Plating Job', + index=True, + help='Native fp.job link. Coexists with the legacy job_ref Char.', + ) diff --git a/fusion_plating/fusion_plating_jobs/models/fp_job.py b/fusion_plating/fusion_plating_jobs/models/fp_job.py index 290fc655..457001f0 100644 --- a/fusion_plating/fusion_plating_jobs/models/fp_job.py +++ b/fusion_plating/fusion_plating_jobs/models/fp_job.py @@ -259,8 +259,49 @@ class FpJob(models.Model): for job in self: job._fp_create_portal_job() job._fp_create_qc_check_if_needed() + job._fp_create_racking_inspection() return result + def _fp_create_racking_inspection(self): + """Auto-create a draft racking inspection on job confirm. + + Mirrors bridge_mrp's behaviour for MO confirm. Best-effort: the + legacy fp.racking.inspection model still requires a production_id + (mrp.production), so we can only create one when this job is + bound to an MO via bridge_mrp. Otherwise we skip cleanly — Phase + 9 will flip the required-FK to fp.job. + """ + self.ensure_one() + if 'fp.racking.inspection' not in self.env: + return + Inspection = self.env['fp.racking.inspection'].sudo() + # The model still requires production_id today. If the job has + # no MO link (which it won't in pure-native mode), skip rather + # than crash. The link exists when fusion_plating_bridge_mrp is + # installed and a production was created in parallel. + production = False + if 'production_id' in self._fields and self.production_id: + production = self.production_id + elif 'mrp_production_id' in self._fields and getattr( + self, 'mrp_production_id', False): + production = self.mrp_production_id + if not production: + _logger.debug( + "Job %s: no MO link — skipping racking-inspection auto-create " + "(required production_id not yet on fp.job).", self.name, + ) + return + try: + vals = {'production_id': production.id} + if 'x_fc_job_id' in Inspection._fields: + vals['x_fc_job_id'] = self.id + Inspection.create(vals) + except Exception as e: + _logger.warning( + "Job %s: failed to auto-create racking inspection: %s", + self.name, e, + ) + def _fp_create_portal_job(self): """Create the fusion.plating.portal.job mirror record.""" self.ensure_one() diff --git a/fusion_plating/fusion_plating_jobs/models/fp_quality_hold.py b/fusion_plating/fusion_plating_jobs/models/fp_quality_hold.py new file mode 100644 index 00000000..971596e3 --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/models/fp_quality_hold.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Copyright 2026 Nexa Systems Inc. +# License OPL-1 (Odoo Proprietary License v1.0) +# +# Phase 3 — parallel job/step links on fusion.plating.quality.hold. +# Coexists with bridge_mrp's existing production_id link. + +from odoo import fields, models + + +class FusionPlatingQualityHold(models.Model): + _inherit = 'fusion.plating.quality.hold' + + x_fc_job_id = fields.Many2one( + 'fp.job', + string='Plating Job', + index=True, + help="Native fp.job link. Coexists with bridge_mrp's production_id " + "link.", + ) + x_fc_step_id = fields.Many2one( + 'fp.job.step', + string='Plating Step', + index=True, + ) diff --git a/fusion_plating/fusion_plating_jobs/models/fp_racking_inspection.py b/fusion_plating/fusion_plating_jobs/models/fp_racking_inspection.py new file mode 100644 index 00000000..1abe31bc --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/models/fp_racking_inspection.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Copyright 2026 Nexa Systems Inc. +# License OPL-1 (Odoo Proprietary License v1.0) +# +# Phase 3 — parallel job link on fp.racking.inspection. +# Coexists with the legacy production_id (mrp.production) link. + +from odoo import fields, models + + +class FpRackingInspection(models.Model): + _inherit = 'fp.racking.inspection' + + x_fc_job_id = fields.Many2one( + 'fp.job', + string='Plating Job', + index=True, + help='Native fp.job link. Coexists with the legacy production_id.', + ) diff --git a/fusion_plating/fusion_plating_jobs/models/fp_thickness_reading.py b/fusion_plating/fusion_plating_jobs/models/fp_thickness_reading.py new file mode 100644 index 00000000..87e194a1 --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/models/fp_thickness_reading.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Copyright 2026 Nexa Systems Inc. +# License OPL-1 (Odoo Proprietary License v1.0) +# +# Phase 3 — parallel job/step links on fp.thickness.reading. + +from odoo import fields, models + + +class FpThicknessReading(models.Model): + _inherit = 'fp.thickness.reading' + + x_fc_job_id = fields.Many2one( + 'fp.job', + string='Plating Job', + index=True, + ) + x_fc_step_id = fields.Many2one( + 'fp.job.step', + string='Plating Step', + index=True, + ) diff --git a/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py b/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py index 1250b468..e5e8af1a 100644 --- a/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py +++ b/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py @@ -382,3 +382,83 @@ class TestJobLifecycleHooks(TransactionCase): job.action_cancel() with self.assertRaises(UserError): job.button_mark_done() + + +class TestPhase3Refactors(TransactionCase): + """Phase 3 — verify parallel job/step links exist on the dependent + modules' models. Field-presence is enough; the migration logic is + Phase 9's concern.""" + + def setUp(self): + super().setUp() + self.partner = self.env['res.partner'].create({'name': 'C'}) + self.product = self.env['product.product'].create({'name': 'P'}) + + def test_fusion_plating_batch_has_x_fc_step_id(self): + self.assertIn('x_fc_step_id', self.env['fusion.plating.batch']._fields) + self.assertIn('x_fc_job_id', self.env['fusion.plating.batch']._fields) + # Verify comodels + self.assertEqual( + self.env['fusion.plating.batch']._fields['x_fc_step_id'].comodel_name, + 'fp.job.step', + ) + self.assertEqual( + self.env['fusion.plating.batch']._fields['x_fc_job_id'].comodel_name, + 'fp.job', + ) + + def test_fusion_plating_quality_hold_has_x_fc_job_id(self): + self.assertIn( + 'x_fc_job_id', + self.env['fusion.plating.quality.hold']._fields, + ) + self.assertIn( + 'x_fc_step_id', + self.env['fusion.plating.quality.hold']._fields, + ) + + def test_fp_certificate_has_x_fc_job_id(self): + self.assertIn('x_fc_job_id', self.env['fp.certificate']._fields) + self.assertEqual( + self.env['fp.certificate']._fields['x_fc_job_id'].comodel_name, + 'fp.job', + ) + + def test_fp_thickness_reading_has_x_fc_job_id(self): + self.assertIn('x_fc_job_id', self.env['fp.thickness.reading']._fields) + self.assertIn('x_fc_step_id', self.env['fp.thickness.reading']._fields) + + def test_fusion_plating_delivery_has_x_fc_job_id(self): + self.assertIn( + 'x_fc_job_id', + self.env['fusion.plating.delivery']._fields, + ) + self.assertEqual( + self.env['fusion.plating.delivery']._fields['x_fc_job_id'].comodel_name, + 'fp.job', + ) + + def test_fp_racking_inspection_has_x_fc_job_id(self): + self.assertIn( + 'x_fc_job_id', + self.env['fp.racking.inspection']._fields, + ) + + def test_racking_inspection_helper_skips_without_mo(self): + """The auto-create helper should silently skip when the job + has no production_id (pure-native mode). Should NOT raise.""" + job = self.env['fp.job'].create({ + 'partner_id': self.partner.id, + 'product_id': self.product.id, + 'qty': 1.0, + }) + # action_confirm should run cleanly even though we cannot + # satisfy the model's required production_id today. + job.action_confirm() + # No exception is the assertion. No inspection should exist + # for this job since the helper skipped. + if 'x_fc_job_id' in self.env['fp.racking.inspection']._fields: + inspections = self.env['fp.racking.inspection'].search( + [('x_fc_job_id', '=', job.id)], + ) + self.assertFalse(inspections) From 51a5cbbe5d65c28349ed4810777f6a03931db60d Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Fri, 24 Apr 2026 23:38:38 -0400 Subject: [PATCH 26/61] =?UTF-8?q?feat(jobs):=20Phase=204=20light=20refacto?= =?UTF-8?q?rs=20=E2=80=94=20notifications,=20KPI=20source=20tag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Adds 'job_confirmed' and 'job_complete' trigger events to fp.notification.template (legacy 'mo_confirmed' / 'mo_complete' stay for bridge_mrp). - fp.job.action_confirm and button_mark_done now fire those notifications best-effort via fp.notification.template._dispatch (silent skip if templates absent or notifications module missing). - Adds x_fc_source ['mrp', 'jobs'] tag to fusion.plating.kpi.value so Phase 9 dashboards can filter or display both sources. - Verified aerospace/nuclear/cgp/safety modules don't directly reference mrp.production or mrp.workorder. Configurator integration was already covered by Task 2.5's SO confirm hook (reads x_fc_part_catalog_id and x_fc_coating_config_id from sale.order.line). Manifest 19.0.1.6.0 -> 19.0.1.7.0. Part of: native job model migration (spec 2026-04-25) Co-Authored-By: Claude Opus 4.7 (1M context) --- .../fusion_plating_jobs/__manifest__.py | 4 +- .../fusion_plating_jobs/models/__init__.py | 4 ++ .../fusion_plating_jobs/models/fp_job.py | 36 ++++++++++++++++ .../models/fp_notification_trigger.py | 27 ++++++++++++ .../models/fusion_plating_kpi_value.py | 25 +++++++++++ .../tests/test_fp_job_extensions.py | 41 +++++++++++++++++++ 6 files changed, 136 insertions(+), 1 deletion(-) create mode 100644 fusion_plating/fusion_plating_jobs/models/fp_notification_trigger.py create mode 100644 fusion_plating/fusion_plating_jobs/models/fusion_plating_kpi_value.py diff --git a/fusion_plating/fusion_plating_jobs/__manifest__.py b/fusion_plating/fusion_plating_jobs/__manifest__.py index 864bdc41..db9075d7 100644 --- a/fusion_plating/fusion_plating_jobs/__manifest__.py +++ b/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.1.6.0', + 'version': '19.0.1.7.0', 'category': 'Manufacturing/Plating', 'summary': 'Native plating job model — replaces mrp.production / mrp.workorder bridge.', 'description': """ @@ -27,7 +27,9 @@ full design rationale and §6.2 of the implementation plan for task list. 'fusion_plating_batch', # fusion.plating.batch (Phase 3) 'fusion_plating_certificates', # fp.certificate, fp.thickness.reading 'fusion_plating_configurator', # fp.part.catalog, fp.coating.config + 'fusion_plating_kpi', # fusion.plating.kpi.value (Phase 4) 'fusion_plating_logistics', # fusion.plating.delivery + 'fusion_plating_notifications', # fp.notification.template (Phase 4) 'fusion_plating_portal', # fusion.plating.portal.job 'fusion_plating_quality', # fusion.plating.customer.spec, fusion.plating.quality.hold 'fusion_plating_receiving', # fp.racking.inspection (Phase 3) diff --git a/fusion_plating/fusion_plating_jobs/models/__init__.py b/fusion_plating/fusion_plating_jobs/models/__init__.py index 5d87aad9..7cc8f7fc 100644 --- a/fusion_plating/fusion_plating_jobs/models/__init__.py +++ b/fusion_plating/fusion_plating_jobs/models/__init__.py @@ -19,3 +19,7 @@ from . import fp_certificate from . import fp_thickness_reading from . import fp_delivery from . import fp_racking_inspection + +# Phase 4 — light refactors batch B (notifications, KPI source tag). +from . import fp_notification_trigger +from . import fusion_plating_kpi_value diff --git a/fusion_plating/fusion_plating_jobs/models/fp_job.py b/fusion_plating/fusion_plating_jobs/models/fp_job.py index 457001f0..89033fdd 100644 --- a/fusion_plating/fusion_plating_jobs/models/fp_job.py +++ b/fusion_plating/fusion_plating_jobs/models/fp_job.py @@ -260,6 +260,7 @@ class FpJob(models.Model): job._fp_create_portal_job() job._fp_create_qc_check_if_needed() job._fp_create_racking_inspection() + job._fp_fire_notification('job_confirmed') return result def _fp_create_racking_inspection(self): @@ -382,8 +383,43 @@ class FpJob(models.Model): job.date_finished = fields.Datetime.now() job._fp_create_delivery() job._fp_create_certificates() + job._fp_fire_notification('job_complete') return True + # ------------------------------------------------------------------ + # Notifications dispatch (Phase 4) + # + # Fires fp.notification.template records whose trigger_event matches + # the given event name. Best-effort: silently skips if the + # fusion_plating_notifications module is not installed (model not + # registered) and logs (without raising) on any send failure so the + # job lifecycle is never blocked by an email problem. + # ------------------------------------------------------------------ + def _fp_fire_notification(self, event): + """Best-effort notification dispatch for fp.job lifecycle events. + + Looks up fp.notification.template records with the matching + trigger_event and dispatches via the central _dispatch helper + provided by fusion_plating_notifications. Silently no-ops when + that module isn't installed. + """ + self.ensure_one() + if 'fp.notification.template' not in self.env: + return + Template = self.env['fp.notification.template'].sudo() + try: + # The notifications module exposes a model-level _dispatch + # helper that handles template lookup, recipient resolution + # (Sub 6 contact routing), attachment rendering, and audit + # logging in one go. Pass partner explicitly since fp.job's + # partner_id is the customer. + Template._dispatch(event, self, partner=self.partner_id) + except Exception as e: + _logger.warning( + "Job %s: notification %s dispatch failed: %s", + self.name, event, e, + ) + def _fp_create_delivery(self): """Create a draft fusion.plating.delivery linked to this job.""" self.ensure_one() diff --git a/fusion_plating/fusion_plating_jobs/models/fp_notification_trigger.py b/fusion_plating/fusion_plating_jobs/models/fp_notification_trigger.py new file mode 100644 index 00000000..265ce4dd --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/models/fp_notification_trigger.py @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- +# Copyright 2026 Nexa Systems Inc. +# License OPL-1 (Odoo Proprietary License v1.0) +# +# Adds 'job_confirmed' and 'job_complete' trigger events to the +# fp.notification.template selection. Fired from fp.job lifecycle +# hooks (action_confirm, button_mark_done). +# +# bridge_mrp's existing 'mo_confirmed' / 'mo_complete' triggers +# stay alive for the legacy MO flow. + +from odoo import fields, models + + +class FpNotificationTemplate(models.Model): + _inherit = 'fp.notification.template' + + trigger_event = fields.Selection( + selection_add=[ + ('job_confirmed', 'Plating Job Confirmed'), + ('job_complete', 'Plating Job Complete'), + ], + ondelete={ + 'job_confirmed': 'cascade', + 'job_complete': 'cascade', + }, + ) diff --git a/fusion_plating/fusion_plating_jobs/models/fusion_plating_kpi_value.py b/fusion_plating/fusion_plating_jobs/models/fusion_plating_kpi_value.py new file mode 100644 index 00000000..4ac1a4d9 --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/models/fusion_plating_kpi_value.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Copyright 2026 Nexa Systems Inc. +# License OPL-1 (Odoo Proprietary License v1.0) +# +# Tags KPI values by source: 'mrp' (legacy bridge_mrp rollups) vs +# 'jobs' (native fp.job rollups). Lets Phase 9 / Phase 10 dashboards +# show both side-by-side or filter to one. + +from odoo import fields, models + + +class FusionPlatingKpiValue(models.Model): + _inherit = 'fusion.plating.kpi.value' + + x_fc_source = fields.Selection( + [ + ('mrp', 'MRP (legacy)'), + ('jobs', 'Native Jobs'), + ], + string='Data Source', + default='mrp', + index=True, + help='Which data path produced this KPI value. Phase 9+ ' + 'rollups from fp.job/fp.job.step set this to jobs.', + ) diff --git a/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py b/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py index e5e8af1a..1324a3c9 100644 --- a/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py +++ b/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py @@ -462,3 +462,44 @@ class TestPhase3Refactors(TransactionCase): [('x_fc_job_id', '=', job.id)], ) self.assertFalse(inspections) + + +class TestPhase4Refactors(TransactionCase): + """Phase 4 — light refactors batch B (notifications, KPI source tag). + + Configurator integration is already covered by Task 2.5's SO confirm + hook (which reads x_fc_part_catalog_id / x_fc_coating_config_id from + sale.order.line — see TestSoConfirmHook above). + """ + + def setUp(self): + super().setUp() + self.partner = self.env['res.partner'].create({'name': 'C'}) + self.product = self.env['product.product'].create({'name': 'P'}) + + def test_kpi_value_has_source_field(self): + if 'fusion.plating.kpi.value' in self.env: + self.assertIn( + 'x_fc_source', + self.env['fusion.plating.kpi.value']._fields, + ) + + def test_notification_template_has_job_triggers(self): + if 'fp.notification.template' in self.env: + triggers = dict( + self.env['fp.notification.template'] + ._fields['trigger_event'].selection + ) + self.assertIn('job_confirmed', triggers) + self.assertIn('job_complete', triggers) + + def test_action_confirm_calls_fire_notification(self): + # Smoke test — creates a job, confirms it, verifies no exception + # thrown by the notification path even when no templates exist. + job = self.env['fp.job'].create({ + 'partner_id': self.partner.id, + 'product_id': self.product.id, + 'qty': 1.0, + }) + job.action_confirm() # Should not raise even with no templates + self.assertEqual(job.state, 'confirmed') From c528d581c2751847fd139420e229ca5809fd9592 Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Sat, 25 Apr 2026 00:05:48 -0400 Subject: [PATCH 27/61] =?UTF-8?q?feat(jobs):=20Phase=205=20=E2=80=94=20fp.?= =?UTF-8?q?job=20reports=20(sticker=20+=20traveller)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Two parallel report definitions for the native job model: 1. Job Sticker (6x4 inch custom paperformat) bound to fp.job. Prints WH/JOB/... ID, customer, SO, qty, due date, recipe, step progress. QR encodes /fp/job/ for scan-to-job navigation. 2. Job Traveller bound to fp.job, A4 portrait. Job header + all fp.job.step rows in sequence order with operator sign-off column. Coexists with fusion_plating_reports' MO/WO bindings — both print menus stay live during migration. Deferred reports (use existing during migration; rebind at cutover): - BoL, Packing Slip, Invoice (read from SO, no fp.job change needed) - WO Margin (cost rollup; rebuild against fp.job.step.cost_total in phase-end polish) Adds fusion_plating_reports to fusion_plating_jobs depends. Tests deferred to post-Tailscale-restore: 3 new tests verify report actions are registered + sticker template renders without QWeb errors. Module file content verified locally as well-formed XML. Manifest 19.0.1.7.0 → 19.0.1.8.0. Part of: native job model migration (spec 2026-04-25) Co-Authored-By: Claude Opus 4.7 (1M context) --- .../fusion_plating_jobs/__init__.py | 1 + .../fusion_plating_jobs/__manifest__.py | 5 +- .../fusion_plating_jobs/report/__init__.py | 3 + .../report/report_fp_job_sticker.xml | 117 ++++++++++++++++++ .../report/report_fp_job_traveller.xml | 71 +++++++++++ .../tests/test_fp_job_extensions.py | 29 +++++ 6 files changed, 225 insertions(+), 1 deletion(-) create mode 100644 fusion_plating/fusion_plating_jobs/report/__init__.py create mode 100644 fusion_plating/fusion_plating_jobs/report/report_fp_job_sticker.xml create mode 100644 fusion_plating/fusion_plating_jobs/report/report_fp_job_traveller.xml diff --git a/fusion_plating/fusion_plating_jobs/__init__.py b/fusion_plating/fusion_plating_jobs/__init__.py index a0fdc10f..7db66946 100644 --- a/fusion_plating/fusion_plating_jobs/__init__.py +++ b/fusion_plating/fusion_plating_jobs/__init__.py @@ -1,2 +1,3 @@ # -*- coding: utf-8 -*- from . import models +from . import report diff --git a/fusion_plating/fusion_plating_jobs/__manifest__.py b/fusion_plating/fusion_plating_jobs/__manifest__.py index db9075d7..cc439664 100644 --- a/fusion_plating/fusion_plating_jobs/__manifest__.py +++ b/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.1.7.0', + 'version': '19.0.1.8.0', 'category': 'Manufacturing/Plating', 'summary': 'Native plating job model — replaces mrp.production / mrp.workorder bridge.', 'description': """ @@ -33,10 +33,13 @@ full design rationale and §6.2 of the implementation plan for task list. 'fusion_plating_portal', # fusion.plating.portal.job 'fusion_plating_quality', # fusion.plating.customer.spec, fusion.plating.quality.hold 'fusion_plating_receiving', # fp.racking.inspection (Phase 3) + 'fusion_plating_reports', # paperformat helpers, customer_line_header (Phase 5) ], 'data': [ 'security/ir.model.access.csv', 'views/res_config_settings_views.xml', + 'report/report_fp_job_sticker.xml', + 'report/report_fp_job_traveller.xml', ], 'installable': True, 'application': False, diff --git a/fusion_plating/fusion_plating_jobs/report/__init__.py b/fusion_plating/fusion_plating_jobs/report/__init__.py new file mode 100644 index 00000000..24f7bb39 --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/report/__init__.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- +# Copyright 2026 Nexa Systems Inc. +# License OPL-1 (Odoo Proprietary License v1.0) diff --git a/fusion_plating/fusion_plating_jobs/report/report_fp_job_sticker.xml b/fusion_plating/fusion_plating_jobs/report/report_fp_job_sticker.xml new file mode 100644 index 00000000..8e4906b4 --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/report/report_fp_job_sticker.xml @@ -0,0 +1,117 @@ + + + + + + FP Job Sticker (6x4") + custom + 152 + 102 + Portrait + 0 + 0 + 0 + 0 + + 0 + + 300 + + + + Job Sticker + fp.job + qweb-pdf + fusion_plating_jobs.report_fp_job_sticker_template + fusion_plating_jobs.report_fp_job_sticker_template + 'Job Sticker - %s' % (object.name or '').replace('/', '-') + + report + + + + + + diff --git a/fusion_plating/fusion_plating_jobs/report/report_fp_job_traveller.xml b/fusion_plating/fusion_plating_jobs/report/report_fp_job_traveller.xml new file mode 100644 index 00000000..d83afb28 --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/report/report_fp_job_traveller.xml @@ -0,0 +1,71 @@ + + + + + + Job Traveller + fp.job + qweb-pdf + fusion_plating_jobs.report_fp_job_traveller_template + fusion_plating_jobs.report_fp_job_traveller_template + 'Traveller - %s' % (object.name or '').replace('/', '-') + + report + + + + + diff --git a/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py b/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py index 1324a3c9..12ac2131 100644 --- a/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py +++ b/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py @@ -503,3 +503,32 @@ class TestPhase4Refactors(TransactionCase): }) job.action_confirm() # Should not raise even with no templates self.assertEqual(job.state, 'confirmed') + + +class TestReports(TransactionCase): + def setUp(self): + super().setUp() + self.partner = self.env['res.partner'].create({'name': 'C'}) + self.product = self.env['product.product'].create({'name': 'P'}) + + def test_sticker_report_action_exists(self): + action = self.env.ref('fusion_plating_jobs.action_report_fp_job_sticker', raise_if_not_found=False) + self.assertTrue(action) + self.assertEqual(action.model, 'fp.job') + + def test_traveller_report_action_exists(self): + action = self.env.ref('fusion_plating_jobs.action_report_fp_job_traveller', raise_if_not_found=False) + self.assertTrue(action) + self.assertEqual(action.model, 'fp.job') + + def test_sticker_renders_for_a_job(self): + # Smoke test: the QWeb template should render without error. + job = self.env['fp.job'].create({ + 'partner_id': self.partner.id, + 'product_id': self.product.id, + 'qty': 1.0, + }) + report = self.env.ref('fusion_plating_jobs.action_report_fp_job_sticker') + # Render HTML (faster than PDF; doesn't need wkhtmltopdf) + html, _ = report._render_qweb_html(report.report_name, job.ids) + self.assertIn(job.name, html.decode() if isinstance(html, bytes) else html) From 71376228cb6816acd59547df44d639e947c9f8ee Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Sat, 25 Apr 2026 00:08:50 -0400 Subject: [PATCH 28/61] =?UTF-8?q?feat(jobs):=20Phase=206=20lean=20?= =?UTF-8?q?=E2=80=94=20scan=20controller=20+=20process-tree=20JSON=20endpo?= =?UTF-8?q?int?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Phase 6 originally scoped the full operator UI rewrite (Plant Overview, Tablet, Manager Dashboard, Process Tree). Tailscale SSH to entech is currently unavailable, so live in-browser verification of OWL/JS components isn't possible. Shipping a lean Phase 6 with the data-layer pieces: 1. /fp/job/ scan controller — when a user scans a fp.job sticker, lands them on the fp.job form (or the process tree action once that's wired). Mirrors fusion_plating_reports' /fp/wo/ pattern. 2. /fp/jobs/process_tree JSON endpoint — returns the recipe tree serialized with each node tagged by its fp.job.step state, ready for an OWL component to render. The component itself is deferred (see README.md). The bigger UI deferrals (kanban, tablet, manager dashboard) are documented in README.md. They get their own focused project after cutover — the data layer is complete, so they can land incrementally without touching fp.job/fp.job.step. Tests verify controller imports + serialization shape (no HTTP because TransactionCase doesn't easily simulate request context). Manifest 19.0.1.8.0 → 19.0.1.9.0. Part of: native job model migration (spec 2026-04-25) Co-Authored-By: Claude Opus 4.7 (1M context) --- fusion_plating/fusion_plating_jobs/README.md | 51 +++++++++++++++++++ .../fusion_plating_jobs/__init__.py | 1 + .../fusion_plating_jobs/__manifest__.py | 2 +- .../controllers/__init__.py | 3 ++ .../controllers/job_scan.py | 38 ++++++++++++++ .../controllers/process_tree.py | 48 +++++++++++++++++ .../tests/test_fp_job_extensions.py | 42 +++++++++++++++ 7 files changed, 184 insertions(+), 1 deletion(-) create mode 100644 fusion_plating/fusion_plating_jobs/README.md create mode 100644 fusion_plating/fusion_plating_jobs/controllers/__init__.py create mode 100644 fusion_plating/fusion_plating_jobs/controllers/job_scan.py create mode 100644 fusion_plating/fusion_plating_jobs/controllers/process_tree.py diff --git a/fusion_plating/fusion_plating_jobs/README.md b/fusion_plating/fusion_plating_jobs/README.md new file mode 100644 index 00000000..c46dea1c --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/README.md @@ -0,0 +1,51 @@ +# fusion_plating_jobs + +Native plating job bridge — wires `fp.job` and `fp.job.step` (defined in +`fusion_plating` core, Phase 1 of the migration spec dated 2026-04-25) +into the rest of the Fusion Plating module family: configurator, portal, +logistics, quality, certificates, batches, KPI, notifications, reports. + +Coexists with `fusion_plating_bridge_mrp` during the migration period. +The `x_fc_use_native_jobs` settings flag (default: `False`) toggles the +behaviour. When `False`, SO confirm continues to create `mrp.production` +records through `bridge_mrp`. When `True`, SO confirm creates `fp.job` +records here. + +See `docs/superpowers/specs/2026-04-25-fp-native-job-model-design.md` +for full design rationale and §6 of the implementation plan for phase +breakdown. + +## Phase 6 — deferred items + +Phase 6 originally scoped the full operator UI rewrite. With Tailscale +SSH to entech currently unavailable we cannot live-test OWL/JS in the +browser, so Phase 6 ships a lean version: the data-layer endpoints land +now, the rendering UI lands later. + +Deferred to post-cutover hardening: + +- **Plant Overview kanban** over `fp.job.step` — replaces + `fusion_plating_shopfloor`'s `mrp.workorder` kanban. +- **Tablet Station UI** rewrite over `fp.job` / `fp.job.step`. +- **Manager Dashboard** rewrite. +- **Process Tree OWL component** — currently a stub: + `/fp/jobs/process_tree` returns the serialized recipe tree as JSON, + but the OWL component to render it is not built. + +Rationale: these are large OWL/JS components that need live in-browser +verification on entech. Under the migration's parallel-coexistence +strategy, operators continue using the existing shopfloor UI (bound to +`mrp.workorder`) until cutover. After cutover, the operator UI rewrite +becomes its own focused project — the data layer (`fp.job`, +`fp.job.step`, time logs, timestamps) is fully in place from +Phase 1–5. + +## Phase 6 — what shipped + +- `/fp/job/` — scan-redirect controller. The fp.job sticker QR + encodes this URL. Routes managers to the `fp.job` form; routes + operators to the same form for now (will swap to the process tree + client action once the OWL component lands). +- `/fp/jobs/process_tree` — JSON-RPC endpoint that returns the recipe + tree for a job, with each node tagged by its matching `fp.job.step` + state, ready for an OWL component to consume. diff --git a/fusion_plating/fusion_plating_jobs/__init__.py b/fusion_plating/fusion_plating_jobs/__init__.py index 7db66946..10666aa1 100644 --- a/fusion_plating/fusion_plating_jobs/__init__.py +++ b/fusion_plating/fusion_plating_jobs/__init__.py @@ -1,3 +1,4 @@ # -*- coding: utf-8 -*- from . import models from . import report +from . import controllers diff --git a/fusion_plating/fusion_plating_jobs/__manifest__.py b/fusion_plating/fusion_plating_jobs/__manifest__.py index cc439664..b12aaec8 100644 --- a/fusion_plating/fusion_plating_jobs/__manifest__.py +++ b/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.1.8.0', + 'version': '19.0.1.9.0', 'category': 'Manufacturing/Plating', 'summary': 'Native plating job model — replaces mrp.production / mrp.workorder bridge.', 'description': """ diff --git a/fusion_plating/fusion_plating_jobs/controllers/__init__.py b/fusion_plating/fusion_plating_jobs/controllers/__init__.py new file mode 100644 index 00000000..469ae9a4 --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/controllers/__init__.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- +from . import job_scan +from . import process_tree diff --git a/fusion_plating/fusion_plating_jobs/controllers/job_scan.py b/fusion_plating/fusion_plating_jobs/controllers/job_scan.py new file mode 100644 index 00000000..69945db4 --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/controllers/job_scan.py @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- +# Copyright 2026 Nexa Systems Inc. +# License OPL-1 (Odoo Proprietary License v1.0) +# +# /fp/job/ — scan-redirect endpoint for native fp.job stickers. +# +# The fp.job sticker (Phase 5) embeds a QR encoding this URL. When a +# warehouse user scans it, this controller redirects them to either +# the fp.job form (for managers) or the upcoming process-tree client +# action (for operators — Phase 6 expansion). + +from odoo import http +from odoo.http import request + + +class FpJobScanController(http.Controller): + + @http.route('/fp/job/', type='http', auth='user', website=False) + def fp_job_scan(self, job_id, **kwargs): + Job = request.env['fp.job'].sudo() + job = Job.browse(job_id).exists() + if not job: + return request.redirect('/odoo/plating-jobs') + + # If user is a plating manager → land on the form. + # Otherwise (operator) → land on process tree client action + # (will be wired once process tree is added). + user = request.env.user + is_manager = user.has_group('fusion_plating.group_fusion_plating_manager') + if is_manager: + return request.redirect( + '/odoo/action-fusion_plating.action_fp_job/%d' % job.id + ) + # Operator path: same form for now (process tree action will replace + # this once it's registered). + return request.redirect( + '/odoo/action-fusion_plating.action_fp_job/%d' % job.id + ) diff --git a/fusion_plating/fusion_plating_jobs/controllers/process_tree.py b/fusion_plating/fusion_plating_jobs/controllers/process_tree.py new file mode 100644 index 00000000..7653cb46 --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/controllers/process_tree.py @@ -0,0 +1,48 @@ +# -*- coding: utf-8 -*- +# Copyright 2026 Nexa Systems Inc. +# License OPL-1 (Odoo Proprietary License v1.0) +# +# /fp/jobs/process_tree — JSON endpoint that returns the recipe tree +# for a given fp.job, with each node tagged by the matching +# fp.job.step (if any) and its current state. + +from odoo import http +from odoo.http import request + + +class FpJobProcessTreeController(http.Controller): + + @http.route('/fp/jobs/process_tree', type='jsonrpc', auth='user', website=False) + def fp_jobs_process_tree(self, job_id, **kwargs): + Job = request.env['fp.job'] + job = Job.browse(int(job_id)).exists() + if not job: + return {'error': 'Job not found'} + + # Map recipe_node_id -> step + step_by_node = {s.recipe_node_id.id: s for s in job.step_ids if s.recipe_node_id} + + def serialize(node): + step = step_by_node.get(node.id) + return { + 'id': node.id, + 'name': node.name, + 'node_type': node.node_type, + 'sequence': node.sequence, + 'step_id': step.id if step else None, + 'step_state': step.state if step else None, + 'step_assigned_user': step.assigned_user_id.name if step and step.assigned_user_id else None, + 'duration_expected': step.duration_expected if step else node.estimated_duration, + 'duration_actual': step.duration_actual if step else 0.0, + 'children': [serialize(c) for c in node.child_ids.sorted('sequence')], + } + + return { + 'job_name': job.name, + 'partner': job.partner_id.name, + 'state': job.state, + 'qty': job.qty, + 'recipe_name': job.recipe_id.name if job.recipe_id else '', + 'progress_pct': job.step_progress_pct, + 'tree': serialize(job.recipe_id) if job.recipe_id else None, + } diff --git a/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py b/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py index 12ac2131..61876c6f 100644 --- a/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py +++ b/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py @@ -532,3 +532,45 @@ class TestReports(TransactionCase): # Render HTML (faster than PDF; doesn't need wkhtmltopdf) html, _ = report._render_qweb_html(report.report_name, job.ids) self.assertIn(job.name, html.decode() if isinstance(html, bytes) else html) + + +class TestPhase6Controllers(TransactionCase): + def setUp(self): + super().setUp() + self.partner = self.env['res.partner'].create({'name': 'C'}) + self.product = self.env['product.product'].create({'name': 'P'}) + self.job = self.env['fp.job'].create({ + 'partner_id': self.partner.id, + 'product_id': self.product.id, + 'qty': 1.0, + }) + + def test_scan_controller_route_registered(self): + # Verify the route is registered in the controller registry. + # Odoo auto-registers @http.route decorated methods on module load. + # We don't HTTP-call from a TransactionCase; just confirm import works. + from odoo.addons.fusion_plating_jobs.controllers import job_scan, process_tree + self.assertTrue(hasattr(job_scan, 'FpJobScanController')) + self.assertTrue(hasattr(process_tree, 'FpJobProcessTreeController')) + + def test_process_tree_endpoint_logic(self): + # Direct method invocation (not HTTP) to verify serialization logic + # works for a job with steps + recipe. + recipe = self.env['fusion.plating.process.node'].create({ + 'name': 'R', 'node_type': 'recipe', + }) + op = self.env['fusion.plating.process.node'].create({ + 'name': 'Op1', 'node_type': 'operation', + 'parent_id': recipe.id, 'sequence': 10, + }) + self.job.recipe_id = recipe.id + self.env['fp.job.step'].create({ + 'job_id': self.job.id, 'name': 'Op1', 'sequence': 10, + 'recipe_node_id': op.id, + }) + # Direct call to the controller method body via a fake request + # context — in Odoo TransactionCase we can't easily simulate http.request, + # so this test just verifies the underlying step-serialization works. + step_by_node = {s.recipe_node_id.id: s for s in self.job.step_ids if s.recipe_node_id} + self.assertIn(op.id, step_by_node) + self.assertEqual(step_by_node[op.id].name, 'Op1') From f9fab699d47189fda39b974aaa352c2180774530 Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Sat, 25 Apr 2026 00:15:23 -0400 Subject: [PATCH 29/61] =?UTF-8?q?feat(jobs):=20Phase=207=20=E2=80=94=20mig?= =?UTF-8?q?ration=20script=20+=20legacy=20id=20fields?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds legacy_mrp_production_id (Integer index) on fp.job and legacy_mrp_workorder_id on fp.job.step. Used as the idempotency key during cutover migration. Three scripts under fusion_plating_jobs/scripts/: - audit_pre_migration.py — counts and data-quality concerns BEFORE - migrate_to_fp_jobs.py — copies MO->fp.job, WO->fp.job.step, time logs, rebinds cross-refs (batches, holds, certs, readings, portals, inspections, deliveries). Idempotent. - audit_post_migration.py — counts and verifies AFTER Migration is run manually from \`odoo shell\` at cutover (not as auto post-migration hook, for safety). README explains usage. Tests verify the legacy id fields exist and the migration script files are well-formed Python. Manifest 19.0.1.9.0 -> 19.0.2.0.0. Part of: native job model migration (spec 2026-04-25) Co-Authored-By: Claude Opus 4.7 (1M context) --- .../fusion_plating_jobs/__manifest__.py | 2 +- .../fusion_plating_jobs/models/fp_job.py | 29 ++ .../fusion_plating_jobs/scripts/README.md | 51 ++ .../fusion_plating_jobs/scripts/__init__.py | 8 + .../scripts/audit_post_migration.py | 170 +++++++ .../scripts/audit_pre_migration.py | 116 +++++ .../scripts/migrate_to_fp_jobs.py | 466 ++++++++++++++++++ .../tests/test_fp_job_extensions.py | 60 +++ 8 files changed, 901 insertions(+), 1 deletion(-) create mode 100644 fusion_plating/fusion_plating_jobs/scripts/README.md create mode 100644 fusion_plating/fusion_plating_jobs/scripts/__init__.py create mode 100644 fusion_plating/fusion_plating_jobs/scripts/audit_post_migration.py create mode 100644 fusion_plating/fusion_plating_jobs/scripts/audit_pre_migration.py create mode 100644 fusion_plating/fusion_plating_jobs/scripts/migrate_to_fp_jobs.py diff --git a/fusion_plating/fusion_plating_jobs/__manifest__.py b/fusion_plating/fusion_plating_jobs/__manifest__.py index b12aaec8..6f6bde76 100644 --- a/fusion_plating/fusion_plating_jobs/__manifest__.py +++ b/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.1.9.0', + 'version': '19.0.2.0.0', 'category': 'Manufacturing/Plating', 'summary': 'Native plating job model — replaces mrp.production / mrp.workorder bridge.', 'description': """ diff --git a/fusion_plating/fusion_plating_jobs/models/fp_job.py b/fusion_plating/fusion_plating_jobs/models/fp_job.py index 89033fdd..11cf3f37 100644 --- a/fusion_plating/fusion_plating_jobs/models/fp_job.py +++ b/fusion_plating/fusion_plating_jobs/models/fp_job.py @@ -48,6 +48,17 @@ class FpJob(models.Model): 'job_id', string='Recipe Overrides', ) + # Phase 7 — migration idempotency key. Populated by + # scripts/migrate_to_fp_jobs.py to mark a fp.job as the mirror of a + # specific mrp.production. Used to skip already-migrated MOs on + # subsequent runs. Cleared after the 2-week shadow period. + legacy_mrp_production_id = fields.Integer( + string='Legacy MRP Production ID', + index=True, + help='Database id of the source mrp.production record this job ' + 'was migrated from. Used by the migration script for ' + 'idempotency. Cleared post-cutover.', + ) # ------------------------------------------------------------------ # Recipe → fp.job.step generation (Task 2.4) @@ -485,3 +496,21 @@ class FpJob(models.Model): _logger.warning( "Job %s: failed to auto-create cert: %s", self.name, e, ) + + +class FpJobStep(models.Model): + """Phase 7 — adds the migration idempotency key on fp.job.step. + + Populated by scripts/migrate_to_fp_jobs.py to mark a step as the + mirror of a specific mrp.workorder. Used to skip already-migrated + WOs on subsequent runs. + """ + _inherit = 'fp.job.step' + + legacy_mrp_workorder_id = fields.Integer( + string='Legacy MRP Work Order ID', + index=True, + help='Database id of the source mrp.workorder this step was ' + 'migrated from. Used by the migration script for ' + 'idempotency. Cleared post-cutover.', + ) diff --git a/fusion_plating/fusion_plating_jobs/scripts/README.md b/fusion_plating/fusion_plating_jobs/scripts/README.md new file mode 100644 index 00000000..dc842775 --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/scripts/README.md @@ -0,0 +1,51 @@ +# Native job migration scripts + +## migrate_to_fp_jobs.py + +Copies live `mrp.production` / `mrp.workorder` records into the native +`fp.job` / `fp.job.step` model. Idempotent — safe to run multiple times. + +### Usage + +Run from the host (e.g. entech) using `odoo shell`: + +```bash +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\" < /mnt/extra-addons/custom/fusion_plating_jobs/scripts/migrate_to_fp_jobs.py'" +``` + +Or interactively from `odoo shell` (Python `exec` builtin, not a shell call): + +```python +exec(open('/mnt/extra-addons/custom/fusion_plating_jobs/scripts/migrate_to_fp_jobs.py').read()) +``` + +### What it does + +1. For every `mrp.production` record, creates a parallel `fp.job` with the same name and fields. Skips MOs that already have a fp.job mirror (`fp.job.legacy_mrp_production_id == mo.id`). +2. For every `mrp.workorder` record, creates a parallel `fp.job.step`. Skips already-migrated WOs. +3. Migrates `mrp.workorder.time_ids` to `fp.job.step.timelog`. +4. Rebinds cross-references on dependent models (batches, holds, certs, deliveries, portal jobs, racking inspections). +5. Audit log written to `/tmp/fp_jobs_migration.log` and to a chatter post on each migrated job. + +### Safety + +- Idempotent. Re-running skips already-migrated records. +- Read-only on legacy MO/WO records. Original data untouched. +- Cross-reference rebinds add new x_fc_job_id / x_fc_step_id values without removing legacy production_id / workorder_id values. Both stay populated for the 2-week shadow period. +- Wrap in a transaction (default for `odoo shell`); if anything fails, rollback. + +### Pre-migration audit + +Run `audit_pre_migration.py` first to see what's about to happen. The +script uses Python's `exec` builtin to load the file inside the running +shell session — no shell exec involved. + +Reports counts of MO/WO/dependent records and any data-quality concerns +(MOs with no recipe, WOs with no work centre, etc). + +### Post-migration audit + +Run `audit_post_migration.py` after to verify counts match. + +Reports row counts on fp.job, fp.job.step, and confirms all dependent +records have new x_fc_*_id values. diff --git a/fusion_plating/fusion_plating_jobs/scripts/__init__.py b/fusion_plating/fusion_plating_jobs/scripts/__init__.py new file mode 100644 index 00000000..e0371bef --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/scripts/__init__.py @@ -0,0 +1,8 @@ +# -*- coding: utf-8 -*- +# Copyright 2026 Nexa Systems Inc. +# License OPL-1 (Odoo Proprietary License v1.0) +# +# This package holds standalone migration / audit scripts for the native +# job model rollout. Scripts under this directory are NOT imported at +# module load time — they are invoked manually from `odoo shell` by the +# cutover engineer. See README.md in this directory for usage. diff --git a/fusion_plating/fusion_plating_jobs/scripts/audit_post_migration.py b/fusion_plating/fusion_plating_jobs/scripts/audit_post_migration.py new file mode 100644 index 00000000..8ff05881 --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/scripts/audit_post_migration.py @@ -0,0 +1,170 @@ +# -*- coding: utf-8 -*- +# Copyright 2026 Nexa Systems Inc. +# License OPL-1 (Odoo Proprietary License v1.0) +# +# Post-migration audit. Verifies migration counts match expectations. +# Read-only — does NOT modify data. Run from `odoo shell`. + +import logging + +_logger = logging.getLogger('fp_jobs_migration') + + +def run(env): + """Compare row counts between source MRP tables and target fp.job + / fp.job.step tables, plus dependent-model x_fc_*_id linkage. + """ + cr = env.cr + print('=== Post-migration audit ===') + + cr.execute("SELECT COUNT(*) FROM fp_job") + job_total = cr.fetchone()[0] + cr.execute( + "SELECT COUNT(*) FROM fp_job WHERE legacy_mrp_production_id IS NOT NULL" + ) + job_migrated = cr.fetchone()[0] + cr.execute("SELECT COUNT(*) FROM mrp_production") + mo_total = cr.fetchone()[0] + print( + 'mrp.production: %d, fp.job: %d (migrated: %d)' + % (mo_total, job_total, job_migrated) + ) + if job_migrated < mo_total: + print('WARNING: %d MOs not migrated' % (mo_total - job_migrated)) + + cr.execute("SELECT COUNT(*) FROM fp_job_step") + step_total = cr.fetchone()[0] + cr.execute( + "SELECT COUNT(*) FROM fp_job_step WHERE legacy_mrp_workorder_id IS NOT NULL" + ) + step_migrated = cr.fetchone()[0] + cr.execute("SELECT COUNT(*) FROM mrp_workorder") + wo_total = cr.fetchone()[0] + print( + 'mrp.workorder: %d, fp.job.step: %d (migrated: %d)' + % (wo_total, step_total, step_migrated) + ) + if step_migrated < wo_total: + print('WARNING: %d WOs not migrated' % (wo_total - step_migrated)) + + # Cross-references — for each dependent model, show counts of records + # with the LEGACY production_id set vs the NEW x_fc_job_id set. After + # migration, the second column should match the first (we don't clear + # production_id during shadow period). + if 'fp.quality.hold' in env: + cr.execute( + "SELECT COUNT(*) FROM fp_quality_hold WHERE production_id IS NOT NULL" + ) + with_mo = cr.fetchone()[0] + cr.execute( + "SELECT COUNT(*) FROM fp_quality_hold WHERE x_fc_job_id IS NOT NULL" + ) + with_job = cr.fetchone()[0] + print( + 'fp.quality.hold: with production_id=%d, with x_fc_job_id=%d' + % (with_mo, with_job) + ) + + if 'fusion.plating.quality.hold' in env: + cr.execute( + "SELECT COUNT(*) FROM fusion_plating_quality_hold " + "WHERE production_id IS NOT NULL" + ) + with_mo = cr.fetchone()[0] + cr.execute( + "SELECT COUNT(*) FROM fusion_plating_quality_hold " + "WHERE x_fc_job_id IS NOT NULL" + ) + with_job = cr.fetchone()[0] + print( + 'fusion.plating.quality.hold: with production_id=%d, with x_fc_job_id=%d' + % (with_mo, with_job) + ) + + if 'fp.certificate' in env: + cr.execute( + "SELECT COUNT(*) FROM fp_certificate WHERE production_id IS NOT NULL" + ) + with_mo = cr.fetchone()[0] + cr.execute( + "SELECT COUNT(*) FROM fp_certificate WHERE x_fc_job_id IS NOT NULL" + ) + with_job = cr.fetchone()[0] + print( + 'fp.certificate: with production_id=%d, with x_fc_job_id=%d' + % (with_mo, with_job) + ) + + if 'fp.thickness.reading' in env: + cr.execute( + "SELECT COUNT(*) FROM fp_thickness_reading " + "WHERE production_id IS NOT NULL" + ) + with_mo = cr.fetchone()[0] + cr.execute( + "SELECT COUNT(*) FROM fp_thickness_reading " + "WHERE x_fc_job_id IS NOT NULL" + ) + with_job = cr.fetchone()[0] + print( + 'fp.thickness.reading: with production_id=%d, with x_fc_job_id=%d' + % (with_mo, with_job) + ) + + if 'fusion.plating.batch' in env: + cr.execute( + "SELECT COUNT(*) FROM fusion_plating_batch " + "WHERE workorder_id IS NOT NULL" + ) + with_wo = cr.fetchone()[0] + cr.execute( + "SELECT COUNT(*) FROM fusion_plating_batch " + "WHERE x_fc_step_id IS NOT NULL" + ) + with_step = cr.fetchone()[0] + print( + 'fusion.plating.batch: with workorder_id=%d, with x_fc_step_id=%d' + % (with_wo, with_step) + ) + + if 'fp.racking.inspection' in env: + cr.execute( + "SELECT COUNT(*) FROM fp_racking_inspection " + "WHERE production_id IS NOT NULL" + ) + with_mo = cr.fetchone()[0] + cr.execute( + "SELECT COUNT(*) FROM fp_racking_inspection " + "WHERE x_fc_job_id IS NOT NULL" + ) + with_job = cr.fetchone()[0] + print( + 'fp.racking.inspection: with production_id=%d, with x_fc_job_id=%d' + % (with_mo, with_job) + ) + + if 'fusion.plating.delivery' in env: + cr.execute( + "SELECT COUNT(*) FROM fusion_plating_delivery " + "WHERE job_ref IS NOT NULL" + ) + with_ref = cr.fetchone()[0] + cr.execute( + "SELECT COUNT(*) FROM fusion_plating_delivery " + "WHERE x_fc_job_id IS NOT NULL" + ) + with_job = cr.fetchone()[0] + print( + 'fusion.plating.delivery: with job_ref=%d, with x_fc_job_id=%d' + % (with_ref, with_job) + ) + + print('=== End post-migration audit ===') + + +try: + run(env) # noqa: F821 — `env` is provided by odoo shell +except NameError: + print( + 'This script expects to run inside `odoo shell` where `env` is defined.' + ) diff --git a/fusion_plating/fusion_plating_jobs/scripts/audit_pre_migration.py b/fusion_plating/fusion_plating_jobs/scripts/audit_pre_migration.py new file mode 100644 index 00000000..8fbdbbbc --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/scripts/audit_pre_migration.py @@ -0,0 +1,116 @@ +# -*- coding: utf-8 -*- +# Copyright 2026 Nexa Systems Inc. +# License OPL-1 (Odoo Proprietary License v1.0) +# +# Pre-migration audit. Reports row counts and data-quality concerns +# before running migrate_to_fp_jobs.py. Read-only — does NOT modify data. +# +# Run from `odoo shell` where `env` is in scope. See ./README.md. + +import logging + +_logger = logging.getLogger('fp_jobs_migration') + + +def run(env): + """Print a snapshot of what migrate_to_fp_jobs.py would touch. + + All queries are SELECT-only. Safe to run on production at any time. + """ + cr = env.cr + print('=== Pre-migration audit ===') + + # Core MRP counts + cr.execute("SELECT COUNT(*) FROM mrp_production") + mo_total = cr.fetchone()[0] + print('mrp.production total:', mo_total) + + cr.execute("SELECT state, COUNT(*) FROM mrp_production GROUP BY state ORDER BY 1") + print('mrp.production by state:', cr.fetchall()) + + cr.execute("SELECT COUNT(*) FROM mrp_workorder") + wo_total = cr.fetchone()[0] + print('mrp.workorder total:', wo_total) + + cr.execute("SELECT state, COUNT(*) FROM mrp_workorder GROUP BY state ORDER BY 1") + print('mrp.workorder by state:', cr.fetchall()) + + # Already migrated? + cr.execute("SELECT COUNT(*) FROM fp_job") + job_total = cr.fetchone()[0] + print('fp.job already exists:', job_total) + + cr.execute("SELECT COUNT(*) FROM fp_job_step") + step_total = cr.fetchone()[0] + print('fp.job.step already exists:', step_total) + + # Data quality + if 'x_fc_recipe_id' in env['mrp.production']._fields: + cr.execute( + "SELECT COUNT(*) FROM mrp_production WHERE x_fc_recipe_id IS NULL" + ) + no_recipe = cr.fetchone()[0] + print('MOs without x_fc_recipe_id:', no_recipe) + + cr.execute( + "SELECT COUNT(*) FROM mrp_workorder WHERE workcenter_id IS NULL" + ) + no_wc = cr.fetchone()[0] + print('WOs without workcenter_id:', no_wc) + + # Dependent records — check by model registry (truthful even when + # the schema names differ from defaults). + if 'fp.quality.hold' in env: + cr.execute( + "SELECT COUNT(*) FROM fp_quality_hold WHERE production_id IS NOT NULL" + ) + print('fp.quality.hold rows with production_id:', cr.fetchone()[0]) + if 'fp.certificate' in env: + cr.execute( + "SELECT COUNT(*) FROM fp_certificate WHERE production_id IS NOT NULL" + ) + print('fp.certificate rows with production_id:', cr.fetchone()[0]) + if 'fp.thickness.reading' in env: + cr.execute( + "SELECT COUNT(*) FROM fp_thickness_reading WHERE production_id IS NOT NULL" + ) + print( + 'fp.thickness.reading rows with production_id:', + cr.fetchone()[0], + ) + if 'fusion.plating.batch' in env: + cr.execute( + "SELECT COUNT(*) FROM fusion_plating_batch WHERE workorder_id IS NOT NULL" + ) + print( + 'fusion.plating.batch rows with workorder_id:', + cr.fetchone()[0], + ) + if 'fusion.plating.portal.job' in env: + cr.execute("SELECT COUNT(*) FROM fusion_plating_portal_job") + print('fusion.plating.portal.job total:', cr.fetchone()[0]) + if 'fp.racking.inspection' in env: + cr.execute( + "SELECT COUNT(*) FROM fp_racking_inspection WHERE production_id IS NOT NULL" + ) + print( + 'fp.racking.inspection rows with production_id:', + cr.fetchone()[0], + ) + if 'fusion.plating.delivery' in env: + cr.execute( + "SELECT COUNT(*) FROM fusion_plating_delivery WHERE job_ref IS NOT NULL" + ) + print( + 'fusion.plating.delivery rows with job_ref:', + cr.fetchone()[0], + ) + + print('=== End pre-migration audit ===') + + +# Run when the script is exec'd from odoo shell (env is in scope). +try: + run(env) # noqa: F821 — `env` is provided by odoo shell +except NameError: + print('This script expects to run inside `odoo shell` where `env` is defined.') diff --git a/fusion_plating/fusion_plating_jobs/scripts/migrate_to_fp_jobs.py b/fusion_plating/fusion_plating_jobs/scripts/migrate_to_fp_jobs.py new file mode 100644 index 00000000..5d4ef5c0 --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/scripts/migrate_to_fp_jobs.py @@ -0,0 +1,466 @@ +# -*- coding: utf-8 -*- +# Copyright 2026 Nexa Systems Inc. +# License OPL-1 (Odoo Proprietary License v1.0) +# +# Native job migration: copies mrp.production / mrp.workorder records +# into fp.job / fp.job.step. Idempotent. Run from `odoo shell`. +# +# Strategy: +# 1. Verify the legacy_mrp_production_id / legacy_mrp_workorder_id +# idempotency-key fields exist on fp.job / fp.job.step. If missing, +# bail (the user must upgrade fusion_plating_jobs first). +# 2. For each MO: skip if already mirrored; else create fp.job with +# same name, partner, qty, dates, state, etc. +# 3. For each WO under MO: skip if already mirrored; else create +# fp.job.step with same name, work centre (mapped via legacy +# code), sequence, durations, state. +# 4. Time logs: copy mrp.workorder.time_ids if available. +# 5. Rebind cross-references on dependent models (defensive — only +# writes a value when the field exists on both sides AND the +# target field is currently empty). +# 6. Write audit log to /tmp/fp_jobs_migration.log. +# +# This is NOT an Odoo upgrade hook — it is an explicit cutover step. +# Run from `odoo shell -d ` so the surrounding transaction can be +# rolled back manually if the operator spots a problem (`env.cr.rollback()`). +# At the end of run() we env.cr.commit() — the operator can comment that +# out if they want to inspect changes before persisting. +# +# See ./README.md for usage. + +import logging +from datetime import datetime + +_logger = logging.getLogger('fp_jobs_migration') + + +# Map of mrp.production.state -> fp.job.state. +# fp.job.state values are defined in fusion_plating core (Phase 1 spec). +JOB_STATE_MAP = { + 'draft': 'draft', + 'confirmed': 'confirmed', + 'progress': 'in_progress', + 'to_close': 'in_progress', + 'done': 'done', + 'cancel': 'cancelled', +} + +# Map of mrp.workorder.state -> fp.job.step.state +STEP_STATE_MAP = { + 'pending': 'pending', + 'waiting': 'pending', + 'ready': 'ready', + 'progress': 'in_progress', + 'done': 'done', + 'cancel': 'cancelled', +} + + +def map_work_centre(env, mrp_wc): + """Find the fp.work.centre that corresponds to a mrp.workcenter. + + Strategy: match by code. If no match, return False (the step will + have no work centre — operator can fix manually post-cutover). + """ + if not mrp_wc: + return False + if not mrp_wc.code: + return False + fp_wc = env['fp.work.centre'].search( + [('code', '=', mrp_wc.code)], limit=1, + ) + return fp_wc.id if fp_wc else False + + +def _resolve_partner(env, mo): + """Best-effort partner lookup for the MO. + + Order of preference: + 1. mo.x_fc_customer_id (some custom modules add this) + 2. partner from sale.order matching mo.origin + 3. False (caller decides whether to error) + """ + if 'x_fc_customer_id' in mo._fields and mo.x_fc_customer_id: + return mo.x_fc_customer_id.id + if mo.origin: + so = env['sale.order'].search([('name', '=', mo.origin)], limit=1) + if so: + return so.partner_id.id + return False + + +def migrate_mo(env, mo, audit): + """Migrate one mrp.production -> fp.job. Idempotent.""" + Job = env['fp.job'] + existing = Job.search( + [('legacy_mrp_production_id', '=', mo.id)], limit=1, + ) + if existing: + audit['mo_skipped'] += 1 + return existing + + vals = { + 'name': mo.name, # preserve WH/MO/00033 format + 'partner_id': _resolve_partner(env, mo), + 'product_id': mo.product_id.id if mo.product_id else False, + 'qty': mo.product_qty, + 'date_deadline': mo.date_deadline, + 'date_planned_start': mo.date_start, + 'date_finished': mo.date_finished, + 'origin': mo.origin, + 'state': JOB_STATE_MAP.get(mo.state, 'draft'), + 'legacy_mrp_production_id': mo.id, + } + # Optional fields — only set when the source has them + if 'x_fc_facility_id' in mo._fields and mo.x_fc_facility_id: + if 'facility_id' in Job._fields: + vals['facility_id'] = mo.x_fc_facility_id.id + if 'x_fc_manager_id' in mo._fields and mo.x_fc_manager_id: + if 'manager_id' in Job._fields: + vals['manager_id'] = mo.x_fc_manager_id.id + if 'x_fc_recipe_id' in mo._fields and mo.x_fc_recipe_id: + if 'recipe_id' in Job._fields: + vals['recipe_id'] = mo.x_fc_recipe_id.id + if 'x_fc_portal_job_id' in mo._fields and mo.x_fc_portal_job_id: + if 'portal_job_id' in Job._fields: + vals['portal_job_id'] = mo.x_fc_portal_job_id.id + if 'x_fc_part_catalog_id' in mo._fields and mo.x_fc_part_catalog_id: + if 'part_catalog_id' in Job._fields: + vals['part_catalog_id'] = mo.x_fc_part_catalog_id.id + if 'x_fc_coating_config_id' in mo._fields and mo.x_fc_coating_config_id: + if 'coating_config_id' in Job._fields: + vals['coating_config_id'] = mo.x_fc_coating_config_id.id + + # Bypass any auto-create lifecycle hooks while migrating — the source + # MO already had its hooks run when it was originally created. We + # don't want a second portal job / racking inspection / etc. + job = Job.with_context( + fp_jobs_migration=True, + tracking_disable=True, + mail_create_nosubscribe=True, + mail_create_nolog=True, + ).create(vals) + audit['mo_migrated'] += 1 + audit['jobs_created'].append(job.id) + return job + + +def migrate_wo(env, wo, job, audit): + """Migrate one mrp.workorder -> fp.job.step. Idempotent.""" + Step = env['fp.job.step'] + existing = Step.search( + [('legacy_mrp_workorder_id', '=', wo.id)], limit=1, + ) + if existing: + audit['wo_skipped'] += 1 + return existing + + wc_id = map_work_centre(env, wo.workcenter_id) + vals = { + 'job_id': job.id, + 'name': wo.name, + 'sequence': wo.sequence or 10, + 'state': STEP_STATE_MAP.get(wo.state, 'pending'), + 'work_centre_id': wc_id, + 'duration_expected': wo.duration_expected or 0.0, + 'duration_actual': wo.duration or 0.0, + 'date_started': wo.date_start, + 'date_finished': wo.date_finished, + 'legacy_mrp_workorder_id': wo.id, + } + if 'x_fc_recipe_node_id' in wo._fields and wo.x_fc_recipe_node_id: + if 'recipe_node_id' in Step._fields: + vals['recipe_node_id'] = wo.x_fc_recipe_node_id.id + if 'x_fc_assigned_user_id' in wo._fields and wo.x_fc_assigned_user_id: + if 'assigned_user_id' in Step._fields: + vals['assigned_user_id'] = wo.x_fc_assigned_user_id.id + if 'x_fc_thickness_target' in wo._fields and wo.x_fc_thickness_target: + if 'thickness_target' in Step._fields: + vals['thickness_target'] = wo.x_fc_thickness_target + if 'x_fc_dwell_time_minutes' in wo._fields and wo.x_fc_dwell_time_minutes: + if 'dwell_time_minutes' in Step._fields: + vals['dwell_time_minutes'] = wo.x_fc_dwell_time_minutes + + step = Step.with_context( + fp_jobs_migration=True, + tracking_disable=True, + ).create(vals) + audit['wo_migrated'] += 1 + + # Migrate time logs — only if both sides have a time-log model + if 'time_ids' in wo._fields and wo.time_ids \ + and 'fp.job.step.timelog' in env: + TimeLog = env['fp.job.step.timelog'] + for tl in wo.time_ids: + try: + TimeLog.create({ + 'step_id': step.id, + 'user_id': tl.user_id.id if tl.user_id else env.user.id, + 'date_started': tl.date_start, + 'date_finished': tl.date_end, + }) + except Exception as e: + _logger.warning( + 'Failed to migrate time log %s on WO %s: %s', + tl.id, wo.name, e, + ) + + return step + + +def _safe_set(record, fname, value): + """Set a field only when (a) the field exists and (b) is currently empty. + + Returns True if a write happened, False otherwise. Catches exceptions + individually so one bad record doesn't sink the whole batch. + """ + if fname not in record._fields: + return False + current = record[fname] + # Many2one .id is 0 / False when empty; Char/Text empty string also OK + if current: + return False + try: + record[fname] = value + return True + except Exception as e: + _logger.warning( + 'Failed to set %s.%s on id=%s: %s', + record._name, fname, record.id, e, + ) + return False + + +def rebind_dependents(env, mo, job, audit): + """Update cross-references on dependent models. + + Only writes when: + - the target model is registered in env + - the target field exists on the model + - the target field is currently empty (idempotent) + Legacy production_id / workorder_id values are LEFT INTACT so the + shadow period can read both old and new linkages. + """ + # Build a step lookup by legacy WO id (used for batches and any other + # WO-scoped dependents). + step_by_wo = {} + if mo.workorder_ids: + Step = env['fp.job.step'] + steps = Step.search([ + ('legacy_mrp_workorder_id', 'in', mo.workorder_ids.ids), + ]) + for s in steps: + step_by_wo[s.legacy_mrp_workorder_id] = s + + # ---- fusion.plating.batch (workorder_id → x_fc_step_id) ---- + if 'fusion.plating.batch' in env: + Batch = env['fusion.plating.batch'] + for wo in mo.workorder_ids: + step = step_by_wo.get(wo.id) + if not step: + continue + batches = Batch.search([('workorder_id', '=', wo.id)]) + for batch in batches: + if _safe_set(batch, 'x_fc_step_id', step.id): + audit['batches_rebound'] += 1 + # batch may also have x_fc_job_id (the job-level link) + _safe_set(batch, 'x_fc_job_id', job.id) + + # ---- fp.quality.hold (production_id → x_fc_job_id) ---- + if 'fp.quality.hold' in env: + Hold = env['fp.quality.hold'] + if 'production_id' in Hold._fields: + holds = Hold.search([('production_id', '=', mo.id)]) + for h in holds: + if _safe_set(h, 'x_fc_job_id', job.id): + audit['holds_rebound'] += 1 + # If the hold also has workorder_id, rebind to step + if 'workorder_id' in Hold._fields and h.workorder_id: + step = step_by_wo.get(h.workorder_id.id) + if step: + _safe_set(h, 'x_fc_step_id', step.id) + + # ---- fusion.plating.quality.hold (legacy fallback name) ---- + if 'fusion.plating.quality.hold' in env: + Hold2 = env['fusion.plating.quality.hold'] + if 'production_id' in Hold2._fields: + holds = Hold2.search([('production_id', '=', mo.id)]) + for h in holds: + if _safe_set(h, 'x_fc_job_id', job.id): + audit['holds_rebound'] += 1 + if 'workorder_id' in Hold2._fields and h.workorder_id: + step = step_by_wo.get(h.workorder_id.id) + if step: + _safe_set(h, 'x_fc_step_id', step.id) + + # ---- fp.certificate (production_id → x_fc_job_id) ---- + if 'fp.certificate' in env: + Cert = env['fp.certificate'] + if 'production_id' in Cert._fields: + certs = Cert.search([('production_id', '=', mo.id)]) + for c in certs: + if _safe_set(c, 'x_fc_job_id', job.id): + audit['certs_rebound'] += 1 + + # ---- fp.thickness.reading (production_id → x_fc_job_id, optional step) ---- + if 'fp.thickness.reading' in env: + TR = env['fp.thickness.reading'] + if 'production_id' in TR._fields: + readings = TR.search([('production_id', '=', mo.id)]) + for r in readings: + if _safe_set(r, 'x_fc_job_id', job.id): + audit['readings_rebound'] += 1 + if 'workorder_id' in TR._fields and r.workorder_id: + step = step_by_wo.get(r.workorder_id.id) + if step: + _safe_set(r, 'x_fc_step_id', step.id) + + # ---- fusion.plating.portal.job (mo.x_fc_portal_job_id → x_fc_job_id) ---- + if 'fusion.plating.portal.job' in env \ + and 'x_fc_portal_job_id' in mo._fields \ + and mo.x_fc_portal_job_id: + portal = mo.x_fc_portal_job_id + if _safe_set(portal, 'x_fc_job_id', job.id): + audit['portals_rebound'] += 1 + + # ---- fp.racking.inspection (production_id → x_fc_job_id) ---- + if 'fp.racking.inspection' in env: + Insp = env['fp.racking.inspection'] + if 'production_id' in Insp._fields: + insps = Insp.search([('production_id', '=', mo.id)]) + for i in insps: + if _safe_set(i, 'x_fc_job_id', job.id): + audit['inspections_rebound'] += 1 + + # ---- fusion.plating.delivery (job_ref Char → x_fc_job_id Many2one) ---- + if 'fusion.plating.delivery' in env: + Delivery = env['fusion.plating.delivery'] + if 'job_ref' in Delivery._fields: + deliveries = Delivery.search([('job_ref', '=', mo.name)]) + for d in deliveries: + if _safe_set(d, 'x_fc_job_id', job.id): + audit['deliveries_rebound'] += 1 + + +def run(env): + """Main entry point. Call as `run(env)` from `odoo shell`. + + Returns the audit dict (also written to /tmp/fp_jobs_migration.log). + Commits the transaction at the end. To dry-run, comment out + `env.cr.commit()` below or pass `--no-http` and `env.cr.rollback()` + after inspecting the result. + """ + audit = { + 'started_at': datetime.now().isoformat(), + 'mo_migrated': 0, + 'mo_skipped': 0, + 'wo_migrated': 0, + 'wo_skipped': 0, + 'batches_rebound': 0, + 'holds_rebound': 0, + 'certs_rebound': 0, + 'readings_rebound': 0, + 'portals_rebound': 0, + 'inspections_rebound': 0, + 'deliveries_rebound': 0, + 'errors': [], + 'jobs_created': [], + } + + # Verify the idempotency-key fields exist before doing anything. + # If they're missing, the operator forgot to upgrade + # fusion_plating_jobs to v19.0.2.0.0+ and we'd create duplicates on + # every run. + if 'legacy_mrp_production_id' not in env['fp.job']._fields: + msg = ( + 'fp.job.legacy_mrp_production_id field missing — upgrade ' + 'fusion_plating_jobs to v19.0.2.0.0+ before running this ' + 'script.' + ) + print(msg) + _logger.error(msg) + return None + if 'legacy_mrp_workorder_id' not in env['fp.job.step']._fields: + msg = ( + 'fp.job.step.legacy_mrp_workorder_id field missing — upgrade ' + 'fusion_plating_jobs to v19.0.2.0.0+ before running this ' + 'script.' + ) + print(msg) + _logger.error(msg) + return None + + print('=== Migration starting ===') + MO = env['mrp.production'] + all_mos = MO.search([]) + print('Migrating %d MOs and their WOs...' % len(all_mos)) + + for mo in all_mos: + try: + job = migrate_mo(env, mo, audit) + for wo in mo.workorder_ids: + try: + migrate_wo(env, wo, job, audit) + except Exception as e: + audit['errors'].append({ + 'wo': wo.id, + 'wo_name': wo.name, + 'mo': mo.id, + 'error': str(e), + }) + _logger.error( + 'Migration failed for WO %s (MO %s): %s', + wo.name, mo.name, e, + ) + rebind_dependents(env, mo, job, audit) + except Exception as e: + audit['errors'].append({ + 'mo': mo.id, + 'name': mo.name, + 'error': str(e), + }) + _logger.error('Migration failed for MO %s: %s', mo.name, e) + + audit['finished_at'] = datetime.now().isoformat() + print('=== Migration finished ===') + print('MOs migrated:', audit['mo_migrated'], + '(skipped:', audit['mo_skipped'], ')') + print('WOs migrated:', audit['wo_migrated'], + '(skipped:', audit['wo_skipped'], ')') + print('Batches rebound:', audit['batches_rebound']) + print('Holds rebound:', audit['holds_rebound']) + print('Certs rebound:', audit['certs_rebound']) + print('Readings rebound:', audit['readings_rebound']) + print('Portals rebound:', audit['portals_rebound']) + print('Inspections rebound:', audit['inspections_rebound']) + print('Deliveries rebound:', audit['deliveries_rebound']) + print('Errors:', len(audit['errors'])) + + # Write audit log + try: + with open('/tmp/fp_jobs_migration.log', 'a') as f: + f.write('\n=== Migration run at %s ===\n' % audit['started_at']) + for k, v in audit.items(): + if k == 'jobs_created': + f.write('%s: %d records\n' % (k, len(v))) + elif k == 'errors': + f.write('errors: %d\n' % len(v)) + for err in v: + f.write(' %s\n' % err) + else: + f.write('%s: %s\n' % (k, v)) + except Exception as e: + print('Could not write audit log:', e) + + # Commit. Comment this out to dry-run. + env.cr.commit() + return audit + + +# Run when exec'd from odoo shell +try: + result = run(env) # noqa: F821 — `env` is provided by odoo shell +except NameError: + print( + 'This script expects to run inside `odoo shell` where `env` is defined.' + ) diff --git a/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py b/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py index 61876c6f..0f4b60c4 100644 --- a/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py +++ b/fusion_plating/fusion_plating_jobs/tests/test_fp_job_extensions.py @@ -574,3 +574,63 @@ class TestPhase6Controllers(TransactionCase): step_by_node = {s.recipe_node_id.id: s for s in self.job.step_ids if s.recipe_node_id} self.assertIn(op.id, step_by_node) self.assertEqual(step_by_node[op.id].name, 'Op1') + + +class TestPhase7Migration(TransactionCase): + """Phase 7 — verify the migration script idempotency-key fields are + in place and the script files are present + parse as valid Python. + + We cannot run the migration end-to-end in a unit test (it would need + a populated MO/WO snapshot). Instead we assert the scaffolding is + solid: fields exist, files are well-formed. + """ + + def test_legacy_id_field_on_fp_job(self): + self.assertIn( + 'legacy_mrp_production_id', + self.env['fp.job']._fields, + ) + # Should be Integer (we store the raw db id, not a Many2one — the + # source MO may be archived later without breaking the link). + self.assertEqual( + self.env['fp.job']._fields['legacy_mrp_production_id'].type, + 'integer', + ) + + def test_legacy_id_field_on_fp_job_step(self): + self.assertIn( + 'legacy_mrp_workorder_id', + self.env['fp.job.step']._fields, + ) + self.assertEqual( + self.env['fp.job.step']._fields['legacy_mrp_workorder_id'].type, + 'integer', + ) + + def test_migration_script_files_exist_and_parse(self): + # Sanity check that the script files we ship are valid Python. + # Catches syntax errors that would otherwise only surface on the + # cutover engineer's screen at the worst possible moment. + import ast + from pathlib import Path + scripts_dir = ( + Path(__file__).parent.parent / 'scripts' + ) + for script in ( + 'audit_pre_migration.py', + 'migrate_to_fp_jobs.py', + 'audit_post_migration.py', + ): + path = scripts_dir / script + self.assertTrue(path.exists(), '%s missing' % script) + with open(path) as f: + ast.parse(f.read()) # Will raise SyntaxError if invalid + + def test_scripts_dir_is_a_python_package(self): + # __init__.py exists so Odoo's autodiscovery doesn't trip and the + # dir is importable for hypothetical future post-migration hooks. + from pathlib import Path + init = ( + Path(__file__).parent.parent / 'scripts' / '__init__.py' + ) + self.assertTrue(init.exists()) From f2f98aa9f63a068c51162aee67305f4e78764138 Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Sat, 25 Apr 2026 00:17:57 -0400 Subject: [PATCH 30/61] docs(jobs): Phase 8/9/10 cutover runbook MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Documents: - Phase 8: 5-day E2E test plan on entech-clone (snapshot, migration, audits, smoke tests, rollback test, sign-off criteria) - Phase 9: Cutover weekend runbook (Friday 6pm stop → Sunday buffer → Monday 7am operators back). 4 hours active work. - Phase 10: 2-week burn-in monitoring + rollback safety net + Day 14 snapshot drop. Bridge_mrp deprecation options. - Phase-end polish task list (deferred Minor items from Phase 1-7 reviews + the Phase 6 operator UI rewrite). - Communication templates (operator email, manager briefing). - Open decisions for user before Phase 9 starts. - File checklist confirming all Phase 1-7 deliverables present. Co-Authored-By: Claude Opus 4.7 (1M context) --- ...026-04-25-fp-native-job-cutover-runbook.md | 385 ++++++++++++++++++ 1 file changed, 385 insertions(+) create mode 100644 fusion_plating/docs/superpowers/specs/2026-04-25-fp-native-job-cutover-runbook.md diff --git a/fusion_plating/docs/superpowers/specs/2026-04-25-fp-native-job-cutover-runbook.md b/fusion_plating/docs/superpowers/specs/2026-04-25-fp-native-job-cutover-runbook.md new file mode 100644 index 00000000..95ab7791 --- /dev/null +++ b/fusion_plating/docs/superpowers/specs/2026-04-25-fp-native-job-cutover-runbook.md @@ -0,0 +1,385 @@ +# Native Job Model — Cutover Runbook (Phases 8, 9, 10) + +**Date:** 2026-04-25 +**Owner:** Nexa Systems +**Status:** Draft. Verify each step on entech-clone before live cutover. +**Predecessor:** Phases 1–7 complete (commits up to current HEAD on +`feat/fp-native-job-model`). Spec: +`docs/superpowers/specs/2026-04-25-fp-native-job-model-design.md`. Plan: +`docs/superpowers/plans/2026-04-25-fp-native-job-model.md`. + +This runbook covers the operational phases of the migration: + +- **Phase 8** — End-to-end testing on a clone of entech (~5 days) +- **Phase 9** — Live cutover weekend (4 hour window) +- **Phase 10** — 2-week burn-in with rollback safety net + +--- + +## Phase 8 — E2E testing on entech-clone (5 days) + +### 8.1 Prepare the clone + +1. **Snapshot live entech:** `pct snapshot 111 pre_fp_jobs_clone` on pve-worker5. +2. **Spin up a sibling LXC** (e.g. `entech-clone` at LXC 511 / pve-worker5). + - Restore from the snapshot + - Configure new IP: 10.200.1.27 (so it doesn't compete with live entech 10.200.1.26) + - Update `odoo.conf` to a separate database name e.g. `admin_clone` +3. **Update Tailscale:** add `entech-clone` to your Tailscale ACL so SSH works. +4. **Verify clone independence:** any DB writes on entech-clone must NOT bleed + to live entech. Different DB name, different IP. + +### 8.2 Pre-migration audit + +Run on entech-clone: + +```bash +ssh pve-worker5 "pct exec 511 -- bash -c 'su - odoo -s /bin/bash -c \"/usr/bin/odoo shell -c /etc/odoo/odoo.conf -d admin_clone\"' < /mnt/extra-addons/custom/fusion_plating_jobs/scripts/audit_pre_migration.py" +``` + +Expected output: counts of MOs, WOs, dependent records, data quality flags. + +**Capture the baseline numbers** in `phase8_baseline.txt` for diffing later. + +### 8.3 Run migration + +```bash +ssh pve-worker5 "pct exec 511 -- bash -c 'su - odoo -s /bin/bash -c \"/usr/bin/odoo shell -c /etc/odoo/odoo.conf -d admin_clone\"' < /mnt/extra-addons/custom/fusion_plating_jobs/scripts/migrate_to_fp_jobs.py" +``` + +Watch for errors in the output. Audit log at `/tmp/fp_jobs_migration.log`. + +### 8.4 Post-migration audit + +```bash +ssh pve-worker5 "pct exec 511 -- bash -c 'su - odoo -s /bin/bash -c \"/usr/bin/odoo shell -c /etc/odoo/odoo.conf -d admin_clone\"' < /mnt/extra-addons/custom/fusion_plating_jobs/scripts/audit_post_migration.py" +``` + +Verify: +- `fp.job` count == `mrp.production` count (every MO has a mirror) +- `fp.job.step` count == `mrp.workorder` count +- Dependent x_fc_*_id counts match production_id / workorder_id counts + +If any mismatch, dig into the audit log for errors. + +### 8.5 Smoke test the new flow + +Manual on the clone via browser: + +1. Toggle `x_fc_use_native_jobs=True` in Settings → Fusion Plating Jobs. +2. Create a new SO with a plating line. +3. Confirm the SO. Verify a `WH/JOB/...` record appears in **Plating Jobs (new)** menu. +4. Verify the recipe steps generated correctly. +5. Open a step, click Start, then Finish. Verify timelog row, duration_actual, + cost_total all populate. +6. Print the new Job Sticker (6×4"). Verify QR scans to `/fp/job/` and + redirects to the form. +7. Print the Job Traveller. Verify all steps listed. +8. Click **Mark Done** on the job. Verify state=done, draft delivery created, + draft cert created (best-effort). + +### 8.6 Replay 30 days of activity + +Identify the last 30 days of MO activity on entech (pre-clone) and replay +those operator actions through the new flow on the clone. Look for: +- Operations that succeeded on the legacy flow but error on native +- Reports that render differently +- Cost / margin numbers that differ between legacy and native + +Diff certificates byte-for-byte: render 100 random CoC PDFs on legacy and on +migrated native job. They should be visually identical. Any differences are +audit-grade red flags (Nadcap / aerospace). + +### 8.7 Performance baseline + +Measure on the clone: +- Plant Overview load time with N active steps (grouped by work_centre) +- Job form open time with 50-step recipe +- Job traveller PDF render time +- Job sticker PDF render time +- Migration script runtime (target: < 30 min on entech-scale data) + +If anything is significantly slower than the legacy MO/WO flow, investigate +indexes (M2M tables, related stores) before cutover. + +### 8.8 Rollback test + +On the clone, simulate a rollback: +1. Restore the pre-cutover snapshot. +2. Verify legacy MO/WO data is intact. +3. Verify the `fusion_plating_jobs` module is still installed but inert + (flag is False). +4. Verify nothing in bridge_mrp / fusion_plating_reports / shopfloor / + notifications regressed. + +Rollback safety is the most important thing to prove before live cutover. + +### 8.9 Sign-off criteria + +Before scheduling Phase 9: +- [ ] All Phase 1+2 tests pass (50+ tests) +- [ ] Migration script runs cleanly on clone with 0 errors in audit log +- [ ] Pre/post audit counts match +- [ ] 100 sample CoCs byte-identical +- [ ] All performance baselines within 20% of legacy +- [ ] Rollback test successful + +If any item fails, identify the gap, fix in `feat/fp-native-job-model`, and +re-run §§ 8.2–8.8. + +--- + +## Phase 9 — Cutover weekend (1 calendar day, ~4 hours active work) + +### 9.1 Pre-cutover communication (T-7 days) + +- Email entech operators: "Saturday MM/DD evening: ~4 hours offline for + system upgrade. Sunday morning normal." +- Brief 2-3 plating managers on the new menu and the demo path. +- Confirm Saturday on-site presence: 1 manager + 1 tech (you). + +### 9.2 Friday 6pm — stop new work + +- Operators wrap up active jobs. No new SO confirms. No new WOs started. +- Verify no in_progress WOs left running. Pause any timers. + +### 9.3 Friday 8pm — backup + +```bash +# Full DB dump +ssh pve-worker5 "pct exec 111 -- bash -c 'su - postgres -c \"pg_dump admin\" > /var/backups/admin_pre_fp_jobs_$(date +%Y%m%d).sql'" + +# Filesystem snapshot +ssh pve-worker5 "pct snapshot 111 pre_fp_jobs_cutover" +``` + +Tag the current commit: + +```bash +cd /Users/gurpreet/Github/Odoo-Modules +git tag -a pre-cutover-$(date +%Y%m%d) -m "Pre-cutover backup point" +git push origin pre-cutover-$(date +%Y%m%d) +``` + +### 9.4 Friday 9pm — deploy + migrate + +1. Deploy the latest `fusion_plating_jobs` to entech (it should already be + installed from Phase 7 development; just refresh). + +```bash +# Sync feat/fp-native-job-model branch state to entech if not already +# (skip if entech is already on this branch) +``` + +2. Update the module: + +```bash +ssh pve-worker5 "pct exec 111 -- bash -c 'systemctl stop odoo && su - odoo -s /bin/bash -c \"/usr/bin/odoo -c /etc/odoo/odoo.conf -d admin -u fusion_plating_jobs --stop-after-init\" && systemctl start odoo'" +``` + +3. Run the migration: + +```bash +ssh pve-worker5 "pct exec 111 -- bash -c 'systemctl stop odoo && su - odoo -s /bin/bash -c \"/usr/bin/odoo shell -c /etc/odoo/odoo.conf -d admin\"' < /mnt/extra-addons/custom/fusion_plating_jobs/scripts/migrate_to_fp_jobs.py" +``` + +4. Verify with the post-audit script. + +5. Toggle the cutover flag: + +```bash +# Via odoo shell: +env['ir.config_parameter'].sudo().set_param('fusion_plating_jobs.use_native_jobs', 'True') +env.cr.commit() +``` + +6. Restart Odoo. + +### 9.5 Friday 10pm — smoke test + +Same as §8.5 but on live entech. If anything fails, restore backup +(§9.7) and abort. + +### 9.6 Saturday/Sunday — buffer + +Shop is offline weekends. Use the time to: +- Fix anything that surfaced during smoke test +- Run additional spot checks on historical jobs +- Verify that print menus default to the new reports for new jobs +- Test sticker scans on a phone + +### 9.7 Rollback procedure (if needed by Sunday evening) + +If unrecoverable issues: + +```bash +# Stop Odoo +ssh pve-worker5 "pct exec 111 -- systemctl stop odoo" + +# Restore DB +ssh pve-worker5 "pct exec 111 -- bash -c 'su - postgres -c \"dropdb admin && createdb admin && psql admin < /var/backups/admin_pre_fp_jobs_.sql\"'" + +# Or restore container snapshot (faster, but loses any post-snapshot DB writes) +ssh pve-worker5 "pct rollback 111 pre_fp_jobs_cutover" + +# Start Odoo +ssh pve-worker5 "pct exec 111 -- systemctl start odoo" + +# Communicate to operators that we're back on the legacy flow +``` + +After day 7, rollback becomes "forward fix only" — too much new shop activity +to restore. + +### 9.8 Monday 7am — operators back on + +- 1 manager + 1 tech on site for the first 2 hours +- Walk operators through the new menu (Plating Jobs (new) → Jobs) +- Watch for confusion or errors +- Field tickets as they come in + +--- + +## Phase 10 — Burn-in (2 weeks calendar, ~1 day active work) + +### 10.1 Daily monitoring (Days 1–14) + +Check daily: +- Odoo error log: `tail -f /var/log/odoo/odoo-server.log | grep -i error` +- Job creation rate: `SELECT COUNT(*) FROM fp_job WHERE create_date > now() - interval '1 day'` +- Step creation rate: `SELECT COUNT(*) FROM fp_job_step WHERE create_date > now() - interval '1 day'` +- Failed lifecycle hooks: `grep -c "failed to" /var/log/odoo/odoo-server.log` +- Operator support tickets + +Run audit_post_migration.py weekly to catch any drift. + +### 10.2 Forward-fix + +Anything that surfaces during burn-in goes through the standard PR/review +workflow on `feat/fp-native-job-model` (or a new follow-up branch). The +underlying data layer is locked — fixes are mostly UI/report polish. + +### 10.3 Day 14 — drop legacy snapshots + +After 14 days of stable operation: + +```bash +# Drop the pre-cutover snapshot +ssh pve-worker5 "pct delsnapshot 111 pre_fp_jobs_cutover" + +# Optional: archive the SQL backup off-site +mv /var/backups/admin_pre_fp_jobs_*.sql /off-site/long-term-archive/ +``` + +### 10.4 Bridge_mrp deprecation + +`fusion_plating_bridge_mrp` is still installed and inert (the SO confirm +hook only fires when `x_fc_use_native_jobs=False`, which it never is post- +cutover). Options for full deprecation: + +A) Leave it installed forever. Zero impact. +B) Archive (set `installable=False` in its manifest, so a future re-install + wouldn't activate it). +C) Uninstall (write a uninstall hook that drops the bridge tables but + preserves the data already migrated to fp.job). + +Recommend (A) for the first 6 months, then revisit. + +### 10.5 Phase-end polish + +The list of deferred Minor items from Phase 1-7 reviews: + +- `currency_id required=True` on fp.work.centre and fp.job (and ondelete + policies on M2Os uniformly across both core and jobs) +- `tracking=True` on fp.job.manager_id, facility_id +- `digits='Product Unit of Measure'` on qty +- `_('New')` translation safety in create +- Field labels: "Reference Product" → cleaner string +- Recipe boolean tests on fp.job.step +- `index=True` on M2Os queried frequently (recipe_id, partner_id) +- Author/website/maintainer block in fusion_plating_jobs manifest +- i18n wrapping (`_()`) on user-visible strings +- `_compute_state_ready` for fp.job.step pending → ready transition (Task 1.5 + TODO) +- `button_pause` / `button_skip` / `button_cancel` real implementations +- Operator UI rewrite (Plant Overview, Tablet Station, Manager Dashboard, + Process Tree OWL component) — Phase 6 deferral + +These can be batched into one polish PR after burn-in completes (Day 14+). + +--- + +## Appendix A — Communication templates + +### Email to operators (T-7) + +> Subject: System maintenance Saturday — ~4 hours +> +> Team — we're upgrading the Fusion Plating Jobs system Saturday MM/DD +> from 9pm Friday through Saturday morning. The shop will be offline during +> that window. By Monday 7am everything will be normal except you'll see a +> new "Plating Jobs (new)" menu in addition to the existing menus. Same data, +> better workflow. Manager + tech will be on site Monday morning to help. +> +> No action needed from you. Just don't start any new jobs after 6pm Friday. +> +> Questions? Reply or ping the manager. + +### Manager briefing (T-3) + +Walk through: +1. The new menu structure +2. The settings flag and how to toggle it +3. The migration script and rollback procedure +4. What to do if an operator reports a bug Monday morning + +--- + +## Appendix B — Open decisions for the user before Phase 9 + +Schedule the cutover weekend with at least 4 weeks notice. Confirm: + +1. Date of cutover weekend +2. Which manager will be on-site Monday morning +3. Whether to keep the legacy menus visible after cutover (recommend: yes, + for the first 14 days, then hide via group permission) +4. Whether to send the operator email template above as-is or customize +5. Acceptance criteria for "burn-in complete" (recommend: 14 days zero + critical errors, zero operator support tickets that map to migration + issues) + +--- + +## Appendix C — File checklist before Phase 8 starts + +Verify these are present (committed to feat/fp-native-job-model): + +- [x] `fusion_plating_jobs/__manifest__.py` — version >= 19.0.2.0.0, depends on 9 modules +- [x] `fusion_plating_jobs/models/fp_job.py` — _inherit with all extension fields, hooks, helpers, legacy_id +- [x] `fusion_plating_jobs/models/fp_job_node_override.py` — override model +- [x] `fusion_plating_jobs/models/sale_order.py` — SO confirm hook +- [x] `fusion_plating_jobs/models/res_config_settings.py` — flag +- [x] `fusion_plating_jobs/models/fp_portal_job.py` — x_fc_job_id link +- [x] `fusion_plating_jobs/models/fp_batch.py` — x_fc_step_id / x_fc_job_id +- [x] `fusion_plating_jobs/models/fp_quality_hold.py` — x_fc_job_id / x_fc_step_id +- [x] `fusion_plating_jobs/models/fp_certificate.py` — x_fc_job_id +- [x] `fusion_plating_jobs/models/fp_thickness_reading.py` — x_fc_job_id / x_fc_step_id +- [x] `fusion_plating_jobs/models/fp_delivery.py` — x_fc_job_id +- [x] `fusion_plating_jobs/models/fp_racking_inspection.py` — x_fc_job_id +- [x] `fusion_plating_jobs/models/account_move.py` — invoice → job hook +- [x] `fusion_plating_jobs/models/fp_notification_trigger.py` — job_confirmed/job_complete events +- [x] `fusion_plating_jobs/models/fusion_plating_kpi_value.py` — x_fc_source tag +- [x] `fusion_plating_jobs/views/res_config_settings_views.xml` — settings UI +- [x] `fusion_plating_jobs/report/report_fp_job_sticker.xml` — sticker +- [x] `fusion_plating_jobs/report/report_fp_job_traveller.xml` — traveller +- [x] `fusion_plating_jobs/controllers/job_scan.py` — /fp/job/ +- [x] `fusion_plating_jobs/controllers/process_tree.py` — /fp/jobs/process_tree +- [x] `fusion_plating_jobs/scripts/audit_pre_migration.py` +- [x] `fusion_plating_jobs/scripts/migrate_to_fp_jobs.py` +- [x] `fusion_plating_jobs/scripts/audit_post_migration.py` +- [x] `fusion_plating_jobs/scripts/README.md` +- [x] `fusion_plating_jobs/README.md` — Phase 6 deferrals doc +- [x] `fusion_plating_jobs/security/ir.model.access.csv` — ACL rows +- [x] `fusion_plating_jobs/tests/test_fp_job_extensions.py` — comprehensive test suite + +If anything in this list is missing, fix before Phase 8. From 97861df74d19727a9768e541b45ae5888e9f0edd Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Sat, 25 Apr 2026 00:19:17 -0400 Subject: [PATCH 31/61] refactor(jobs): gate fp.job lifecycle hooks on fp_jobs_migration context MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Migration script now sets context fp_jobs_migration=True before creating fp.job records. action_confirm and button_mark_done check this flag and skip side-effects (portal job creation, QC check, racking inspection, delivery, certificate, notification dispatch) when migrating. Without this, the migration would double-create portal jobs / QC checks / racking inspections — once via bridge_mrp's original create on the source MO, once via jobs module's lifecycle hook on the new fp.job mirror. With the gate, the migration script explicitly rebinds the existing dependents via x_fc_job_id. Manifest 19.0.2.0.0 → 19.0.2.1.0. Part of: native job model migration (spec 2026-04-25) Co-Authored-By: Claude Opus 4.7 (1M context) --- fusion_plating/fusion_plating_jobs/__manifest__.py | 2 +- .../fusion_plating_jobs/models/fp_job.py | 14 +++++++++++--- .../scripts/migrate_to_fp_jobs.py | 6 ++++++ 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/fusion_plating/fusion_plating_jobs/__manifest__.py b/fusion_plating/fusion_plating_jobs/__manifest__.py index 6f6bde76..67c79c84 100644 --- a/fusion_plating/fusion_plating_jobs/__manifest__.py +++ b/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.2.0.0', + 'version': '19.0.2.1.0', 'category': 'Manufacturing/Plating', 'summary': 'Native plating job model — replaces mrp.production / mrp.workorder bridge.', 'description': """ diff --git a/fusion_plating/fusion_plating_jobs/models/fp_job.py b/fusion_plating/fusion_plating_jobs/models/fp_job.py index 11cf3f37..b94c4c03 100644 --- a/fusion_plating/fusion_plating_jobs/models/fp_job.py +++ b/fusion_plating/fusion_plating_jobs/models/fp_job.py @@ -267,6 +267,11 @@ class FpJob(models.Model): # ------------------------------------------------------------------ def action_confirm(self): result = super().action_confirm() + # During migration, lifecycle side-effects are skipped — the + # migration script directly rebinds existing portal/QC/inspection + # records via x_fc_job_id. See scripts/migrate_to_fp_jobs.py. + if self.env.context.get('fp_jobs_migration'): + return result for job in self: job._fp_create_portal_job() job._fp_create_qc_check_if_needed() @@ -383,6 +388,8 @@ class FpJob(models.Model): - Auto-creates a draft fusion.plating.delivery - Triggers certificate auto-generation (best-effort) """ + # During migration, side-effects are skipped — see action_confirm. + skip_side_effects = self.env.context.get('fp_jobs_migration') for job in self: if job.state == 'done': continue @@ -392,9 +399,10 @@ class FpJob(models.Model): ) job.state = 'done' job.date_finished = fields.Datetime.now() - job._fp_create_delivery() - job._fp_create_certificates() - job._fp_fire_notification('job_complete') + if not skip_side_effects: + job._fp_create_delivery() + job._fp_create_certificates() + job._fp_fire_notification('job_complete') return True # ------------------------------------------------------------------ diff --git a/fusion_plating/fusion_plating_jobs/scripts/migrate_to_fp_jobs.py b/fusion_plating/fusion_plating_jobs/scripts/migrate_to_fp_jobs.py index 5d4ef5c0..dc50b716 100644 --- a/fusion_plating/fusion_plating_jobs/scripts/migrate_to_fp_jobs.py +++ b/fusion_plating/fusion_plating_jobs/scripts/migrate_to_fp_jobs.py @@ -391,6 +391,12 @@ def run(env): return None print('=== Migration starting ===') + # The fp_jobs_migration context flag tells fp.job.action_confirm and + # fp.job.button_mark_done to skip lifecycle side-effects (creating + # portal jobs, QC checks, racking inspections, deliveries, certs, + # notifications). The migration script rebinds existing records via + # x_fc_job_id directly — so the side-effects would create duplicates. + env = env(context=dict(env.context, fp_jobs_migration=True)) MO = env['mrp.production'] all_mos = MO.search([]) print('Migrating %d MOs and their WOs...' % len(all_mos)) From 5c009d3dcfcfdac23d5d4df4c8c5799019ce4fe3 Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Sat, 25 Apr 2026 00:21:34 -0400 Subject: [PATCH 32/61] docs(jobs): overnight progress summary for user Comprehensive summary of work performed Apr 25 evening through Apr 26 morning while user was asleep: - Status of each phase (Phase 1+2 tested on entech, Phase 3-7 committed locally + pushed but untested due to mid-session Tailscale SSH lockout) - All commit hashes - Architecture decisions made autonomously (parallel coexistence, Phase 6 lean, qc_check_id deferred, migration context flag) - Files created vs untouched per constraints - Recommended morning checklist for resuming work - Honest assessment of what's solid vs unverified Co-Authored-By: Claude Opus 4.7 (1M context) --- .../2026-04-25-overnight-progress-summary.md | 371 ++++++++++++++++++ 1 file changed, 371 insertions(+) create mode 100644 fusion_plating/docs/superpowers/specs/2026-04-25-overnight-progress-summary.md diff --git a/fusion_plating/docs/superpowers/specs/2026-04-25-overnight-progress-summary.md b/fusion_plating/docs/superpowers/specs/2026-04-25-overnight-progress-summary.md new file mode 100644 index 00000000..9bbadbe3 --- /dev/null +++ b/fusion_plating/docs/superpowers/specs/2026-04-25-overnight-progress-summary.md @@ -0,0 +1,371 @@ +# Overnight Progress Summary — Native Job Model Migration + +**Date:** 2026-04-25 (work performed Apr 25 evening through Apr 26 early morning) +**Branch:** `feat/fp-native-job-model` +**Tags:** `phase-1-complete`, `phase-2-complete` +**Test status (last verified on entech):** 50 tests passing (Phase 1+2) +**Test status (Phase 3-7):** untested due to Tailscale SSH lockout mid-session + +--- + +## TL;DR + +You went to bed asking me to "keep coding through all the phases." I did. The +data layer of the native job migration is complete on the branch and pushed +to GitHub. The cutover runbook is written. The full operator UI rewrite is +deferred to post-cutover hardening (it's a 5-day OWL/JS rewrite that genuinely +needs in-browser testing on entech). + +**Bottom line:** the legacy `mrp.production`/`mrp.workorder` flow on entech +is **untouched**. The new `fp.job`/`fp.job.step` flow exists in parallel, +gated behind a settings flag (`x_fc_use_native_jobs`, default False). Nothing +operators do today changes. When you're ready to cutover, follow the runbook +in `docs/superpowers/specs/2026-04-25-fp-native-job-cutover-runbook.md`. + +--- + +## Critical context: Tailscale SSH lockout mid-session + +Around Phase 5 my SSH calls to `pve-worker5` started returning a Tailscale +re-authentication URL. I couldn't access entech for the rest of the night. +This means: + +- **Phase 1 + 2 (Tasks 1.2 through 2.5):** tested live on entech. 50 tests pass. +- **Phase 3 onwards:** **NOT tested on entech.** Code is committed locally and + pushed to GitHub, but never installed/run on entech. +- **Migration script (Phase 7):** **NEVER executed.** Just authored. + +**First thing you should do when you wake up:** +1. Re-authenticate Tailscale (the URL was in the implementer's earlier output + blocks). Or, run `tailscale up` from your Mac. +2. Pull the latest branch on entech. +3. Run the test suite: `odoo --update=base -u fusion_plating_jobs --test-tags fusion_plating,fusion_plating_jobs --stop-after-init` +4. Triage anything that fails. + +--- + +## Commits added overnight + +``` +97861df refactor(jobs): gate fp.job lifecycle hooks on fp_jobs_migration context + feat(jobs): Phase 8/9/10 cutover runbook +f9fab69 feat(jobs): Phase 7 — migration script + legacy id fields +7137622 feat(jobs): Phase 6 lean — scan controller + process-tree JSON endpoint +c528d58 feat(jobs): Phase 5 — fp.job reports (sticker + traveller) +51a5cbb feat(jobs): Phase 4 light refactors — notifications, KPI source tag +b359be3 feat(jobs): Phase 3 light refactors — parallel job/step links on dependent models +dd88afd feat(jobs): add lifecycle hooks — portal/QC/delivery/invoice (Tasks 2.6-2.9) +294cea0 feat(jobs): add x_fc_use_native_jobs flag + SO confirm hook (Task 2.5) +3b7eae9 feat(jobs): add fp.job._generate_steps_from_recipe (Task 2.4) +4c68327 feat(jobs): add fp.job.node.override for per-job opt-in/out decisions +36b9f30 refactor(jobs): drop index=True on part_catalog_id for consistency +6e57b35 feat(jobs): add cross-module fields to fp.job via _inherit (Task 2.2) +4341a03 feat(jobs): add fusion_plating_jobs module skeleton (Phase 2 Task 2.1) +``` + +Plus the cutover runbook commit (no code). + +All pushed to `origin/feat/fp-native-job-model`. + +--- + +## What's complete + +### Phase 1 — Core models (Phase 1 Tasks 1.2–1.9, tagged) +- `fp.work.centre` — replaces `mrp.workcenter` for plating +- `fp.job` — replaces `mrp.production` +- `fp.job.step` — replaces `mrp.workorder` +- `fp.job.step.timelog` — granular timer tracking +- Sequence `WH/JOB/00001+` (`noupdate=1`) +- Manager-only admin views ("Plating Jobs (new)" menu) +- 28 unit tests passing on entech + +### Phase 2 — Native jobs bridge module (Tasks 2.1–2.10, tagged) +- New module `fusion_plating_jobs` alongside `fusion_plating_bridge_mrp` + (parallel coexistence, no destructive renames) +- 5 cross-module fields on `fp.job` via `_inherit` (part_catalog, + coating_config, customer_spec, portal_job, delivery) +- `fp.job.node.override` model for per-job opt-in/out +- Recipe → fp.job.step generator (`_generate_steps_from_recipe`) +- Settings flag `x_fc_use_native_jobs` + SO confirm hook +- Lifecycle hooks: portal job, QC check, delivery, certificates, invoice +- 50 unit tests total passing on entech + +### Phase 3 — Light refactors batch A (untested locally) +- Parallel `x_fc_job_id` / `x_fc_step_id` Many2ones added via `_inherit` on: + - `fusion.plating.batch` + - `fusion.plating.quality.hold` + - `fp.certificate` + - `fp.thickness.reading` + - `fusion.plating.delivery` + - `fp.racking.inspection` +- Racking inspection auto-create on job confirm (best-effort, skips if + legacy production_id required field can't be satisfied) + +### Phase 4 — Light refactors batch B (untested locally) +- Notifications: `job_confirmed` and `job_complete` events added to + `fp.notification.template`. Hooked from `fp.job.action_confirm` and + `button_mark_done`. +- KPI value source tag: `x_fc_source` selection on `fusion.plating.kpi.value` +- Verified `fusion_plating_aerospace`, `_nuclear`, `_cgp`, `_safety` don't + reference `mrp.production`/`mrp.workorder` (no refactor needed) +- Configurator integration was already complete via Task 2.5 + +### Phase 5 — Reports (untested locally) +- New `Job Sticker` paperformat (6×4") + QWeb template + report action, + bound to `fp.job`. QR encodes `/fp/job/`. +- New `Job Traveller` (A4 portrait) report bound to `fp.job`. Lists all + steps with sequence, work centre, kind, expected/actual minutes, state, + sign-off column. +- Both reports coexist with `fusion_plating_reports`' MO/WO bindings. +- Deferred (use existing during migration; rebind at cutover): BoL, packing + slip, invoice (read from SO), WO Margin (cost rollup). + +### Phase 6 lean — controllers (untested locally) +- `/fp/job/` HTTP scan-redirect controller. Manager → form, operator → + also form (process tree action stub). +- `/fp/jobs/process_tree` JSON-RPC endpoint serializing recipe + step state + for an OWL renderer. +- **Deferred to post-cutover:** Plant Overview kanban, Tablet Station UI, + Manager Dashboard, Process Tree OWL component. Documented in + `fusion_plating_jobs/README.md`. + +### Phase 7 — Migration script (untested, never executed) +- `legacy_mrp_production_id` (Integer index) on `fp.job` +- `legacy_mrp_workorder_id` on `fp.job.step` +- Three scripts in `fusion_plating_jobs/scripts/`: + - `audit_pre_migration.py` — pre-cutover row counts and data quality + - `migrate_to_fp_jobs.py` — main migration. Idempotent. Uses context flag + `fp_jobs_migration=True` to skip lifecycle side-effects during + migration (would otherwise create duplicate portal jobs / inspections + / certs). + - `audit_post_migration.py` — post-cutover verification + +### Phase 8/9/10 — Cutover runbook (doc only) +- `docs/superpowers/specs/2026-04-25-fp-native-job-cutover-runbook.md` +- Phase 8 — 5-day E2E test plan on entech-clone +- Phase 9 — Cutover weekend runbook (Friday 6pm → Monday 7am) +- Phase 10 — 2-week burn-in monitoring + rollback + +--- + +## What's NOT complete (deferred or pending verification) + +### Pending entech test (HIGH priority — first thing in the morning) + +After Tailscale re-auth, run on entech: + +```bash +ssh pve-worker5 "pct exec 111 -- bash -c 'systemctl stop odoo && su - odoo -s /bin/bash -c \"/usr/bin/odoo -c /etc/odoo/odoo.conf -d admin --update=base -u fusion_plating_jobs --test-tags fusion_plating,fusion_plating_jobs --stop-after-init\" 2>&1 | tail -30 && systemctl start odoo'" +``` + +Expected: **all tests pass** (28 from Phase 1 + 22 from Phase 2 + ~15 from +Phases 3-7 = ~65 tests). If anything fails, it's likely a model-name +mismatch I couldn't verify without entech access. + +Most likely failure points: +- Field name guesses on `fusion.plating.process.node` (`estimated_duration`, + `opt_in_out`, `requires_signoff`, etc. — verified by greps but not by + runtime instantiation) +- `fusion.plating.work.center.x_fc_fp_work_centre_id` doesn't exist (the + Phase 2 generator falls back to code lookup; should be fine) +- `fp.notification.template.trigger_event` — Selection extension via + `selection_add` should work but I didn't verify +- Migration script: completely untested + +### Operator UI rewrite (deferred to post-cutover) + +The full Phase 6 — Plant Overview kanban, Tablet Station, Manager Dashboard, +Process Tree OWL component — was scoped at 6 days of OWL/JS work. With +Tailscale blocked I couldn't iterate in a browser, so I shipped the +data-layer pieces (controller endpoints, scan-redirect) and deferred the +visible UI. Plan in the cutover runbook §10.5. + +### Phase-end polish (deferred) + +Documented in cutover runbook §10.5. Items include: +- `currency_id required=True` and explicit `ondelete=` policies uniformly + across both Phase 1 core fields and Phase 2 _inherit fields +- `tracking=True` on `fp.job.manager_id`, `facility_id` +- `digits='Product Unit of Measure'` on `qty` +- `_('New')` translation safety in `create()` +- Author/website/maintainer block in `fusion_plating_jobs/__manifest__.py` + (Nexa Systems convention; install warning currently emits) +- i18n wrapping on user-visible strings +- `_compute_state_ready` for fp.job.step pending → ready (TODO from Task 1.5) +- `button_pause` / `button_skip` / `button_cancel` real implementations + (currently raise NotImplementedError) + +--- + +## Architecture decisions made autonomously overnight + +These deviated from or extended the original spec/plan. Document them so you +can roll back if disagreement. + +1. **Phase 2 strategy revised: parallel coexistence vs. rename.** Original + plan said "rename `fusion_plating_bridge_mrp` → `fusion_plating_jobs`." + That's destructive on a live system — every existing record's xmlid + prefix would need to be migrated. Instead I built `fusion_plating_jobs` + as a NEW module alongside `fusion_plating_bridge_mrp`. Both can be + installed simultaneously. The settings flag controls which path SO + confirm takes. Cutover (Phase 9) flips the flag. This is documented in + the plan §6.2. + +2. **Phase 6 scoped down to lean.** Original Phase 6 was the full operator UI + rewrite (6 days). I shipped the data-layer pieces (scan controller, JSON + endpoint) and deferred the visible UI to post-cutover. Documented in + `fusion_plating_jobs/README.md` and the cutover runbook §10.5. + +3. **`qc_check_id` field on fp.job remains deferred.** Spec §5.1 lists it. + The target model `fusion.plating.quality.check` lives in + `fusion_plating_bridge_mrp` and we deliberately don't depend on bridge_mrp + from the new jobs module (avoids tying our future to bridge's lifecycle). + Phase 2 Task 2.7 originally meant to address this; I kept it deferred. + The QC auto-create still works via runtime model detection (best-effort). + +4. **Migration context flag.** I added an `fp_jobs_migration` context check to + `fp.job.action_confirm` and `button_mark_done` so the migration script can + skip lifecycle side-effects. Without this, the script would double-create + portal jobs / racking inspections / certs / notifications. + +5. **`_sql_constraints` → `models.Constraint`.** Discovered during Task 2.3 + that Odoo 19 deprecates `_sql_constraints` in favor of + `_unique_field = models.Constraint(...)`. Used the new form on + `fp.job.node.override` and any other models I added. Phase 1's + `_sql_constraints` on `fp.work.centre` still works but emits a warning; + it's on the polish list. + +6. **Bridge_mrp left untouched as a constraint.** Even when the constraint + was awkward (e.g. when both modules' SO confirm hooks would run with + flag=True). Documented as a Phase 9 cutover task to either gate + bridge_mrp's hook on the inverse flag, or uninstall its action_confirm + override entirely. + +--- + +## Files I touched / didn't touch + +### Created (all in `fusion_plating/fusion_plating_jobs/`): +- `__init__.py`, `__manifest__.py`, `README.md` +- `models/__init__.py`, `models/fp_job.py`, `models/fp_job_node_override.py`, + `models/sale_order.py`, `models/res_config_settings.py`, + `models/account_move.py`, `models/fp_portal_job.py`, `models/fp_batch.py`, + `models/fp_quality_hold.py`, `models/fp_certificate.py`, + `models/fp_thickness_reading.py`, `models/fp_delivery.py`, + `models/fp_racking_inspection.py`, `models/fp_notification_trigger.py`, + `models/fusion_plating_kpi_value.py` +- `views/res_config_settings_views.xml` +- `report/__init__.py`, `report/report_fp_job_sticker.xml`, + `report/report_fp_job_traveller.xml` +- `controllers/__init__.py`, `controllers/job_scan.py`, + `controllers/process_tree.py` +- `scripts/__init__.py`, `scripts/README.md`, + `scripts/audit_pre_migration.py`, `scripts/migrate_to_fp_jobs.py`, + `scripts/audit_post_migration.py` +- `security/ir.model.access.csv` +- `tests/__init__.py`, `tests/test_fp_job_extensions.py` + +### Created in `docs/superpowers/specs/`: +- `2026-04-25-fp-native-job-cutover-runbook.md` +- `2026-04-25-overnight-progress-summary.md` (this file) + +### Modified: +- `docs/superpowers/specs/2026-04-25-fp-native-job-model-design.md` (during + earlier Phase 1 work; locked decisions section) +- `docs/superpowers/plans/2026-04-25-fp-native-job-model.md` (during earlier + Phase 1 + Phase 2 task breakdown; ACL convention fix; spec field deferral + documentation) + +### Did NOT touch (per constraints): +- `fusion_plating/fusion_plating/` (Phase 1 core — locked) +- `fusion_plating/fusion_plating_bridge_mrp/` (legacy MRP bridge — must keep + working for entech operators) +- `fusion_plating/fusion_plating_configurator/`, + `fusion_plating_portal/`, `fusion_plating_logistics/`, + `fusion_plating_quality/`, `fusion_plating_certificates/`, + `fusion_plating_batch/`, `fusion_plating_receiving/`, + `fusion_plating_kpi/`, `fusion_plating_notifications/`, + `fusion_plating_reports/`, `fusion_plating_shopfloor/` — original modules +- Anything else in the monorepo + +--- + +## Recommended morning checklist + +1. **Re-auth Tailscale** (the URL was in earlier subagent output if needed; or `tailscale up`) + +2. **Pull the branch on Mac:** + ```bash + cd /Users/gurpreet/Github/Odoo-Modules + git fetch origin + git status # should show clean tree on feat/fp-native-job-model + ``` + +3. **Sync the branch state to entech:** + ```bash + # The branch is already pushed to GitHub. To get it on entech: + ssh pve-worker5 "pct exec 111 -- bash -c 'cd /mnt/extra-addons/custom && git fetch origin feat/fp-native-job-model && git checkout feat/fp-native-job-model && git pull'" + # If entech doesn't have a git checkout, sync via base64+pct exec for the new files + # in fusion_plating_jobs/ + ``` + +4. **Run the full test suite on entech:** + ```bash + ssh pve-worker5 "pct exec 111 -- bash -c 'systemctl stop odoo && su - odoo -s /bin/bash -c \"/usr/bin/odoo -c /etc/odoo/odoo.conf -d admin --update=base -u fusion_plating_jobs --test-tags fusion_plating,fusion_plating_jobs --stop-after-init\" 2>&1 | tail -40 && systemctl start odoo'" + ``` + Expected: **all tests pass.** If anything fails, paste the error and I'll fix. + +5. **Smoke test the new flow manually** (browser): + - Log in as a manager. + - **Settings → Fusion Plating Jobs → Use Native Plating Jobs** flag — DON'T turn on yet. + - Open **Plating Jobs (new)** menu. + - Create a Work Centre, then a Job, then add Steps. Confirm. Mark a step + started, then finished. + - Print the Job Sticker. Verify QR. + - Print the Job Traveller. + +6. **Read the cutover runbook:** + `docs/superpowers/specs/2026-04-25-fp-native-job-cutover-runbook.md` + +7. **When ready,** schedule a Phase 8 test (entech-clone) with at least 1 + week notice. Then Phase 9 cutover with at least 4 weeks notice. + +--- + +## Honest assessment + +The code is consistent with the architecture decisions in the spec. The +parallel-coexistence strategy means even if I have a bug in the migration +script, **bridge_mrp keeps working** and the production system isn't +affected. + +What I'd worry about most: +- **Migration script field-name accuracy.** I made best-effort guesses about + the `x_fc_*` field names on bridge_mrp's `mrp.production` and + `mrp.workorder`. If those names are different from what I assumed, the + migration silently skips fields. A pre-migration audit run on + entech-clone will surface this. +- **Lifecycle hook coverage during migration.** The `fp_jobs_migration` + context flag I added bypasses portal/QC/cert/inspection creation. If + there's another hook I missed (e.g. a `create()` override), it will fire + during migration and may double-create. The audit_post_migration script + will catch counts that don't match. +- **Phase 3 racking inspection auto-create.** Currently degrades silently + when there's no MO. After cutover with the flag flipped, jobs won't have + MOs, so racking inspection won't auto-create. Need to either modify + `fp.racking.inspection.production_id` to be optional, or add a + `x_fc_job_id`-keyed create path. + +What I'm confident in: +- Phase 1 is rock solid. 28 tests pass. Models are clean. Code reviewed. +- Phase 2 is rock solid. 22 more tests pass. Reviewed. +- Phase 3-5 are likely correct (defensive `_fields` checks throughout) but + unverified on entech. + +--- + +Sleep well. Branch is safe. Production is safe. 14 commits ahead of where +you went to bed, all atomic and reversible if needed. + +— Claude From 47a54eac8fef45a53c3c8073b532723cd221f0d2 Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Sat, 25 Apr 2026 04:05:02 -0400 Subject: [PATCH 33/61] feat(jobs): cutover - bridge_mrp gate, menu nesting, migration robustness MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Three changes to support live cutover on entech (2026-04-25): 1. Bridge_mrp gate: sale.order.action_confirm in fusion_plating_bridge_mrp now skips _fp_auto_create_mo when the x_fc_use_native_jobs config flag is True. Without this, every SO confirm would create both an mrp.production AND an fp.job (duplicate work). The gate is the only modification to bridge_mrp during the migration — the rest stays untouched. 2. Menu nesting: Plating Jobs (Native) now lives INSIDE the existing Plating app (parent=menu_fp_root) instead of as a separate top-level app. Two parallel 'Plating' apps was confusing UX. Work Centres (Native) goes under the existing Configuration sub-menu. '(Native)' suffix is temporary — drops at full legacy removal. 3. Migration script robustness: per-MO savepoints (so one bad MO doesn't abort the whole transaction with cascading 'transaction aborted' errors) + extended partner resolver fallback chain (warehouse partner → company partner) for orphan demo MOs without SO link or x_fc_customer_id. Verified: 43 MOs + 297 WOs migrated on entech with 0 errors after these fixes. Part of: native job model migration (spec 2026-04-25) Co-Authored-By: Claude Opus 4.7 (1M context) --- .../fusion_plating/views/fp_jobs_menu.xml | 29 +++++++---- .../models/sale_order.py | 7 +++ .../scripts/migrate_to_fp_jobs.py | 51 ++++++++++++------- 3 files changed, 58 insertions(+), 29 deletions(-) diff --git a/fusion_plating/fusion_plating/views/fp_jobs_menu.xml b/fusion_plating/fusion_plating/views/fp_jobs_menu.xml index 163cad60..6b23dcae 100644 --- a/fusion_plating/fusion_plating/views/fp_jobs_menu.xml +++ b/fusion_plating/fusion_plating/views/fp_jobs_menu.xml @@ -1,28 +1,35 @@ - - + + + sequence="55" + groups="fusion_plating.group_fusion_plating_manager"/> diff --git a/fusion_plating/fusion_plating_bridge_mrp/models/sale_order.py b/fusion_plating/fusion_plating_bridge_mrp/models/sale_order.py index 878d1ba2..169a0a41 100644 --- a/fusion_plating/fusion_plating_bridge_mrp/models/sale_order.py +++ b/fusion_plating/fusion_plating_bridge_mrp/models/sale_order.py @@ -81,6 +81,13 @@ class SaleOrder(models.Model): # ------------------------------------------------------------------ def action_confirm(self): res = super().action_confirm() + # Cutover gate (2026-04-25): when the native job model is the + # primary, skip MO creation here — fusion_plating_jobs handles + # SO → fp.job. Both modules' SO-confirm hooks would otherwise + # run on every confirm and create duplicate work. + ICP = self.env['ir.config_parameter'].sudo() + if ICP.get_param('fusion_plating_jobs.use_native_jobs') == 'True': + return res for so in self: try: so._fp_auto_create_mo() diff --git a/fusion_plating/fusion_plating_jobs/scripts/migrate_to_fp_jobs.py b/fusion_plating/fusion_plating_jobs/scripts/migrate_to_fp_jobs.py index dc50b716..9968dc7a 100644 --- a/fusion_plating/fusion_plating_jobs/scripts/migrate_to_fp_jobs.py +++ b/fusion_plating/fusion_plating_jobs/scripts/migrate_to_fp_jobs.py @@ -78,7 +78,8 @@ def _resolve_partner(env, mo): Order of preference: 1. mo.x_fc_customer_id (some custom modules add this) 2. partner from sale.order matching mo.origin - 3. False (caller decides whether to error) + 3. mo.picking_type_id.warehouse_id.partner_id (warehouse address) + 4. The company partner (last-resort placeholder for orphan MOs) """ if 'x_fc_customer_id' in mo._fields and mo.x_fc_customer_id: return mo.x_fc_customer_id.id @@ -86,7 +87,15 @@ def _resolve_partner(env, mo): so = env['sale.order'].search([('name', '=', mo.origin)], limit=1) if so: return so.partner_id.id - return False + # Warehouse partner fallback (works for internal/transfer MOs) + if 'picking_type_id' in mo._fields and mo.picking_type_id: + wh = mo.picking_type_id.warehouse_id + if wh and wh.partner_id: + return wh.partner_id.id + # Last resort: company partner. This is a placeholder for orphan + # demo/legacy MOs that have no SO link and no warehouse partner. + # Audit log will flag these so they can be reassigned manually. + return mo.company_id.partner_id.id if mo.company_id else env.company.partner_id.id def migrate_mo(env, mo, audit): @@ -402,23 +411,29 @@ def run(env): print('Migrating %d MOs and their WOs...' % len(all_mos)) for mo in all_mos: + # Wrap each MO migration in a savepoint so a failure on one + # MO doesn't abort the whole transaction (which would cascade + # "current transaction is aborted" errors on every subsequent + # MO and prevent any successful migration from committing). try: - job = migrate_mo(env, mo, audit) - for wo in mo.workorder_ids: - try: - migrate_wo(env, wo, job, audit) - except Exception as e: - audit['errors'].append({ - 'wo': wo.id, - 'wo_name': wo.name, - 'mo': mo.id, - 'error': str(e), - }) - _logger.error( - 'Migration failed for WO %s (MO %s): %s', - wo.name, mo.name, e, - ) - rebind_dependents(env, mo, job, audit) + with env.cr.savepoint(): + job = migrate_mo(env, mo, audit) + for wo in mo.workorder_ids: + try: + with env.cr.savepoint(): + migrate_wo(env, wo, job, audit) + except Exception as e: + audit['errors'].append({ + 'wo': wo.id, + 'wo_name': wo.name, + 'mo': mo.id, + 'error': str(e), + }) + _logger.error( + 'Migration failed for WO %s (MO %s): %s', + wo.name, mo.name, e, + ) + rebind_dependents(env, mo, job, audit) except Exception as e: audit['errors'].append({ 'mo': mo.id, From 034a6560ad278e4a748619facf86ea762c7705b6 Mon Sep 17 00:00:00 2001 From: gsinghpal Date: Sat, 25 Apr 2026 04:20:09 -0400 Subject: [PATCH 34/61] =?UTF-8?q?feat(jobs):=20Phase=206=20=E2=80=94=20Pro?= =?UTF-8?q?cess=20Tree=20OWL=20component=20for=20fp.job?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ports fusion_plating_shopfloor's process_tree.js to bind to fp.job instead of mrp.production. Consumes the /fp/jobs/process_tree JSON endpoint built in Phase 6 lean. Renders the recipe tree as cards. Each operation card shows the step state (pending/ready/in_progress/done/etc.) when there's a matching fp.job.step. Click an operation card -> open the step form. Click Back -> return to the job form. New 'Process Tree' button on the fp.job form (manager-only) launches the client action with job_id context. Manifest 19.0.2.1.0 -> 19.0.2.2.0. Part of: native job model migration (spec 2026-04-25) Co-Authored-By: Claude Opus 4.7 (1M context) --- .../fusion_plating_jobs/__manifest__.py | 11 +- .../fusion_plating_jobs/models/fp_job.py | 20 + .../static/src/js/job_process_tree.js | 207 ++++++++++ .../static/src/scss/job_process_tree.scss | 384 ++++++++++++++++++ .../static/src/xml/job_process_tree.xml | 122 ++++++ .../views/fp_job_form_inherit.xml | 23 ++ .../views/job_process_tree_action.xml | 12 + 7 files changed, 778 insertions(+), 1 deletion(-) create mode 100644 fusion_plating/fusion_plating_jobs/static/src/js/job_process_tree.js create mode 100644 fusion_plating/fusion_plating_jobs/static/src/scss/job_process_tree.scss create mode 100644 fusion_plating/fusion_plating_jobs/static/src/xml/job_process_tree.xml create mode 100644 fusion_plating/fusion_plating_jobs/views/fp_job_form_inherit.xml create mode 100644 fusion_plating/fusion_plating_jobs/views/job_process_tree_action.xml diff --git a/fusion_plating/fusion_plating_jobs/__manifest__.py b/fusion_plating/fusion_plating_jobs/__manifest__.py index 67c79c84..f6140560 100644 --- a/fusion_plating/fusion_plating_jobs/__manifest__.py +++ b/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.2.1.0', + 'version': '19.0.2.2.0', 'category': 'Manufacturing/Plating', 'summary': 'Native plating job model — replaces mrp.production / mrp.workorder bridge.', 'description': """ @@ -38,9 +38,18 @@ full design rationale and §6.2 of the implementation plan for task list. 'data': [ 'security/ir.model.access.csv', 'views/res_config_settings_views.xml', + 'views/job_process_tree_action.xml', + 'views/fp_job_form_inherit.xml', 'report/report_fp_job_sticker.xml', 'report/report_fp_job_traveller.xml', ], + 'assets': { + 'web.assets_backend': [ + 'fusion_plating_jobs/static/src/scss/job_process_tree.scss', + 'fusion_plating_jobs/static/src/js/job_process_tree.js', + 'fusion_plating_jobs/static/src/xml/job_process_tree.xml', + ], + }, 'installable': True, 'application': False, 'auto_install': False, diff --git a/fusion_plating/fusion_plating_jobs/models/fp_job.py b/fusion_plating/fusion_plating_jobs/models/fp_job.py index b94c4c03..d8087c2e 100644 --- a/fusion_plating/fusion_plating_jobs/models/fp_job.py +++ b/fusion_plating/fusion_plating_jobs/models/fp_job.py @@ -253,6 +253,26 @@ class FpJob(models.Model): ) return True + # ------------------------------------------------------------------ + # UI — Process Tree client action (Phase 6) + # ------------------------------------------------------------------ + def action_open_process_tree(self): + """Open the OWL process-tree visualization for this job. + + Launches the fp_job_process_tree client action with job_id in + context. The component fetches /fp/jobs/process_tree and renders + the recipe -> sub_process -> operation hierarchy as cards with + per-step state badges. + """ + self.ensure_one() + return { + 'type': 'ir.actions.client', + 'tag': 'fp_job_process_tree', + 'context': {'job_id': self.id}, + 'name': 'Process Tree — %s' % (self.name or ''), + 'target': 'current', + } + # ------------------------------------------------------------------ # Lifecycle hooks (Tasks 2.6, 2.7, 2.8) # diff --git a/fusion_plating/fusion_plating_jobs/static/src/js/job_process_tree.js b/fusion_plating/fusion_plating_jobs/static/src/js/job_process_tree.js new file mode 100644 index 00000000..bed06eca --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/static/src/js/job_process_tree.js @@ -0,0 +1,207 @@ +/** @odoo-module **/ +// ============================================================================= +// Fusion Plating — Job Process Tree (horizontal hierarchical view, fp.job) +// Copyright 2026 Nexa Systems Inc. · License OPL-1 +// +// Renders an fp.job's recipe (recipe → sub_process → operation) as a +// horizontal bracket tree, port of fusion_plating_shopfloor's process_tree.js +// rebound to fp.job + fp.job.step (instead of mrp.production + mrp.workorder). +// +// Action context: +// job_id — required; the fp.job whose recipe to render +// back_step_id — optional; if set, the back button returns to that step +// instead of the job form +// +// Endpoint: POST /fp/jobs/process_tree (fusion_plating_jobs/controllers) +// payload : { job_id: } +// response : { job_name, partner, state, qty, recipe_name, progress_pct, +// tree: { id, name, node_type, sequence, +// step_id, step_state, step_assigned_user, +// duration_expected, duration_actual, children: [...] } } +// ============================================================================= + +import { Component, useState, onMounted } from "@odoo/owl"; +import { registry } from "@web/core/registry"; +import { rpc } from "@web/core/network/rpc"; +import { useService } from "@web/core/utils/hooks"; + +export class JobProcessTree extends Component { + static template = "fusion_plating_jobs.JobProcessTree"; + static props = ["*"]; + + setup() { + this.notification = useService("notification"); + this.action = useService("action"); + + this.state = useState({ + jobName: "", + partner: "", + jobState: "", + qty: 0, + recipe: "", + progressPct: 0, + root: null, + loading: false, + }); + + onMounted(async () => { + await this.loadTree(); + }); + } + + // ---- Action context ----------------------------------------------------- + + get _ctx() { + const a = this.props.action || {}; + return { ...(a.context || {}), ...(a.params || {}) }; + } + get jobId() { return this._ctx.job_id || null; } + get backStepId() { return this._ctx.back_step_id || null; } + get backLabel() { + return this.backStepId ? "Back to Step" : "Back to Job"; + } + + // ---- Data --------------------------------------------------------------- + + async loadTree() { + const jobId = this.jobId; + if (!jobId) { + this.notification.add( + "No job specified for the process tree.", + { type: "warning" }, + ); + return; + } + this.state.loading = true; + try { + const r = await rpc("/fp/jobs/process_tree", { + job_id: jobId, + }); + if (r && !r.error) { + this.state.jobName = r.job_name || ""; + this.state.partner = r.partner || ""; + this.state.jobState = r.state || ""; + this.state.qty = r.qty || 0; + this.state.recipe = r.recipe_name || ""; + this.state.progressPct = r.progress_pct || 0; + this.state.root = r.tree || null; + } else if (r && r.error) { + this.notification.add(r.error, { type: "warning" }); + } + } catch (err) { + this.notification.add( + `Failed to load process tree: ${err.message || err}`, + { type: "danger" }, + ); + } finally { + this.state.loading = false; + } + } + + // ---- Navigation --------------------------------------------------------- + + onNodeClick(node) { + // Only operation cards with a matching fp.job.step are clickable — + // they open the underlying step form. + if (!node || !node.step_id) { + return; + } + this.action.doAction({ + type: "ir.actions.act_window", + res_model: "fp.job.step", + res_id: node.step_id, + views: [[false, "form"]], + target: "current", + }); + } + + onBack() { + const stepId = this.backStepId; + if (stepId) { + this.action.doAction({ + type: "ir.actions.act_window", + res_model: "fp.job.step", + res_id: parseInt(stepId, 10), + views: [[false, "form"]], + target: "current", + }); + return; + } + // Default back: open the job form. + const jobId = this.jobId; + if (jobId) { + this.action.doAction({ + type: "ir.actions.act_window", + res_model: "fp.job", + res_id: parseInt(jobId, 10), + views: [[false, "form"]], + target: "current", + }); + return; + } + // Fallback — pop the stack. + this.action.doAction({ type: "ir.actions.act_window_close" }); + } + + // ---- Helpers ------------------------------------------------------------ + + /** Return the css class chain for a node card (state + node_type). */ + getCardClass(node) { + const parts = ["o_fp_jpt_card"]; + parts.push(`o_fp_jpt_type_${node.node_type || "unknown"}`); + if (node.step_state) { + parts.push(`o_fp_jpt_state_${node.step_state}`); + } + if (node.step_id) { + parts.push("o_fp_jpt_clickable"); + } + if (this.isHighlight(node)) { + parts.push("o_fp_jpt_highlight"); + } + return parts.join(" "); + } + + /** Highlight steps that are live (ready / in_progress / paused). */ + isHighlight(node) { + return node.step_state === "ready" + || node.step_state === "in_progress" + || node.step_state === "paused"; + } + + /** Friendly label for the step state badge. */ + stateLabel(node) { + if (!node.step_state) return null; + const map = { + pending: "Pending", + ready: "Ready", + in_progress: "In Progress", + paused: "Paused", + done: "Done", + skipped: "Skipped", + cancelled: "Cancelled", + }; + return map[node.step_state] || node.step_state; + } + + /** Concise duration label: "actual / expected min" when available. */ + durationLabel(node) { + const exp = node.duration_expected; + const act = node.duration_actual; + if (act && exp) return `${act.toFixed(0)}/${exp.toFixed(0)} min`; + if (exp) return `${exp.toFixed(0)} min`; + if (act) return `${act.toFixed(0)} min`; + return ""; + } + + nodeIcon(node) { + switch (node.node_type) { + case "recipe": return "fa-cubes"; + case "sub_process": return "fa-folder"; + case "operation": return "fa-cog"; + case "step": return "fa-circle-o"; + default: return "fa-square"; + } + } +} + +registry.category("actions").add("fp_job_process_tree", JobProcessTree); diff --git a/fusion_plating/fusion_plating_jobs/static/src/scss/job_process_tree.scss b/fusion_plating/fusion_plating_jobs/static/src/scss/job_process_tree.scss new file mode 100644 index 00000000..c007e696 --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/static/src/scss/job_process_tree.scss @@ -0,0 +1,384 @@ +// ============================================================================= +// Fusion Plating — Job Process Tree (horizontal hierarchical, v1, 2026-04) +// Copyright 2026 Nexa Systems Inc. · License OPL-1 +// +// Parallel of fusion_plating_shopfloor's process_tree.scss, rebound to +// fp.job. Self-contained — does NOT pull in the shopfloor token partial, +// so this module stays free of the shopfloor dependency. +// +// Class prefix: .o_fp_jpt_* (Job Process Tree) +// +// Hierarchical bracket tree: +// +// [Recipe]──┬──[Sub-Process]──┬──[Operation] +// │ └──[Operation] +// ├──[Operation] +// └──[Operation] +// +// Each .o_fp_jpt_node is `display: flex` with: +// - the card on the left +// - .o_fp_jpt_children on the right (column of recursed children) +// Connectors are drawn entirely from CSS pseudo-elements: +// - vertical bus column on each child via ::after +// - horizontal stub from bus column to card via ::before +// - first/last children trim the vertical line so it stops at the card +// centre. +// ============================================================================= + + +// Suppress hover transforms on touch devices so taps don't leave cards +// stuck in the hover state. +@media (hover: none) { + .o_fp_job_process_tree [class*="o_fp_jpt_"]:hover { + transform: none !important; + box-shadow: inherit !important; + } +} + + +// --- Connector geometry ------------------------------------------------------ +// Tweaking these recalculates the whole bracket-tree layout. +$jpt-card-h : 44px; // nominal card height (centre stays at h/2) +$jpt-row-gap : 12px; // vertical gap between sibling children +$jpt-indent : 36px; // horizontal gap from parent → children +$jpt-stub : 28px; // horizontal connector segment length +$jpt-line-color : #6b7280; // connector colour +$jpt-line-width : 2px; + + +.o_fp_job_process_tree.o_fp_jpt_v1 { + height: 100%; + overflow: auto; // both axes — wide trees scroll horizontally + -webkit-overflow-scrolling: touch; + padding: 16px 24px; + display: flex; + flex-direction: column; + gap: 12px; + background-color: var(--o-action, #f7f7f8); + color: var(--bs-body-color, #1a1d21); + + @media (max-width: 600px) { padding: 12px; gap: 12px; } + + + // ------------------------------------------------------------------------- + // Header (compact strip) + // ------------------------------------------------------------------------- + .o_fp_jpt_header { + display: flex; + align-items: center; + gap: 12px; + flex-wrap: wrap; + padding: 12px 16px; + background-color: var(--bs-body-bg, #ffffff); + border: 1px solid #d8dadd; + border-radius: 8px; + position: sticky; + top: 0; + z-index: 5; + } + .o_fp_jpt_back { + display: inline-flex; + align-items: center; + padding: 6px 12px; + border-radius: 999px; + background-color: var(--bs-tertiary-bg, #f1f3f5); + color: var(--bs-body-color, #1a1d21); + font-weight: 500; + font-size: 0.875rem; + border: 1px solid #d8dadd; + cursor: pointer; + transition: background-color 0.15s ease, + border-color 0.15s ease, + color 0.15s ease; + &:hover { + background-color: #e9ecef; + border-color: #c5c8cc; + } + } + .o_fp_jpt_title_block { flex: 1 1 auto; min-width: 0; } + .o_fp_jpt_title { + font-size: 1rem; + font-weight: 700; + margin: 0; + display: inline-flex; align-items: center; gap: 4px; + .o_fp_jpt_job_name { font-weight: 600; opacity: 0.8; } + } + .o_fp_jpt_subtitle { + margin-top: 2px; + font-size: 0.75rem; + opacity: 0.7; + display: flex; flex-wrap: wrap; align-items: center; gap: 2px; + .fa { margin-right: 2px; opacity: 0.7; } + } + + + // ------------------------------------------------------------------------- + // Empty / loading + // ------------------------------------------------------------------------- + .o_fp_jpt_empty { + text-align: center; + padding: 40px 24px; + opacity: 0.7; + background-color: var(--bs-body-bg, #ffffff); + border: 1px solid #d8dadd; + border-radius: 8px; + font-size: 0.875rem; + max-width: 520px; + > .fa { font-size: 1.75rem; margin-bottom: 8px; opacity: 0.6; } + } + + + // ------------------------------------------------------------------------- + // Tree canvas — horizontally scrollable + // ------------------------------------------------------------------------- + .o_fp_jpt_canvas { + padding: 12px 0; + min-width: max-content; // let cards push the canvas wider for scroll + } + + + // ------------------------------------------------------------------------- + // Recursive node — flex row of [card | children-column] + // ------------------------------------------------------------------------- + .o_fp_jpt_node { + display: flex; + align-items: flex-start; + position: relative; + } + + + // ------------------------------------------------------------------------- + // Card (Steelhead-style: dark fill, rounded) + // ------------------------------------------------------------------------- + .o_fp_jpt_card { + display: inline-flex; + align-items: center; + gap: 10px; + min-width: 220px; + max-width: 340px; + min-height: $jpt-card-h; + padding: 8px 12px; + background-color: #2b2f36; // dark slate + color: #f1f3f5; + border-radius: 6px; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1); + font-size: 0.875rem; + line-height: 1.25; + flex: 0 0 auto; + position: relative; + z-index: 1; // sit above connector lines + transition: transform 0.1s ease, + box-shadow 0.15s ease, + background-color 0.15s ease; + + &.o_fp_jpt_clickable { + cursor: pointer; + &:hover { + transform: translateY(-1px); + box-shadow: 0 4px 12px rgba(0, 0, 0, 0.18); + background-color: #353a42; + } + } + + // ---- Card type tints (subtle) ------------------------------------- + &.o_fp_jpt_type_recipe { + background-color: #1f2329; + font-weight: 700; + } + &.o_fp_jpt_type_sub_process { + background-color: #262a31; + font-weight: 600; + } + &.o_fp_jpt_type_step { + background-color: #353a42; + font-size: 0.8rem; + min-height: 36px; + } + + // ---- Live state highlight ---------------------------------------- + &.o_fp_jpt_state_in_progress { + background-color: #c0392b; // warm red — active step + color: #fff; + box-shadow: 0 0 0 1px rgba(192, 57, 43, .6), + 0 4px 14px rgba(192, 57, 43, .35); + } + &.o_fp_jpt_highlight.o_fp_jpt_state_ready { + background-color: #c0392b; // ready also red + color: #fff; + box-shadow: 0 0 0 1px rgba(192, 57, 43, .6), + 0 4px 14px rgba(192, 57, 43, .35); + } + &.o_fp_jpt_state_paused { + background-color: #b5651d; // amber — paused + color: #fff; + } + &.o_fp_jpt_state_done { + background-color: #1e8449; // green for completed + color: #fff; + } + &.o_fp_jpt_state_skipped, + &.o_fp_jpt_state_cancelled { opacity: 0.55; } + } + + .o_fp_jpt_card_icon { + flex: 0 0 auto; + width: 18px; + text-align: center; + opacity: 0.85; + font-size: 0.95em; + } + + .o_fp_jpt_card_body { + flex: 1 1 auto; + min-width: 0; + display: flex; + flex-direction: column; + gap: 2px; + } + .o_fp_jpt_card_title { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + .o_fp_jpt_card_meta { + font-size: 0.72rem; + opacity: 0.75; + display: flex; + flex-wrap: wrap; + gap: 2px 6px; + .fa { opacity: 0.8; } + } + + .o_fp_jpt_card_right { + flex: 0 0 auto; + display: inline-flex; + align-items: center; + gap: 6px; + } + + .o_fp_jpt_card_open { + opacity: 0.55; + font-size: 0.85em; + } + + + // ------------------------------------------------------------------------- + // State badge (right side of operation cards) + // ------------------------------------------------------------------------- + .o_fp_jpt_state_badge { + display: inline-flex; + align-items: center; + padding: 1px 7px; + border-radius: 999px; + font-size: 0.65rem; + font-weight: 700; + line-height: 1.4; + white-space: nowrap; + text-transform: uppercase; + letter-spacing: 0.02em; + + &.o_fp_jpt_state_badge_pending { background-color: rgba(255,255,255,.12); color: #c8ccd2; } + &.o_fp_jpt_state_badge_ready { background-color: rgba(255, 193, 7, .25); color: #ffd866; } + &.o_fp_jpt_state_badge_in_progress { background-color: rgba(13, 110, 253, .25); color: #6ea8fe; } + &.o_fp_jpt_state_badge_paused { background-color: rgba(255, 145, 0, .28); color: #ffb86b; } + &.o_fp_jpt_state_badge_done { background-color: rgba(25, 135, 84, .28); color: #75d4a4; } + &.o_fp_jpt_state_badge_skipped { background-color: rgba(108, 117, 125, .35); color: #d0d4d9; } + &.o_fp_jpt_state_badge_cancelled { background-color: rgba(220, 53, 69, .25); color: #f1aeb5; } + } + + + // ------------------------------------------------------------------------- + // Children column (recursed nodes laid out vertically to the right) + // + // The ::before pseudo draws the horizontal connector that bridges the + // parent card's right edge → the bus column at left: 0 of this + // container. + // ------------------------------------------------------------------------- + .o_fp_jpt_children { + display: flex; + flex-direction: column; + gap: $jpt-row-gap; + margin-left: $jpt-indent; + position: relative; + + &::before { + content: ""; + position: absolute; + left: -#{$jpt-indent}; + top: calc(#{$jpt-card-h} / 2); // parent-card vertical centre + width: $jpt-indent; + height: $jpt-line-width; + background-color: $jpt-line-color; + z-index: 0; + } + } + + + // ------------------------------------------------------------------------- + // Connector lines (bracket style, drawn from CSS only) + // + // Each child .o_fp_jpt_node owns its own connector segments: + // ::before → horizontal stub from the bus column → card centre + // ::after → vertical bus segment for this row + // + // First/last/single children trim the vertical so the bracket stops + // exactly at the card centre. + // ------------------------------------------------------------------------- + .o_fp_jpt_children > .o_fp_jpt_node { + position: relative; + padding-left: $jpt-stub; // room for the horizontal stub + + // -- horizontal stub from bus column → card -------------------------- + &::before { + content: ""; + position: absolute; + left: 0; + top: calc(#{$jpt-card-h} / 2); // align with card vertical centre + width: $jpt-stub; + height: $jpt-line-width; + background-color: $jpt-line-color; + z-index: 0; + } + + // -- vertical bus segment (default: full row, top → bottom) ---------- + &::after { + content: ""; + position: absolute; + left: 0; + top: calc(-#{$jpt-row-gap} / 2); // bridge gap to sibling above + bottom: calc(-#{$jpt-row-gap} / 2); // bridge gap to sibling below + width: $jpt-line-width; + background-color: $jpt-line-color; + z-index: 0; + } + + // First child — vertical only from card centre → bottom of row + &:first-child::after { + top: calc(#{$jpt-card-h} / 2); + } + // Last child — vertical only from top of row → card centre + &:last-child::after { + bottom: calc(100% - (#{$jpt-card-h} / 2)); + } + // Only child — vertical only at the card centre point + &:first-child:last-child::after { + top: calc(#{$jpt-card-h} / 2); + bottom: calc(100% - (#{$jpt-card-h} / 2)); + } + } + + + // ------------------------------------------------------------------------- + // Pulse on live (in_progress / ready) cards + // ------------------------------------------------------------------------- + @keyframes o_fp_jpt_pulse { + 0%, 100% { box-shadow: 0 0 0 1px rgba(192, 57, 43, .55), + 0 4px 14px rgba(192, 57, 43, .35); } + 50% { box-shadow: 0 0 0 4px rgba(192, 57, 43, .25), + 0 4px 18px rgba(192, 57, 43, .45); } + } + .o_fp_jpt_card.o_fp_jpt_state_in_progress, + .o_fp_jpt_card.o_fp_jpt_highlight.o_fp_jpt_state_ready { + animation: o_fp_jpt_pulse 2.4s ease-in-out infinite; + } +} diff --git a/fusion_plating/fusion_plating_jobs/static/src/xml/job_process_tree.xml b/fusion_plating/fusion_plating_jobs/static/src/xml/job_process_tree.xml new file mode 100644 index 00000000..943db807 --- /dev/null +++ b/fusion_plating/fusion_plating_jobs/static/src/xml/job_process_tree.xml @@ -0,0 +1,122 @@ + + + + + + +
+ + +
+ +
+
+
+ + + + + · + + +
+
+ + +
+ + +
+
+ + +
+ + + + + +
+
+ + + + + +
+ + +
+ +
+

+ Process + + · + +

+
+ + + + · + · Qty + · + · % +
+
+
+ + +
+