Skip to content

Commit

Permalink
Keyword arguments problem on merge partner (OCA#128)
Browse files Browse the repository at this point in the history
Closes OCA#125
  • Loading branch information
cubells authored and ntsirintanis committed Feb 4, 2020
1 parent cc57b52 commit f99fe4a
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions partner_deduplicate_acl/wizards/partner_merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,21 @@
# © 2016 Tecnativa, S.L. - Vicent Cubells
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).

from openerp import api, models
from openerp import SUPERUSER_ID, models


class BasePartnerMergeAutomaticWizard(models.TransientModel):
_inherit = "base.partner.merge.automatic.wizard"

@api.model
def _merge(self, partner_ids, dst_partner=None):
"""Allow non-admins to merge partners with different emails."""
# Know if user has unrestricted access
if self.env.user.has_group('crm_deduplicate_acl.group_unrestricted'):
# Run as admin if so
self = self.sudo()
def _merge(self, cr, uid, partner_ids, dst_partner=None, context=None):
"""Allow non-admins to merge partners"""

user = self.pool["res.users"].browse(cr, uid, uid, context=context)
return super(BasePartnerMergeAutomaticWizard, self)._merge(
partner_ids=partner_ids, dst_partner=dst_partner
cr,
SUPERUSER_ID if user.has_group(
'crm_deduplicate_acl.group_unrestricted') else uid,
partner_ids,
dst_partner=dst_partner,
context=context
)

0 comments on commit f99fe4a

Please sign in to comment.