summaryrefslogtreecommitdiff
path: root/odoo
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-12-11 17:06:48 +0100
committerChristophe Simonis <chs@odoo.com>2018-12-11 17:06:48 +0100
commit55dafc20f6bfef845f7db2e365b78b570d75a1d2 (patch)
tree1da460e83e5473b2db0e058c32a22d32d9510bc0 /odoo
parent007669feac1fbf46860a22d17ab480c83937d735 (diff)
parent7e5d5045bfa7752176dd8f19c546ff6b19841381 (diff)
[MERGE] forward port branch 11.0 up to 7e5d5045bfa
Diffstat (limited to 'odoo')
-rw-r--r--odoo/fields.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/odoo/fields.py b/odoo/fields.py
index d8efade6691..d39fa6e35fa 100644
--- a/odoo/fields.py
+++ b/odoo/fields.py
@@ -2413,6 +2413,8 @@ class Many2many(_RelationalMulti):
self.column2 = '%s_id' % comodel._table
# check validity of table name
check_pg_name(self.relation)
+ else:
+ self.relation = self.column1 = self.column2 = None
def _setup_regular_full(self, model):
super(Many2many, self)._setup_regular_full(model)