Accept Merge Request #767: (feature/修复供应商重复验证 -> develop)
Merge Request: 修复供应商重复验证 Created By: @杨金灵 Reviewed By: @马广威 Approved By: @马广威 Accepted By: @杨金灵 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/767
This commit is contained in:
@@ -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)]
|
||||
|
||||
Reference in New Issue
Block a user