OCA
/
server-tools
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

[IMP] Change the original author in openerp file

pull/2/head
Jose Morales 12 years ago
parent
3363d32f05
commit
a2eaebc318
3 changed files with 219 additions and 115 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      partner_do_merge/__openerp__.py
  2. 50
      partner_do_merge/model/partner.py
  3. 219
      partner_do_merge/wizard/base_partner_merge.py

11
partner_do_merge/__openerp__.py
View File

@ -21,12 +21,14 @@
{ {
'name' : 'Merge Duplicate Partner', 'name' : 'Merge Duplicate Partner',
'version' : '0.1', 'version' : '0.1',
'author' : 'Vauxoo',
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
'category' : 'Base', 'category' : 'Base',
'description' : """ 'description' : """
Merge Partners Merge Partners
============== ==============
We can merge duplicates partners and set the new id in all documents of partner merged
We can merge duplicates partners and set the new id in all documents of
partner merged
We can merge partner using like mach parameter these fields: We can merge partner using like mach parameter these fields:
-Email -Email
@ -38,10 +40,9 @@ We can merge partner using like mach parameter these fields:
We can select which partner will be the main partner We can select which partner will be the main partner
This feature is in the follow path Sales/Tools/Deduplicate Contacts also is created an action menu in the partner view
This feature is in the follow path Sales/Tools/Deduplicate Contacts also is
created an action menu in the partner view
""", """,
'website': 'http://www.vauxoo.com',
'images' : [], 'images' : [],
'depends' : [ 'depends' : [
'base', 'base',

50
partner_do_merge/model/partner.py
View File

@ -31,8 +31,8 @@ class res_partner(osv.Model):
_description = 'Partner' _description = 'Partner'
_inherit = "res.partner" _inherit = "res.partner"
def _commercial_partner_compute(self, cr, uid, ids, name, args, context=None):
def _commercial_partner_compute(self, cr, uid, ids, name, args,
context=None):
""" Returns the partner that is considered the commercial """ Returns the partner that is considered the commercial
entity of this partner. The commercial entity holds the master data entity of this partner. The commercial entity holds the master data
for all commercial fields (see :py:meth:`~_commercial_fields`) """ for all commercial fields (see :py:meth:`~_commercial_fields`) """
@ -47,22 +47,28 @@ class res_partner(osv.Model):
def _display_name_compute(self, cr, uid, ids, name, args, context=None): def _display_name_compute(self, cr, uid, ids, name, args, context=None):
return dict(self.name_get(cr, uid, ids, context=context)) return dict(self.name_get(cr, uid, ids, context=context))
# indirections to avoid passing a copy of the overridable method when declaring the function field
_display_name = lambda self, *args, **kwargs: self._display_name_compute(*args, **kwargs)
# indirections to avoid passing a copy of the overridable method when
# declaring the function field
_display_name = lambda self, *args, **kwargs: \
self._display_name_compute(*args, **kwargs)
_display_name_store_triggers = { _display_name_store_triggers = {
'res.partner': (lambda self,cr,uid,ids,context=None: self.search(cr, uid, [('id','child_of',ids)]),
'res.partner': (lambda self, cr, uid, ids, context=None:
self.search(cr, uid, [(
'id', 'child_of', ids)]),
['parent_id', 'is_company', 'name'], 10) ['parent_id', 'is_company', 'name'], 10)
} }
_order = "display_name" _order = "display_name"
_columns = { _columns = {
'display_name': fields.function(_display_name, type='char', string='Name', store=_display_name_store_triggers),
'display_name': fields.function(_display_name, type='char',
string='Name',
store=_display_name_store_triggers),
'id': fields.integer('Id', readonly=True), 'id': fields.integer('Id', readonly=True),
'create_date': fields.datetime('Create Date', readonly=True), 'create_date': fields.datetime('Create Date', readonly=True),
}
}
def name_get(self, cr, uid, ids, context=None): def name_get(self, cr, uid, ids, context=None):
if context is None: if context is None:
@ -73,17 +79,21 @@ class res_partner(osv.Model):
for record in self.browse(cr, uid, ids, context=context): for record in self.browse(cr, uid, ids, context=context):
name = record.name name = record.name
if record.parent_id and not record.is_company: if record.parent_id and not record.is_company:
name = "%s, %s" % (record.parent_id.name, name)
name = "%s, %s" % (record.parent_id.name, name)
if context.get('show_address'): if context.get('show_address'):
name = name + "\n" + self._display_address(cr, uid, record, without_company=True, context=context)
name = name.replace('\n\n','\n')
name = name.replace('\n\n','\n')
name = name + "\n" + \
self._display_address(cr, uid, record,
without_company=True,
context=context)
name = name.replace('\n\n', '\n')
name = name.replace('\n\n', '\n')
if context.get('show_email') and record.email: if context.get('show_email') and record.email:
name = "%s <%s>" % (name, record.email) name = "%s <%s>" % (name, record.email)
res.append((record.id, name)) res.append((record.id, name))
return res return res
def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
def name_search(self, cr, uid, name, args=None, operator='ilike',
context=None, limit=100):
if not args: if not args:
args = [] args = []
if name and operator in ('=', 'ilike', '=ilike', 'like', '=like'): if name and operator in ('=', 'ilike', '=ilike', 'like', '=like'):
@ -99,11 +109,17 @@ class res_partner(osv.Model):
limit_str = ' limit %(limit)s' limit_str = ' limit %(limit)s'
query_args['limit'] = limit query_args['limit'] = limit
cr.execute('''SELECT partner.id FROM res_partner partner cr.execute('''SELECT partner.id FROM res_partner partner
LEFT JOIN res_partner company ON partner.parent_id = company.id
WHERE partner.email ''' + operator +''' %(name)s OR
partner.display_name ''' + operator + ' %(name)s ' + limit_str, query_args)
LEFT JOIN res_partner company
ON partner.parent_id = company.id
WHERE partner.email ''' + operator + ''' %(name)s OR
partner.display_name ''' + operator +
' %(name)s ' + limit_str, query_args)
ids = map(lambda x: x[0], cr.fetchall()) ids = map(lambda x: x[0], cr.fetchall())
ids = self.search(cr, uid, [('id', 'in', ids)] + args, limit=limit, context=context)
ids = self.search(cr, uid, [('id', 'in', ids)] + args,
limit=limit, context=context)
if ids: if ids:
return self.name_get(cr, uid, ids, context) return self.name_get(cr, uid, ids, context)
return super(res_partner,self).name_search(cr, uid, name, args, operator=operator, context=context, limit=limit)
return super(res_partner, self).name_search(cr, uid, name, args,
operator=operator,
context=context,
limit=limit)

219
partner_do_merge/wizard/base_partner_merge.py
View File

@ -70,8 +70,9 @@ class MergePartnerLine(osv.TransientModel):
class MergePartnerAutomatic(osv.TransientModel): class MergePartnerAutomatic(osv.TransientModel):
""" """
The idea behind this wizard is to create a list of potential partners to
merge. We use two objects, the first one is the wizard for the end-user.
The idea behind this wizard is to create a list of potential partners
to merge. We use two objects, the first one is the wizard for
the end-user.
And the second will contain the partner list to merge. And the second will contain the partner list to merge.
""" """
_name = 'base.partner.merge.automatic.wizard' _name = 'base.partner.merge.automatic.wizard'
@ -91,25 +92,32 @@ class MergePartnerAutomatic(osv.TransientModel):
readonly=True, readonly=True,
required=True), required=True),
'number_group': fields.integer("Group of Contacts", readonly=True), 'number_group': fields.integer("Group of Contacts", readonly=True),
'current_line_id': fields.many2one('base.partner.merge.line', 'Current Line'),
'line_ids': fields.one2many('base.partner.merge.line', 'wizard_id', 'Lines'),
'current_line_id': fields.many2one('base.partner.merge.line',
'Current Line'),
'line_ids': fields.one2many('base.partner.merge.line',
'wizard_id', 'Lines'),
'partner_ids': fields.many2many('res.partner', string='Contacts'), 'partner_ids': fields.many2many('res.partner', string='Contacts'),
'dst_partner_id': fields.many2one('res.partner', string='Destination Contact'),
'dst_partner_id': fields.many2one('res.partner',
string='Destination Contact'),
'exclude_contact': fields.boolean('A user associated to the contact'), 'exclude_contact': fields.boolean('A user associated to the contact'),
'exclude_journal_item': fields.boolean('Journal Items associated to the contact'),
'exclude_journal_item': fields.boolean('Journal Items associated to '
'the contact'),
'maximum_group': fields.integer("Maximum of Group of Contacts"), 'maximum_group': fields.integer("Maximum of Group of Contacts"),
} }
def default_get(self, cr, uid, fields, context=None): def default_get(self, cr, uid, fields, context=None):
if context is None: if context is None:
context = {} context = {}
res = super(MergePartnerAutomatic, self).default_get(cr, uid, fields, context)
if context.get('active_model') == 'res.partner' and context.get('active_ids'):
res = super(MergePartnerAutomatic, self).default_get(
cr, uid, fields, context)
if context.get('active_model') == 'res.partner' and \
context.get('active_ids'):
partner_ids = context['active_ids'] partner_ids = context['active_ids']
res['state'] = 'selection' res['state'] = 'selection'
res['partner_ids'] = partner_ids res['partner_ids'] = partner_ids
res['dst_partner_id'] = self._get_ordered_partner(cr, uid, partner_ids, context=context)[-1].id
res['dst_partner_id'] = self._get_ordered_partner(
cr, uid, partner_ids, context=context)[-1].id
return res return res
_defaults = { _defaults = {
@ -135,8 +143,11 @@ class MergePartnerAutomatic(osv.TransientModel):
""" """
return cr.execute(q, (table,)) return cr.execute(q, (table,))
def _update_foreign_keys(self, cr, uid, src_partners, dst_partner, context=None):
_logger.debug('_update_foreign_keys for dst_partner: %s for src_partners: %r', dst_partner.id, list(map(operator.attrgetter('id'), src_partners)))
def _update_foreign_keys(self, cr, uid, src_partners, dst_partner,
context=None):
_logger.debug(
'_update_foreign_keys for dst_partner: %s for src_partners: %r',
dst_partner.id, list(map(operator.attrgetter('id'), src_partners)))
# find the many2one relation to a partner # find the many2one relation to a partner
proxy = self.pool.get('res.partner') proxy = self.pool.get('res.partner')
@ -149,7 +160,9 @@ class MergePartnerAutomatic(osv.TransientModel):
continue continue
partner_ids = tuple(map(int, src_partners)) partner_ids = tuple(map(int, src_partners))
query = "SELECT column_name FROM information_schema.columns WHERE table_name LIKE '%s'" % (table)
query = """SELECT column_name FROM information_schema.columns
WHERE table_name LIKE '%s'""" % (
table)
cr.execute(query, ()) cr.execute(query, ())
columns = [] columns = []
for data in cr.fetchall(): for data in cr.fetchall():
@ -176,11 +189,13 @@ class MergePartnerAutomatic(osv.TransientModel):
___tu.%(value)s = ___tw.%(value)s ___tu.%(value)s = ___tw.%(value)s
)""" % query_dic )""" % query_dic
for partner_id in partner_ids: for partner_id in partner_ids:
cr.execute(query, (dst_partner.id, partner_id, dst_partner.id))
cr.execute(query, (
dst_partner.id, partner_id, dst_partner.id))
else: else:
cr.execute("SAVEPOINT recursive_partner_savepoint") cr.execute("SAVEPOINT recursive_partner_savepoint")
try: try:
query = 'UPDATE "%(table)s" SET %(column)s = %%s WHERE %(column)s IN %%s' % query_dic
query = '''UPDATE "%(table)s" SET %(column)s = %%s
WHERE %(column)s IN %%s''' % query_dic
cr.execute(query, (dst_partner.id, partner_ids,)) cr.execute(query, (dst_partner.id, partner_ids,))
if column == proxy._parent_name and table == 'res_partner': if column == proxy._parent_name and table == 'res_partner':
@ -188,45 +203,61 @@ class MergePartnerAutomatic(osv.TransientModel):
WITH RECURSIVE cycle(id, parent_id) AS ( WITH RECURSIVE cycle(id, parent_id) AS (
SELECT id, parent_id FROM res_partner SELECT id, parent_id FROM res_partner
UNION UNION
SELECT cycle.id, res_partner.parent_id
FROM res_partner, cycle
WHERE res_partner.id = cycle.parent_id AND
SELECT cycle.id, res_partner.parent_id
FROM res_partner, cycle
WHERE res_partner.id = cycle.parent_id AND
cycle.id != cycle.parent_id cycle.id != cycle.parent_id
) )
SELECT id FROM cycle WHERE id = parent_id AND id = %s
SELECT id FROM cycle
WHERE id = parent_id AND id = %s
""" """
cr.execute(query, (dst_partner.id,)) cr.execute(query, (dst_partner.id,))
if cr.fetchall(): if cr.fetchall():
cr.execute("ROLLBACK TO SAVEPOINT recursive_partner_savepoint")
cr.execute(
"ROLLBACK TO SAVEPOINT "
"recursive_partner_savepoint")
finally: finally:
cr.execute("RELEASE SAVEPOINT recursive_partner_savepoint") cr.execute("RELEASE SAVEPOINT recursive_partner_savepoint")
def _update_reference_fields(self, cr, uid, src_partners, dst_partner, context=None):
_logger.debug('_update_reference_fields for dst_partner: %s for src_partners: %r', dst_partner.id, list(map(operator.attrgetter('id'), src_partners)))
def _update_reference_fields(self, cr, uid, src_partners,
dst_partner, context=None):
_logger.debug('''_update_reference_fields for dst_partner: %s
for src_partners: %r''', dst_partner.id, list(
map(operator.attrgetter('id'), src_partners)))
def update_records(model, src, field_model='model', field_id='res_id', context=None):
def update_records(model, src, field_model='model',
field_id='res_id', context=None):
proxy = self.pool.get(model) proxy = self.pool.get(model)
if proxy is None: if proxy is None:
return return
domain = [(field_model, '=', 'res.partner'), (field_id, '=', src.id)]
ids = proxy.search(cr, openerp.SUPERUSER_ID, domain, context=context)
return proxy.write(cr, openerp.SUPERUSER_ID, ids, {field_id: dst_partner.id}, context=context)
domain = [(field_model, '=', 'res.partner'), (
field_id, '=', src.id)]
ids = proxy.search(
cr, openerp.SUPERUSER_ID, domain, context=context)
return proxy.write(cr, openerp.SUPERUSER_ID, ids,
{field_id: dst_partner.id}, context=context)
update_records = functools.partial(update_records, context=context) update_records = functools.partial(update_records, context=context)
for partner in src_partners: for partner in src_partners:
update_records('base.calendar', src=partner, field_model='model_id.model')
update_records('ir.attachment', src=partner, field_model='res_model')
update_records('mail.followers', src=partner, field_model='res_model')
update_records(
'base.calendar', src=partner, field_model='model_id.model')
update_records(
'ir.attachment', src=partner, field_model='res_model')
update_records(
'mail.followers', src=partner, field_model='res_model')
update_records('mail.message', src=partner) update_records('mail.message', src=partner)
update_records('marketing.campaign.workitem', src=partner, field_model='object_id.model')
update_records('marketing.campaign.workitem',
src=partner, field_model='object_id.model')
update_records('ir.model.data', src=partner) update_records('ir.model.data', src=partner)
proxy = self.pool['ir.model.fields'] proxy = self.pool['ir.model.fields']
domain = [('ttype', '=', 'reference')] domain = [('ttype', '=', 'reference')]
record_ids = proxy.search(cr, openerp.SUPERUSER_ID, domain, context=context)
record_ids = proxy.search(
cr, openerp.SUPERUSER_ID, domain, context=context)
for record in proxy.browse(cr, openerp.SUPERUSER_ID, record_ids, context=context):
for record in proxy.browse(cr, openerp.SUPERUSER_ID, record_ids,
context=context):
proxy_model = self.pool[record.model] proxy_model = self.pool[record.model]
field_type = proxy_model._columns.get(record.name).__class__._type field_type = proxy_model._columns.get(record.name).__class__._type
@ -238,16 +269,22 @@ class MergePartnerAutomatic(osv.TransientModel):
domain = [ domain = [
(record.name, '=', 'res.partner,%d' % partner.id) (record.name, '=', 'res.partner,%d' % partner.id)
] ]
model_ids = proxy_model.search(cr, openerp.SUPERUSER_ID, domain, context=context)
model_ids = proxy_model.search(
cr, openerp.SUPERUSER_ID, domain, context=context)
values = { values = {
record.name: 'res.partner,%d' % dst_partner.id, record.name: 'res.partner,%d' % dst_partner.id,
} }
proxy_model.write(cr, openerp.SUPERUSER_ID, model_ids, values, context=context)
proxy_model.write(
cr, openerp.SUPERUSER_ID, model_ids, values,
context=context)
def _update_values(self, cr, uid, src_partners, dst_partner, context=None): def _update_values(self, cr, uid, src_partners, dst_partner, context=None):
_logger.debug('_update_values for dst_partner: %s for src_partners: %r', dst_partner.id, list(map(operator.attrgetter('id'), src_partners)))
_logger.debug(
'_update_values for dst_partner: %s for src_partners: %r',
dst_partner.id, list(map(operator.attrgetter('id'), src_partners)))
columns = dst_partner._columns columns = dst_partner._columns
def write_serializer(column, item): def write_serializer(column, item):
if isinstance(item, browse_record): if isinstance(item, browse_record):
return item.id return item.id
@ -256,7 +293,8 @@ class MergePartnerAutomatic(osv.TransientModel):
values = dict() values = dict()
for column, field in columns.iteritems(): for column, field in columns.iteritems():
if field._type not in ('many2many', 'one2many') and not isinstance(field, fields.function):
if field._type not in ('many2many', 'one2many') and not \
isinstance(field, fields.function):
for item in itertools.chain(src_partners, [dst_partner]): for item in itertools.chain(src_partners, [dst_partner]):
if item[column]: if item[column]:
values[column] = write_serializer(column, item[column]) values[column] = write_serializer(column, item[column])
@ -268,7 +306,10 @@ class MergePartnerAutomatic(osv.TransientModel):
try: try:
dst_partner.write({'parent_id': parent_id}) dst_partner.write({'parent_id': parent_id})
except (osv.except_osv, orm.except_orm): except (osv.except_osv, orm.except_orm):
_logger.info('Skip recursive partner hierarchies for parent_id %s of partner: %s', parent_id, dst_partner.id)
_logger.info(
'''Skip recursive partner hierarchies
for parent_id %s of partner: %s''', parent_id,
dst_partner.id)
@mute_logger('openerp.osv.expression', 'openerp.osv.orm') @mute_logger('openerp.osv.expression', 'openerp.osv.orm')
def _merge(self, cr, uid, partner_ids, dst_partner=None, context=None): def _merge(self, cr, uid, partner_ids, dst_partner=None, context=None):
@ -279,22 +320,46 @@ class MergePartnerAutomatic(osv.TransientModel):
return return
if len(partner_ids) > 10: if len(partner_ids) > 10:
raise osv.except_osv(_('Error'), _("For safety reasons, you cannot merge more than 3 contacts together. You can re-open the wizard several times if needed."))
if openerp.SUPERUSER_ID != uid and len(set(partner.email for partner in proxy.browse(cr, uid, partner_ids, context=context))) > 1:
raise osv.except_osv(_('Error'), _("All contacts must have the same email. Only the Administrator can merge contacts with different emails."))
raise osv.except_osv(_('Error'), _(
"""For safety reasons, you cannot merge more than 3 contacts
together. You can re-open the wizard several
times if needed."""))
if openerp.SUPERUSER_ID != uid and \
len(set(partner.email for partner in
proxy.browse(cr, uid,
partner_ids,
context))) > 1:
raise osv.except_osv(_('Error'), _(
"""All contacts must have the same email. Only the
Administrator can merge contacts with different
emails."""))
if dst_partner and dst_partner.id in partner_ids: if dst_partner and dst_partner.id in partner_ids:
src_partners = proxy.browse(cr, uid, [id for id in partner_ids if id != dst_partner.id], context=context)
src_partners = proxy.browse(cr, uid, [
id for id in partner_ids
if id != dst_partner.id],
context=context)
else: else:
ordered_partners = self._get_ordered_partner(cr, uid, partner_ids, context)
ordered_partners = self._get_ordered_partner(
cr, uid, partner_ids, context)
dst_partner = ordered_partners[-1] dst_partner = ordered_partners[-1]
src_partners = ordered_partners[:-1] src_partners = ordered_partners[:-1]
_logger.info("dst_partner: %s", dst_partner.id) _logger.info("dst_partner: %s", dst_partner.id)
if openerp.SUPERUSER_ID != uid and self._model_is_installed(cr, uid, 'account.move.line', context=context) and \
self.pool.get('account.move.line').search(cr, openerp.SUPERUSER_ID, [('partner_id', 'in', [partner.id for partner in src_partners])], context=context):
raise osv.except_osv(_('Error'), _("Only the destination contact may be linked to existing Journal Items. Please ask the Administrator if you need to merge several contacts linked to existing Journal Items."))
if openerp.SUPERUSER_ID != uid and \
self._model_is_installed(cr, uid, 'account.move.line',
context=context) and \
self.pool.get('account.move.line').\
search(cr, openerp.SUPERUSER_ID,
[('partner_id', 'in', [partner.id for partner in
src_partners])],
context=context):
raise osv.except_osv(_('Error'), _(
"""Only the destination contact may be linked to existing
Journal Items. Please ask the Administrator if you need
to merge several contacts linked to existing Journal
Items."""))
call_it = lambda function: function(cr, uid, src_partners, dst_partner, call_it = lambda function: function(cr, uid, src_partners, dst_partner,
context=context) context=context)
@ -303,18 +368,23 @@ class MergePartnerAutomatic(osv.TransientModel):
call_it(self._update_reference_fields) call_it(self._update_reference_fields)
call_it(self._update_values) call_it(self._update_values)
_logger.info('(uid = %s) merged the partners %r with %s', uid, list(map(operator.attrgetter('id'), src_partners)), dst_partner.id)
dst_partner.message_post(body='%s %s'%(_("Merged with the following partners:"), ", ".join('%s<%s>(ID %s)' % (p.name, p.email or 'n/a', p.id) for p in src_partners)))
_logger.info('(uid = %s) merged the partners %r with %s', uid, list(
map(operator.attrgetter('id'), src_partners)), dst_partner.id)
dst_partner.message_post(body='%s %s' %
(_("Merged with the following partners:"),
", ".join('%s<%s>(ID %s)' %
(p.name, p.email or 'n/a', p.id) for p in
src_partners)))
for partner in src_partners: for partner in src_partners:
partner.unlink() partner.unlink()
def clean_emails(self, cr, uid, context=None): def clean_emails(self, cr, uid, context=None):
""" """
Clean the email address of the partner, if there is an email field with
a mimum of two addresses, the system will create a new partner, with the
information of the previous one and will copy the new cleaned email into
the email field.
Clean the email address of the partner, if there is an email field
with a mimum of two addresses, the system will create a new partner,
with the information of the previous one and will copy the new cleaned
email into the email field.
""" """
if context is None: if context is None:
context = {} context = {}
@ -359,7 +429,8 @@ class MergePartnerAutomatic(osv.TransientModel):
context=context) context=context)
except Exception: except Exception:
_logger.exception("There is a problem with this partner: %r", partner)
_logger.exception(
"There is a problem with this partner: %r", partner)
raise raise
return True return True
@ -416,7 +487,8 @@ class MergePartnerAutomatic(osv.TransientModel):
if not groups: if not groups:
raise osv.except_osv(_('Error'), raise osv.except_osv(_('Error'),
_("You have to specify a filter for your selection"))
_("""You have to specify a filter for your
selection"""))
return groups return groups
@ -431,10 +503,13 @@ class MergePartnerAutomatic(osv.TransientModel):
return self._next_screen(cr, uid, this, context) return self._next_screen(cr, uid, this, context)
def _get_ordered_partner(self, cr, uid, partner_ids, context=None): def _get_ordered_partner(self, cr, uid, partner_ids, context=None):
partners = self.pool.get('res.partner').browse(cr, uid, list(partner_ids), context=context)
partners = self.pool.get('res.partner').browse(
cr, uid, list(partner_ids), context=context)
ordered_partners = sorted(sorted(partners, ordered_partners = sorted(sorted(partners,
key=operator.attrgetter('create_date'), reverse=True),
key=operator.attrgetter('active'), reverse=True)
key=operator.attrgetter(
'create_date'), reverse=True),
key=operator.attrgetter('active'),
reverse=True)
return ordered_partners return ordered_partners
def _next_screen(self, cr, uid, this, context=None): def _next_screen(self, cr, uid, this, context=None):
@ -447,7 +522,10 @@ class MergePartnerAutomatic(osv.TransientModel):
values.update({ values.update({
'current_line_id': current_line.id, 'current_line_id': current_line.id,
'partner_ids': [(6, 0, current_partner_ids)], 'partner_ids': [(6, 0, current_partner_ids)],
'dst_partner_id': self._get_ordered_partner(cr, uid, current_partner_ids, context)[-1].id,
'dst_partner_id': self.
_get_ordered_partner(cr, uid,
current_partner_ids,
context)[-1].id,
'state': 'selection', 'state': 'selection',
}) })
else: else:
@ -486,8 +564,8 @@ class MergePartnerAutomatic(osv.TransientModel):
def compute_models(self, cr, uid, ids, context=None): def compute_models(self, cr, uid, ids, context=None):
""" """
Compute the different models needed by the system if you want to exclude
some partners.
Compute the different models needed by the system if you want to
exclude some partners.
""" """
assert is_integer_list(ids) assert is_integer_list(ids)
@ -497,7 +575,9 @@ class MergePartnerAutomatic(osv.TransientModel):
if this.exclude_contact: if this.exclude_contact:
models['res.users'] = 'partner_id' models['res.users'] = 'partner_id'
if self._model_is_installed(cr, uid, 'account.move.line', context=context) and this.exclude_journal_item:
if self._model_is_installed(cr, uid, 'account.move.line',
context=context) and \
this.exclude_journal_item:
models['account.move.line'] = 'partner_id' models['account.move.line'] = 'partner_id'
return models return models
@ -513,7 +593,8 @@ class MergePartnerAutomatic(osv.TransientModel):
counter = 0 counter = 0
for min_id, aggr_ids in cr.fetchall(): for min_id, aggr_ids in cr.fetchall():
if models and self._partner_use_in(cr, uid, aggr_ids, models, context=context):
if models and self._partner_use_in(cr, uid, aggr_ids,
models, context=context):
continue continue
values = { values = {
'wizard_id': this.id, 'wizard_id': this.id,
@ -537,7 +618,8 @@ class MergePartnerAutomatic(osv.TransientModel):
""" """
Start the process. Start the process.
* Compute the selected groups (with duplication) * Compute the selected groups (with duplication)
* If the user has selected the 'exclude_XXX' fields, avoid the partners.
* If the user has selected the 'exclude_XXX' fields, avoid the
partners.
""" """
assert is_integer_list(ids) assert is_integer_list(ids)
@ -649,7 +731,8 @@ class MergePartnerAutomatic(osv.TransientModel):
self.parent_migration_process_cb(cr, uid, ids, context=None) self.parent_migration_process_cb(cr, uid, ids, context=None)
list_merge = [ list_merge = [
{'group_by_vat': True, 'group_by_email': True, 'group_by_name': True},
{'group_by_vat': True, 'group_by_email':
True, 'group_by_name': True},
# {'group_by_name': True, 'group_by_is_company': True, 'group_by_parent_id': True}, # {'group_by_name': True, 'group_by_is_company': True, 'group_by_parent_id': True},
# {'group_by_email': True, 'group_by_is_company': True, 'group_by_parent_id': True}, # {'group_by_email': True, 'group_by_is_company': True, 'group_by_parent_id': True},
# {'group_by_name': True, 'group_by_vat': True, 'group_by_is_company': True, 'exclude_journal_item': True}, # {'group_by_name': True, 'group_by_vat': True, 'group_by_is_company': True, 'exclude_journal_item': True},
@ -735,11 +818,14 @@ class MergePartnerAutomatic(osv.TransientModel):
continue continue
partner_treated.append(email) partner_treated.append(email)
# don't update the partners if they are more of one who have invoice
# don't update the partners if they are more of one who have
# invoice
cr.execute(""" SELECT * cr.execute(""" SELECT *
FROM res_partner as p FROM res_partner as p
WHERE p.id != %s AND p.email LIKE '%%%s' AND WHERE p.id != %s AND p.email LIKE '%%%s' AND
EXISTS (SELECT * FROM account_invoice as a WHERE p.id = a.partner_id AND a.state in ('open','paid'))
EXISTS (SELECT * FROM account_invoice as a
WHERE p.id = a.partner_id AND
a.state in ('open','paid'))
""" % (id, email)) """ % (id, email))
if len(cr.fetchall()) > 1: if len(cr.fetchall()) > 1:
@ -749,7 +835,8 @@ class MergePartnerAutomatic(osv.TransientModel):
# to display changed values # to display changed values
cr.execute(""" SELECT id,email cr.execute(""" SELECT id,email
FROM res_partner FROM res_partner
WHERE parent_id != %s AND id != %s AND email LIKE '%%%s'
WHERE parent_id != %s AND id != %s
AND email LIKE '%%%s'
""" % (id, id, email)) """ % (id, id, email))
_logger.info("%r", cr.fetchall()) _logger.info("%r", cr.fetchall())

Write Preview
Loading…
Cancel
Save