From bbeae326a72cf1b08080fd2bdcac7d40084d5b4b Mon Sep 17 00:00:00 2001 From: Hugo Adan Date: Sat, 12 Jun 2021 21:18:30 +0000 Subject: [PATCH] [FIX] hr_employee_firstname: Move fields to common employee MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Starting from 14.0, employee model was split into three models: - `hr.employee.public` - `hr.employee.private` - `hr.employee` (a common model) When this module was migrated, such split was not taken into account. This commit moves fields to the common model, so they don't fail when read from the public employee model. Closes #990 Co-Authored-By: Luis González --- hr_employee_firstname/i18n/hr_employee_firstname.pot | 12 ++++++++++++ hr_employee_firstname/models/__init__.py | 1 + hr_employee_firstname/models/hr_employee.py | 5 +---- hr_employee_firstname/models/hr_employee_base.py | 8 ++++++++ 4 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 hr_employee_firstname/models/hr_employee_base.py diff --git a/hr_employee_firstname/i18n/hr_employee_firstname.pot b/hr_employee_firstname/i18n/hr_employee_firstname.pot index b3bed042e55a..7527440b81fa 100644 --- a/hr_employee_firstname/i18n/hr_employee_firstname.pot +++ b/hr_employee_firstname/i18n/hr_employee_firstname.pot @@ -13,6 +13,11 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: hr_employee_firstname +#: model:ir.model,name:hr_employee_firstname.model_hr_employee_base +msgid "Basic Employee" +msgstr "" + #. module: hr_employee_firstname #: model:ir.model,name:hr_employee_firstname.model_res_config_settings msgid "Config Settings" @@ -20,6 +25,7 @@ msgstr "" #. module: hr_employee_firstname #: model:ir.model.fields,field_description:hr_employee_firstname.field_hr_employee__display_name +#: model:ir.model.fields,field_description:hr_employee_firstname.field_hr_employee_base__display_name #: model:ir.model.fields,field_description:hr_employee_firstname.field_res_config_settings__display_name msgid "Display Name" msgstr "" @@ -37,23 +43,29 @@ msgstr "" #. module: hr_employee_firstname #: model:ir.model.fields,field_description:hr_employee_firstname.field_hr_employee__firstname +#: model:ir.model.fields,field_description:hr_employee_firstname.field_hr_employee_base__firstname +#: model:ir.model.fields,field_description:hr_employee_firstname.field_hr_employee_public__firstname msgid "First name" msgstr "" #. module: hr_employee_firstname #: model:ir.model.fields,field_description:hr_employee_firstname.field_hr_employee__id +#: model:ir.model.fields,field_description:hr_employee_firstname.field_hr_employee_base__id #: model:ir.model.fields,field_description:hr_employee_firstname.field_res_config_settings__id msgid "ID" msgstr "" #. module: hr_employee_firstname #: model:ir.model.fields,field_description:hr_employee_firstname.field_hr_employee____last_update +#: model:ir.model.fields,field_description:hr_employee_firstname.field_hr_employee_base____last_update #: model:ir.model.fields,field_description:hr_employee_firstname.field_res_config_settings____last_update msgid "Last Modified on" msgstr "" #. module: hr_employee_firstname #: model:ir.model.fields,field_description:hr_employee_firstname.field_hr_employee__lastname +#: model:ir.model.fields,field_description:hr_employee_firstname.field_hr_employee_base__lastname +#: model:ir.model.fields,field_description:hr_employee_firstname.field_hr_employee_public__lastname msgid "Last name" msgstr "" diff --git a/hr_employee_firstname/models/__init__.py b/hr_employee_firstname/models/__init__.py index a28442fbae11..bdffa1bfc177 100644 --- a/hr_employee_firstname/models/__init__.py +++ b/hr_employee_firstname/models/__init__.py @@ -1,3 +1,4 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from . import base_config_settings +from . import hr_employee_base from . import hr_employee diff --git a/hr_employee_firstname/models/hr_employee.py b/hr_employee_firstname/models/hr_employee.py index e330fabd5bac..c16baff71121 100644 --- a/hr_employee_firstname/models/hr_employee.py +++ b/hr_employee_firstname/models/hr_employee.py @@ -4,7 +4,7 @@ import logging -from odoo import _, api, fields, models +from odoo import _, api, models from odoo.exceptions import ValidationError _logger = logging.getLogger(__name__) @@ -45,9 +45,6 @@ def _onchange_firstname_lastname(self): if self.firstname or self.lastname: self.name = self._get_name(self.lastname, self.firstname) - firstname = fields.Char() - lastname = fields.Char() - @api.model def _is_partner_firstname_installed(self): return bool( diff --git a/hr_employee_firstname/models/hr_employee_base.py b/hr_employee_firstname/models/hr_employee_base.py new file mode 100644 index 000000000000..c6c4a519f86d --- /dev/null +++ b/hr_employee_firstname/models/hr_employee_base.py @@ -0,0 +1,8 @@ +from odoo import fields, models + + +class HrEmployeeBase(models.AbstractModel): + _inherit = "hr.employee.base" + + firstname = fields.Char() + lastname = fields.Char()