diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-04-18 18:30:35 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-04-18 18:30:35 +0200 |
| commit | c309ccd7b3d7e2f4884f6e9e47a98d64ceac8ea1 (patch) | |
| tree | 82deec2a691d9aee34d70aedac9b68ab75c2825c /odoo/addons/base | |
| parent | e63e9857411a056538f357b1800d31c835a1647c (diff) | |
| parent | fed775bc0c2d70463206bbdddd3cce9ae8469e6a (diff) | |
[MERGE] forward port branch saas-11.2 up to fed775bc0c2
Diffstat (limited to 'odoo/addons/base')
| -rw-r--r-- | odoo/addons/base/data/res.lang.csv | 2 | ||||
| -rw-r--r-- | odoo/addons/base/i18n/base.pot | 12 | ||||
| -rw-r--r-- | odoo/addons/base/models/ir_model.py | 7 |
3 files changed, 20 insertions, 1 deletions
diff --git a/odoo/addons/base/data/res.lang.csv b/odoo/addons/base/data/res.lang.csv index 7a15b0a7147..bea539d9325 100644 --- a/odoo/addons/base/data/res.lang.csv +++ b/odoo/addons/base/data/res.lang.csv @@ -1,7 +1,7 @@ "id","name","code","iso_code","direction","grouping","decimal_point","thousands_sep","date_format","time_format","translatable","week_start" "base.lang_en","English","en_US","en","Left-to-Right","[3,0]",".",",","%m/%d/%Y","%H:%M:%S","True","7" "base.lang_am_ET","Amharic / አምሃርኛ","am_ET","am_ET","Left-to-Right","[3,0]",".",",","%d/%m/%Y","%I:%M:%S","True","7" -"base.lang_ar_SY","Arabic / الْعَرَبيّة","ar_SY","ar_SY","Left-to-Right","[3,0]",".",",","%d %b, %Y","%I:%M:%S","True","6" +"base.lang_ar_SY","Arabic / الْعَرَبيّة","ar_SY","ar","Left-to-Right","[3,0]",".",",","%d %b, %Y","%I:%M:%S","True","6" "base.lang_eu_ES","Basque / Euskara","eu_ES","eu_ES","Left-to-Right","[]",",",,"%a, %Y.eko %bren %da","%H:%M:%S","True","1" "base.lang_bs_BA","Bosnian / bosanski jezik","bs_BA","bs","Left-to-Right","[]",",",,"%d.%m.%Y","%H:%M:%S","True","7" "base.lang_bg","Bulgarian / български език","bg_BG","bg","Left-to-Right","[3,0]",",",,"%d.%m.%Y","%H,%M,%S","True","1" diff --git a/odoo/addons/base/i18n/base.pot b/odoo/addons/base/i18n/base.pot index 31d78fc8e04..63cd8c07736 100644 --- a/odoo/addons/base/i18n/base.pot +++ b/odoo/addons/base/i18n/base.pot @@ -12045,6 +12045,18 @@ msgid "Memos pad" msgstr "" #. module: base +#: code:addons/base/ir/ir_model.py:382 +#, python-format +msgid "Model %s does not exist" +msgstr "" + +#. module: base +#: code:addons/base/ir/ir_model.py:383 +#, python-format +msgid "Please specify a valid model for the object relation" +msgstr "" + +#. module: base #: model:ir.model.fields,field_description:base.field_ir_ui_menu__name #: model:ir.ui.view,arch_db:base.edit_menu #: model:ir.ui.view,arch_db:base.edit_menu_access diff --git a/odoo/addons/base/models/ir_model.py b/odoo/addons/base/models/ir_model.py index 0176b2a8ed2..8981618590e 100644 --- a/odoo/addons/base/models/ir_model.py +++ b/odoo/addons/base/models/ir_model.py @@ -483,6 +483,13 @@ class IrModelFields(models.Model): def _onchange_ttype(self): self.copy = (self.ttype != 'one2many') if self.ttype == 'many2many' and self.model_id and self.relation: + if self.relation not in self.env: + return { + 'warning': { + 'title': _('Model %s does not exist') % self.relation, + 'message': _('Please specify a valid model for the object relation'), + } + } names = self._custom_many2many_names(self.model_id.model, self.relation) self.relation_table, self.column1, self.column2 = names else: |