+ +
+ + + See Photo # + +
+
+ Photo Evidence ()
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+ Photo # —
+
+
+
+ Step:
+
+
+ Captured by:
+
+
+ on
+
+
+
+
+ Note:
+
+
+ +
+
| @@ -338,7 +515,7 @@ | Certification Statement: - Ref. WO# + Ref. WO# @@ -347,6 +524,9 @@ |
| Other Comments: + | |
Avg
@@ -325,20 +331,28 @@
-
+
+
+
+
+ 1
+
+
+
+ 1
+
+
+
+
+
+
+
diff --git a/fusion_plating/fusion_plating_logistics/__manifest__.py b/fusion_plating/fusion_plating_logistics/__manifest__.py
index eacad4b8..e3609235 100644
--- a/fusion_plating/fusion_plating_logistics/__manifest__.py
+++ b/fusion_plating/fusion_plating_logistics/__manifest__.py
@@ -5,7 +5,7 @@
{
'name': 'Fusion Plating — Logistics',
- 'version': '19.0.3.5.0',
+ 'version': '19.0.3.6.0',
'category': 'Manufacturing/Plating',
'summary': (
'Pickup & delivery for plating shops: vehicle master, driver '
diff --git a/fusion_plating/fusion_plating_logistics/models/fp_delivery.py b/fusion_plating/fusion_plating_logistics/models/fp_delivery.py
index df2bf4d4..780e6beb 100644
--- a/fusion_plating/fusion_plating_logistics/models/fp_delivery.py
+++ b/fusion_plating/fusion_plating_logistics/models/fp_delivery.py
@@ -24,14 +24,14 @@ class FpDelivery(models.Model):
"""
_name = 'fusion.plating.delivery'
_description = 'Fusion Plating — Delivery'
- _inherit = ['mail.thread', 'mail.activity.mixin']
+ _inherit = ['mail.thread', 'mail.activity.mixin', 'fp.parent.numbered.mixin']
_order = 'scheduled_date desc, id desc'
name = fields.Char(
string='Reference',
required=True,
copy=False,
- default=lambda self: self._default_name(),
+ default='New',
tracking=True,
)
partner_id = fields.Many2one(
@@ -159,8 +159,49 @@ class FpDelivery(models.Model):
compute='_compute_custody_count',
)
+ # ------------------------------------------------------------------
+ # Parent-numbered mixin hooks (2026-05-12 numbering hierarchy)
+ # ------------------------------------------------------------------
+ def _fp_parent_sale_order(self):
+ """No direct sale_order_id on this model — resolve via
+ job_ref → fp.job.name → job.sale_order_id."""
+ if not self.job_ref or 'fp.job' not in self.env:
+ return self.env['sale.order']
+ job = self.env['fp.job'].sudo().search(
+ [('name', '=', self.job_ref)], limit=1,
+ )
+ return job.sale_order_id if job else self.env['sale.order']
+
+ def _fp_name_prefix(self):
+ return 'DLV'
+
+ def _fp_parent_counter_field(self):
+ return 'x_fc_pn_delivery_count'
+
+ @api.model_create_multi
+ def create(self, vals_list):
+ """Parent-derived name (DLV-[-NN]) with legacy-sequence
+ fallback for deliveries that don't link back to an SO."""
+ for vals in vals_list:
+ if not vals.get('name'):
+ vals['name'] = 'New'
+ 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.delivery') or 'New'
+ self.env.cr.execute(
+ "UPDATE fusion_plating_delivery SET name = %s WHERE id = %s",
+ (seq, rec.id),
+ )
+ rec.invalidate_recordset(['name'])
+ return records
+
@api.model
def _default_name(self):
+ """Retained for any legacy caller. New code should rely on
+ create() — the parent-numbered mixin sets the name there."""
seq = self.env['ir.sequence'].next_by_code('fusion.plating.delivery')
return seq or '/'
diff --git a/fusion_plating/fusion_plating_logistics/models/fp_pickup_request.py b/fusion_plating/fusion_plating_logistics/models/fp_pickup_request.py
index 8bb9713f..a13b79fa 100644
--- a/fusion_plating/fusion_plating_logistics/models/fp_pickup_request.py
+++ b/fusion_plating/fusion_plating_logistics/models/fp_pickup_request.py
@@ -21,16 +21,26 @@ class FpPickupRequest(models.Model):
"""
_name = 'fusion.plating.pickup.request'
_description = 'Fusion Plating — Pickup Request'
- _inherit = ['mail.thread', 'mail.activity.mixin']
+ _inherit = ['mail.thread', 'mail.activity.mixin', 'fp.parent.numbered.mixin']
_order = 'requested_date desc, id desc'
name = fields.Char(
string='Reference',
required=True,
copy=False,
- default=lambda self: self._default_name(),
+ default='New',
tracking=True,
)
+ sale_order_id = fields.Many2one(
+ 'sale.order',
+ string='Sale Order',
+ ondelete='set null',
+ index=True,
+ help='Sale order this pickup is associated with. Pickup may be '
+ 'created BEFORE the SO exists; in that case the '
+ 'parent-number naming falls back to the standalone '
+ 'PU/YYYY/NNNN sequence and the link can be set later.',
+ )
partner_id = fields.Many2one(
'res.partner',
string='Customer',
@@ -126,8 +136,39 @@ class FpPickupRequest(models.Model):
compute='_compute_custody_count',
)
+ # ------------------------------------------------------------------
+ # Parent-numbered mixin hooks
+ # ------------------------------------------------------------------
+ def _fp_parent_sale_order(self):
+ return self.sale_order_id
+
+ def _fp_name_prefix(self):
+ return 'PU'
+
+ def _fp_parent_counter_field(self):
+ return 'x_fc_pn_pickup_count'
+
+ @api.model_create_multi
+ def create(self, vals_list):
+ for vals in vals_list:
+ if not vals.get('name'):
+ vals['name'] = 'New'
+ 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.pickup.request') or 'New'
+ self.env.cr.execute(
+ "UPDATE fusion_plating_pickup_request SET name = %s WHERE id = %s",
+ (seq, rec.id),
+ )
+ rec.invalidate_recordset(['name'])
+ return records
+
@api.model
def _default_name(self):
+ """Retained for legacy callers; new flow uses the create() override."""
seq = self.env['ir.sequence'].next_by_code('fusion.plating.pickup.request')
return seq or '/'
diff --git a/fusion_plating/fusion_plating_receiving/__manifest__.py b/fusion_plating/fusion_plating_receiving/__manifest__.py
index ea011f41..bfd9460e 100644
--- a/fusion_plating/fusion_plating_receiving/__manifest__.py
+++ b/fusion_plating/fusion_plating_receiving/__manifest__.py
@@ -5,7 +5,7 @@
{
'name': 'Fusion Plating — Receiving & Inspection',
- 'version': '19.0.3.7.3',
+ 'version': '19.0.3.8.0',
'category': 'Manufacturing/Plating',
'summary': 'Parts receiving, inspection, damage logging, and manufacturing gate.',
'description': """
diff --git a/fusion_plating/fusion_plating_receiving/models/fp_receiving.py b/fusion_plating/fusion_plating_receiving/models/fp_receiving.py
index ca125ca9..70a63dfe 100644
--- a/fusion_plating/fusion_plating_receiving/models/fp_receiving.py
+++ b/fusion_plating/fusion_plating_receiving/models/fp_receiving.py
@@ -16,7 +16,7 @@ class FpReceiving(models.Model):
"""
_name = 'fp.receiving'
_description = 'Fusion Plating — Receiving'
- _inherit = ['mail.thread', 'mail.activity.mixin']
+ _inherit = ['mail.thread', 'mail.activity.mixin', 'fp.parent.numbered.mixin']
_order = 'received_date desc, id desc'
name = fields.Char(string='Reference', readonly=True, copy=False, default='New')
@@ -97,19 +97,38 @@ class FpReceiving(models.Model):
rec.unresolved_damage_count = len(rec.damage_ids.filtered(lambda d: not d.resolved))
# -------------------------------------------------------------------------
- # Sequence
+ # Sequence + parent-derived naming
# -------------------------------------------------------------------------
+ def _fp_parent_sale_order(self):
+ return self.sale_order_id
+
+ def _fp_name_prefix(self):
+ return 'RCV'
+
+ def _fp_parent_counter_field(self):
+ return 'x_fc_pn_receiving_count'
+
@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.receiving') or 'New'
# Prefill received_qty from expected_qty so the operator only
- # types when the count is wrong (the common case is "all
- # arrived"). Saves a step on every routine receipt.
+ # types when the count is wrong.
if vals.get('expected_qty') and not vals.get('received_qty'):
vals['received_qty'] = vals['expected_qty']
- return super().create(vals_list)
+ if not vals.get('name'):
+ vals['name'] = 'New'
+ 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('fp.receiving') or 'New'
+ self.env.cr.execute(
+ "UPDATE fp_receiving SET name = %s WHERE id = %s",
+ (seq, rec.id),
+ )
+ rec.invalidate_recordset(['name'])
+ return records
# -------------------------------------------------------------------------
# Sub 8 — box-count-only actions (new primary flow)