diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py index 29a9be13..745b2039 100644 --- a/sf_sale/models/sale_order.py +++ b/sf_sale/models/sale_order.py @@ -166,20 +166,20 @@ class ResPartnerToSale(models.Model): @api.constrains('name') def _check_name(self): - obj = self.sudo().search([('name', '=', self.name), ('id', '!=', self.id)]) + obj = self.sudo().search([('name', '=', self.name), ('id', '!=', self.id), ('active', '=', True)]) if obj: raise UserError('该名称已存在,请重新输入') @api.constrains('vat') def _check_vat(self): - obj = self.sudo().search([('vat', '=', self.vat), ('id', '!=', self.id)]) + obj = self.sudo().search([('vat', '=', self.vat), ('id', '!=', self.id), ('active', '=', True)]) if obj: raise UserError('该税ID已存在,请重新输入') @api.constrains('email') def _check_email(self): if self.customer_rank > 0: - obj = self.sudo().search([('email', '=', self.email), ('id', '!=', self.id)]) + obj = self.sudo().search([('email', '=', self.email), ('id', '!=', self.id), ('active', '=', True)]) if obj: raise UserError('该邮箱已存在,请重新输入') @@ -240,7 +240,7 @@ class ResUserToSale(models.Model): return self._search(domain, limit=limit, access_rights_uid=name_get_uid) elif self._context.get('supplier_rank'): if self.env.user.has_group('sf_base.group_purchase_director'): - domain = [('supplier_rank', '>', 0)] + domain = [] elif self.env.user.has_group('sf_base.group_purchase'): if self.id != self.env.user.id: domain = [('id', '=', self.id)]