Skip to content

Commit

Permalink
[FIX] hr_employee_firstname: Move fields to common employee
Browse files Browse the repository at this point in the history
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 OCA#990

Co-Authored-By: Luis González <[email protected]>
  • Loading branch information
2 people authored and andreagidaltig committed Nov 8, 2023
1 parent 9ea1617 commit bbeae32
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 4 deletions.
12 changes: 12 additions & 0 deletions hr_employee_firstname/i18n/hr_employee_firstname.pot
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,19 @@ 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"
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 ""
Expand All @@ -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 ""

Expand Down
1 change: 1 addition & 0 deletions hr_employee_firstname/models/__init__.py
Original file line number Diff line number Diff line change
@@ -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
5 changes: 1 addition & 4 deletions hr_employee_firstname/models/hr_employee.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__)
Expand Down Expand Up @@ -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(
Expand Down
8 changes: 8 additions & 0 deletions hr_employee_firstname/models/hr_employee_base.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
from odoo import fields, models


class HrEmployeeBase(models.AbstractModel):
_inherit = "hr.employee.base"

firstname = fields.Char()
lastname = fields.Char()

0 comments on commit bbeae32

Please sign in to comment.