feat(numbering): wire NCR, CAPA, Hold, RMA into parent-numbered mixin
Hold derives parent via job_id.sale_order_id; RMA via sale_order_id directly — both get HOLD-<parent> / RMA-<parent> names. NCR and CAPA have no SO link in core, so they fall back to their legacy sequences (NCR/YYYY/NNN, CAPA/YYYY/NNN); future modules can override the _fp_parent_sale_order hook to enable parent naming. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
'name': 'Fusion Plating — Quality (QMS)',
|
'name': 'Fusion Plating — Quality (QMS)',
|
||||||
'version': '19.0.4.12.2',
|
'version': '19.0.4.13.0',
|
||||||
'category': 'Manufacturing/Plating',
|
'category': 'Manufacturing/Plating',
|
||||||
'summary': 'Native QMS for plating shops: NCR, CAPA, calibration, AVL, FAIR, '
|
'summary': 'Native QMS for plating shops: NCR, CAPA, calibration, AVL, FAIR, '
|
||||||
'internal audits, customer specs, document control. CE + EE compatible.',
|
'internal audits, customer specs, document control. CE + EE compatible.',
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ class FpCapa(models.Model):
|
|||||||
"""
|
"""
|
||||||
_name = 'fusion.plating.capa'
|
_name = 'fusion.plating.capa'
|
||||||
_description = 'Fusion Plating — Corrective / Preventive Action'
|
_description = 'Fusion Plating — Corrective / Preventive Action'
|
||||||
_inherit = ['mail.thread', 'mail.activity.mixin']
|
_inherit = ['mail.thread', 'mail.activity.mixin', 'fp.parent.numbered.mixin']
|
||||||
_order = 'due_date asc, id desc'
|
_order = 'due_date asc, id desc'
|
||||||
|
|
||||||
name = fields.Char(
|
name = fields.Char(
|
||||||
@@ -100,6 +100,23 @@ class FpCapa(models.Model):
|
|||||||
)
|
)
|
||||||
active = fields.Boolean(default=True)
|
active = fields.Boolean(default=True)
|
||||||
|
|
||||||
|
# ------------------------------------------------------------------
|
||||||
|
# Parent-numbered mixin hooks
|
||||||
|
# CAPAs reach SO via ncr_id → fp.job link if present (jobless NCRs
|
||||||
|
# fall back to legacy sequence).
|
||||||
|
# ------------------------------------------------------------------
|
||||||
|
def _fp_parent_sale_order(self):
|
||||||
|
# CAPA usually flows from an NCR. If the NCR has a job-back-link
|
||||||
|
# (added by future modules), we can reach SO through it. For now
|
||||||
|
# there's no link in core — falls back to legacy seq.
|
||||||
|
return self.env['sale.order']
|
||||||
|
|
||||||
|
def _fp_name_prefix(self):
|
||||||
|
return 'CAPA'
|
||||||
|
|
||||||
|
def _fp_parent_counter_field(self):
|
||||||
|
return 'x_fc_pn_capa_count'
|
||||||
|
|
||||||
@api.model
|
@api.model
|
||||||
def _default_name(self):
|
def _default_name(self):
|
||||||
seq = self.env['ir.sequence'].next_by_code('fusion.plating.capa')
|
seq = self.env['ir.sequence'].next_by_code('fusion.plating.capa')
|
||||||
@@ -109,8 +126,19 @@ class FpCapa(models.Model):
|
|||||||
def create(self, vals_list):
|
def create(self, vals_list):
|
||||||
for vals in vals_list:
|
for vals in vals_list:
|
||||||
if not vals.get('name') or vals.get('name') == '/':
|
if not vals.get('name') or vals.get('name') == '/':
|
||||||
vals['name'] = self._default_name()
|
vals['name'] = 'New'
|
||||||
return super().create(vals_list)
|
records = super().create(vals_list)
|
||||||
|
for rec in records:
|
||||||
|
if rec.name and rec.name != 'New':
|
||||||
|
continue
|
||||||
|
if not rec._fp_assign_parent_name():
|
||||||
|
seq = self.env['ir.sequence'].next_by_code('fusion.plating.capa') or 'New'
|
||||||
|
self.env.cr.execute(
|
||||||
|
"UPDATE fusion_plating_capa SET name = %s WHERE id = %s",
|
||||||
|
(seq, rec.id),
|
||||||
|
)
|
||||||
|
rec.invalidate_recordset(['name'])
|
||||||
|
return records
|
||||||
|
|
||||||
@api.depends('due_date', 'state')
|
@api.depends('due_date', 'state')
|
||||||
def _compute_is_overdue(self):
|
def _compute_is_overdue(self):
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ class FpNcr(models.Model):
|
|||||||
"""
|
"""
|
||||||
_name = 'fusion.plating.ncr'
|
_name = 'fusion.plating.ncr'
|
||||||
_description = 'Fusion Plating — Non-Conformance Report'
|
_description = 'Fusion Plating — Non-Conformance Report'
|
||||||
_inherit = ['mail.thread', 'mail.activity.mixin']
|
_inherit = ['mail.thread', 'mail.activity.mixin', 'fp.parent.numbered.mixin']
|
||||||
_order = 'reported_date desc, id desc'
|
_order = 'reported_date desc, id desc'
|
||||||
|
|
||||||
name = fields.Char(
|
name = fields.Char(
|
||||||
@@ -130,6 +130,22 @@ class FpNcr(models.Model):
|
|||||||
)
|
)
|
||||||
active = fields.Boolean(default=True)
|
active = fields.Boolean(default=True)
|
||||||
|
|
||||||
|
# ------------------------------------------------------------------
|
||||||
|
# Parent-numbered mixin hooks
|
||||||
|
# NCRs don't have a direct SO/job link in core yet — falls back to
|
||||||
|
# legacy fusion.plating.ncr sequence. When a future module adds a
|
||||||
|
# link, it can override _fp_parent_sale_order to enable parent
|
||||||
|
# naming retroactively without further changes here.
|
||||||
|
# ------------------------------------------------------------------
|
||||||
|
def _fp_parent_sale_order(self):
|
||||||
|
return self.env['sale.order']
|
||||||
|
|
||||||
|
def _fp_name_prefix(self):
|
||||||
|
return 'NCR'
|
||||||
|
|
||||||
|
def _fp_parent_counter_field(self):
|
||||||
|
return 'x_fc_pn_ncr_count'
|
||||||
|
|
||||||
@api.model
|
@api.model
|
||||||
def _default_name(self):
|
def _default_name(self):
|
||||||
seq = self.env['ir.sequence'].next_by_code('fusion.plating.ncr')
|
seq = self.env['ir.sequence'].next_by_code('fusion.plating.ncr')
|
||||||
@@ -139,8 +155,19 @@ class FpNcr(models.Model):
|
|||||||
def create(self, vals_list):
|
def create(self, vals_list):
|
||||||
for vals in vals_list:
|
for vals in vals_list:
|
||||||
if not vals.get('name') or vals.get('name') == '/':
|
if not vals.get('name') or vals.get('name') == '/':
|
||||||
vals['name'] = self._default_name()
|
vals['name'] = 'New'
|
||||||
return super().create(vals_list)
|
records = super().create(vals_list)
|
||||||
|
for rec in records:
|
||||||
|
if rec.name and rec.name != 'New':
|
||||||
|
continue
|
||||||
|
if not rec._fp_assign_parent_name():
|
||||||
|
seq = self.env['ir.sequence'].next_by_code('fusion.plating.ncr') or 'New'
|
||||||
|
self.env.cr.execute(
|
||||||
|
"UPDATE fusion_plating_ncr SET name = %s WHERE id = %s",
|
||||||
|
(seq, rec.id),
|
||||||
|
)
|
||||||
|
rec.invalidate_recordset(['name'])
|
||||||
|
return records
|
||||||
|
|
||||||
@api.depends('capa_ids')
|
@api.depends('capa_ids')
|
||||||
def _compute_capa_count(self):
|
def _compute_capa_count(self):
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ class FpQualityHold(models.Model):
|
|||||||
"""
|
"""
|
||||||
_name = 'fusion.plating.quality.hold'
|
_name = 'fusion.plating.quality.hold'
|
||||||
_description = 'Fusion Plating — Quality Hold'
|
_description = 'Fusion Plating — Quality Hold'
|
||||||
_inherit = ['mail.thread', 'mail.activity.mixin']
|
_inherit = ['mail.thread', 'mail.activity.mixin', 'fp.parent.numbered.mixin']
|
||||||
_order = 'create_date desc'
|
_order = 'create_date desc'
|
||||||
|
|
||||||
name = fields.Char(
|
name = fields.Char(
|
||||||
@@ -124,6 +124,17 @@ class FpQualityHold(models.Model):
|
|||||||
# ------------------------------------------------------------------
|
# ------------------------------------------------------------------
|
||||||
# Defaults / create
|
# Defaults / create
|
||||||
# ------------------------------------------------------------------
|
# ------------------------------------------------------------------
|
||||||
|
# Parent-numbered mixin hooks. Holds reach the SO through their
|
||||||
|
# linked fp.job (the standard authoring path on the shop floor).
|
||||||
|
def _fp_parent_sale_order(self):
|
||||||
|
return self.job_id.sale_order_id if self.job_id else self.env['sale.order']
|
||||||
|
|
||||||
|
def _fp_name_prefix(self):
|
||||||
|
return 'HOLD'
|
||||||
|
|
||||||
|
def _fp_parent_counter_field(self):
|
||||||
|
return 'x_fc_pn_hold_count'
|
||||||
|
|
||||||
@api.model
|
@api.model
|
||||||
def _default_name(self):
|
def _default_name(self):
|
||||||
seq = self.env['ir.sequence'].next_by_code(
|
seq = self.env['ir.sequence'].next_by_code(
|
||||||
@@ -135,8 +146,19 @@ class FpQualityHold(models.Model):
|
|||||||
def create(self, vals_list):
|
def create(self, vals_list):
|
||||||
for vals in vals_list:
|
for vals in vals_list:
|
||||||
if not vals.get('name') or vals.get('name') == '/':
|
if not vals.get('name') or vals.get('name') == '/':
|
||||||
vals['name'] = self._default_name()
|
vals['name'] = 'New'
|
||||||
return super().create(vals_list)
|
records = super().create(vals_list)
|
||||||
|
for rec in records:
|
||||||
|
if rec.name and rec.name != 'New':
|
||||||
|
continue
|
||||||
|
if not rec._fp_assign_parent_name():
|
||||||
|
seq = self.env['ir.sequence'].next_by_code('fusion.plating.quality.hold') or 'New'
|
||||||
|
self.env.cr.execute(
|
||||||
|
"UPDATE fusion_plating_quality_hold SET name = %s WHERE id = %s",
|
||||||
|
(seq, rec.id),
|
||||||
|
)
|
||||||
|
rec.invalidate_recordset(['name'])
|
||||||
|
return records
|
||||||
|
|
||||||
# ------------------------------------------------------------------
|
# ------------------------------------------------------------------
|
||||||
# Actions
|
# Actions
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ _logger = logging.getLogger(__name__)
|
|||||||
class FpRma(models.Model):
|
class FpRma(models.Model):
|
||||||
_name = 'fusion.plating.rma'
|
_name = 'fusion.plating.rma'
|
||||||
_description = 'Fusion Plating — Return Material Authorisation'
|
_description = 'Fusion Plating — Return Material Authorisation'
|
||||||
_inherit = ['mail.thread', 'mail.activity.mixin']
|
_inherit = ['mail.thread', 'mail.activity.mixin', 'fp.parent.numbered.mixin']
|
||||||
_order = 'create_date desc, id desc'
|
_order = 'create_date desc, id desc'
|
||||||
_rec_name = 'name'
|
_rec_name = 'name'
|
||||||
|
|
||||||
@@ -243,6 +243,17 @@ class FpRma(models.Model):
|
|||||||
# ------------------------------------------------------------------
|
# ------------------------------------------------------------------
|
||||||
# Defaults / create / name
|
# Defaults / create / name
|
||||||
# ------------------------------------------------------------------
|
# ------------------------------------------------------------------
|
||||||
|
# Parent-numbered mixin hooks. RMAs reach the SO directly via
|
||||||
|
# sale_order_id (set at create-time from the original order).
|
||||||
|
def _fp_parent_sale_order(self):
|
||||||
|
return self.sale_order_id
|
||||||
|
|
||||||
|
def _fp_name_prefix(self):
|
||||||
|
return 'RMA'
|
||||||
|
|
||||||
|
def _fp_parent_counter_field(self):
|
||||||
|
return 'x_fc_pn_rma_count'
|
||||||
|
|
||||||
@api.model
|
@api.model
|
||||||
def _default_name(self):
|
def _default_name(self):
|
||||||
seq = self.env['ir.sequence'].next_by_code('fusion.plating.rma')
|
seq = self.env['ir.sequence'].next_by_code('fusion.plating.rma')
|
||||||
@@ -252,8 +263,19 @@ class FpRma(models.Model):
|
|||||||
def create(self, vals_list):
|
def create(self, vals_list):
|
||||||
for vals in vals_list:
|
for vals in vals_list:
|
||||||
if not vals.get('name') or vals.get('name') == '/':
|
if not vals.get('name') or vals.get('name') == '/':
|
||||||
vals['name'] = self._default_name()
|
vals['name'] = 'New'
|
||||||
return super().create(vals_list)
|
records = super().create(vals_list)
|
||||||
|
for rec in records:
|
||||||
|
if rec.name and rec.name != 'New':
|
||||||
|
continue
|
||||||
|
if not rec._fp_assign_parent_name():
|
||||||
|
seq = self.env['ir.sequence'].next_by_code('fusion.plating.rma') or 'New'
|
||||||
|
self.env.cr.execute(
|
||||||
|
"UPDATE fusion_plating_rma SET name = %s WHERE id = %s",
|
||||||
|
(seq, rec.id),
|
||||||
|
)
|
||||||
|
rec.invalidate_recordset(['name'])
|
||||||
|
return records
|
||||||
|
|
||||||
# ------------------------------------------------------------------
|
# ------------------------------------------------------------------
|
||||||
# Computes
|
# Computes
|
||||||
|
|||||||
Reference in New Issue
Block a user