Skip to content

Commit

Permalink
[IMP] partner_identification*: move _search_duplicate
Browse files Browse the repository at this point in the history
  • Loading branch information
JordiMForgeFlow committed Oct 17, 2023
1 parent 79253c0 commit e24b92f
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 17 deletions.
2 changes: 1 addition & 1 deletion partner_identification/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
{
"name": "Partner Identification Numbers",
"category": "Customer Relationship Management",
"version": "16.0.1.0.2",
"version": "16.0.1.0.3",
"license": "AGPL-3",
"depends": ["contacts"],
"data": [
Expand Down
16 changes: 15 additions & 1 deletion partner_identification/models/res_partner_id_category.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

from random import randint

from odoo import _, fields, models
from odoo import _, api, fields, models
from odoo.exceptions import UserError, ValidationError
from odoo.tools.safe_eval import safe_eval

Expand Down Expand Up @@ -40,6 +40,20 @@ def _get_default_color(self):
"Python validation code", help="Python code called to validate an id number."
)

@api.model
def _search_duplicate(self, category_id, id_number, force_active=False):
"""Find duplicates for the given category and number."""
domain = [
("category_id", "=", category_id),
("name", "=", id_number.name),
("name", "!=", False),
("id", "!=", id_number.id),
]

if force_active:
domain.append(("partner_id.active", "=", True))
return self.env["res.partner.id_number"].search(domain)

def _validation_eval_context(self, id_number):
self.ensure_one()
return {"self": self, "id_number": id_number}
Expand Down
2 changes: 1 addition & 1 deletion partner_identification_gln/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"summary": """
This addon extends "Partner Identification Numbers"
to provide a number category for GLN registration""",
"version": "16.0.1.0.0",
"version": "16.0.1.0.1",
"license": "AGPL-3",
"author": "Acsone S.A.,Odoo Community Association (OCA)",
"website": "https://github.com/OCA/partner-contact",
Expand Down
15 changes: 1 addition & 14 deletions partner_identification_gln/models/res_partner_id_category.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import logging

from odoo import api, models
from odoo import models

_logger = logging.getLogger(__name__)

Expand All @@ -17,19 +17,6 @@
class ResPartnerIdCategory(models.Model):
_inherit = "res.partner.id_category"

@api.model
def _search_duplicate(self, category_id, id_number, force_active=False):
domain = [
("category_id", "=", category_id),
("name", "=", id_number.name),
("name", "!=", False),
("id", "!=", id_number.id),
]

if force_active:
domain.append(("partner_id.active", "=", True))
return self.env["res.partner.id_number"].search(domain)

def validate_res_partner_gln(self, id_number):
self.ensure_one()
if not id_number:
Expand Down

0 comments on commit e24b92f

Please sign in to comment.