diff --git a/pms/models/res_partner_id_number.py b/pms/models/res_partner_id_number.py
index e833a0472..2818038ee 100644
--- a/pms/models/res_partner_id_number.py
+++ b/pms/models/res_partner_id_number.py
@@ -39,7 +39,8 @@ class ResPartnerIdNumber(models.Model):
         for record in self:
             if record.partner_id.pms_checkin_partner_ids:
                 last_update_name = record.partner_id.pms_checkin_partner_ids.filtered(
-                    lambda x: x.write_date
+                    lambda x: x.document_id == record
+                    and x.write_date
                     == max(
                         record.partner_id.pms_checkin_partner_ids.mapped("write_date")
                     )
@@ -57,7 +58,8 @@ class ResPartnerIdNumber(models.Model):
             if record.partner_id.pms_checkin_partner_ids:
                 last_update_valid_from = (
                     record.partner_id.pms_checkin_partner_ids.filtered(
-                        lambda x: x.write_date
+                        lambda x: x.document_id == record
+                        and x.write_date
                         == max(
                             record.partner_id.pms_checkin_partner_ids.mapped(
                                 "write_date"
@@ -81,7 +83,8 @@ class ResPartnerIdNumber(models.Model):
             if record.partner_id.pms_checkin_partner_ids:
                 last_update_category_id = (
                     record.partner_id.pms_checkin_partner_ids.filtered(
-                        lambda x: x.write_date
+                        lambda x: x.document_id == record
+                        and x.write_date
                         == max(
                             record.partner_id.pms_checkin_partner_ids.mapped(
                                 "write_date"
diff --git a/pms_l10n_es/models/res_partner_id_number.py b/pms_l10n_es/models/res_partner_id_number.py
index 80a2f1855..fa03a5175 100644
--- a/pms_l10n_es/models/res_partner_id_number.py
+++ b/pms_l10n_es/models/res_partner_id_number.py
@@ -21,7 +21,8 @@ class ResPartnerIdNumber(models.Model):
             if record.partner_id.pms_checkin_partner_ids:
                 last_update_support_number = (
                     record.partner_id.pms_checkin_partner_ids.filtered(
-                        lambda x: x.write_date
+                        lambda x: x.document_id == record
+                        and x.write_date
                         == max(
                             record.partner_id.pms_checkin_partner_ids.mapped(
                                 "write_date"