Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion odoo/addons/base/wizard/base_partner_merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,9 @@ def _update_foreign_keys_generic(self, model, src_records, dst_record):
# this guarantees cache consistency
self.env.invalidate_all()

ignore_tables = dst_record._context.get('ignore_tables_fk', False)
for table, column in relations:
if 'base_partner_merge_' in table: # ignore two tables
if 'base_partner_merge_' in table or (ignore_tables and table in ignore_tables): # ignore two tables
continue

# get list of columns of current table (exept the current fk column)
Expand Down