|
@ -274,9 +274,9 @@ class MergePartnerAutomatic(orm.TransientModel): |
|
|
if record.model == 'ir.property': |
|
|
if record.model == 'ir.property': |
|
|
continue |
|
|
continue |
|
|
|
|
|
|
|
|
field_type = proxy_model._columns.get(record.name).__class__._type |
|
|
|
|
|
|
|
|
field_spec = proxy_model._fields.get(record.name) |
|
|
|
|
|
|
|
|
if field_type == 'function': |
|
|
|
|
|
|
|
|
if field_spec.compute: |
|
|
continue |
|
|
continue |
|
|
|
|
|
|
|
|
for partner in src_partners: |
|
|
for partner in src_partners: |
|
|