diff options
| author | Thibault Delavallée <tde@odoo.com> | 2019-01-15 11:58:05 +0000 |
|---|---|---|
| committer | Thibault Delavallée <tde@odoo.com> | 2019-04-23 10:53:33 +0000 |
| commit | 924a6d2a8ac535c634e58449b96c3254bb108e17 (patch) | |
| tree | d56692bfb2c123e7f33fd7bba27ce595ffd2363c /addons | |
| parent | 04d5c36dd29db494e05784099f184759ea4ec669 (diff) | |
[MOV] hr: move files according to guidelines
Recent merge d5fd84b89a51ef41ca0aa13cf7acc94e684d40ce added onboarding plans to employees with some
new models. However conventions for naming files and views are not done.
This commit fixes that to ensure code readability.
Commit linked to task ID 1923387 and PR #30235.
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/hr/__manifest__.py | 4 | ||||
| -rw-r--r-- | addons/hr/models/__init__.py | 3 | ||||
| -rw-r--r-- | addons/hr/models/hr_plan.py (renamed from addons/hr/models/plan.py) | 0 | ||||
| -rw-r--r-- | addons/hr/wizard/__init__.py | 4 | ||||
| -rw-r--r-- | addons/hr/wizard/hr_departure_wizard.py (renamed from addons/hr/wizard/departure_wizard.py) | 0 | ||||
| -rw-r--r-- | addons/hr/wizard/hr_departure_wizard_views.xml (renamed from addons/hr/wizard/departure_wizard_views.xml) | 0 | ||||
| -rw-r--r-- | addons/hr/wizard/hr_plan_wizard.py (renamed from addons/hr/wizard/plan_wizard.py) | 0 | ||||
| -rw-r--r-- | addons/hr/wizard/hr_plan_wizard_views.xml (renamed from addons/hr/wizard/plan_wizard_views.xml) | 0 |
8 files changed, 5 insertions, 6 deletions
diff --git a/addons/hr/__manifest__.py b/addons/hr/__manifest__.py index 7e8c5c61126..d3ed7d4b2fc 100644 --- a/addons/hr/__manifest__.py +++ b/addons/hr/__manifest__.py @@ -24,8 +24,8 @@ 'data': [ 'security/hr_security.xml', 'security/ir.model.access.csv', - 'wizard/plan_wizard_views.xml', - 'wizard/departure_wizard_views.xml', + 'wizard/hr_plan_wizard_views.xml', + 'wizard/hr_departure_wizard_views.xml', 'views/hr_views.xml', 'views/hr_templates.xml', 'views/res_config_settings_views.xml', diff --git a/addons/hr/models/__init__.py b/addons/hr/models/__init__.py index 6f85baf065b..fb22e57dcf7 100644 --- a/addons/hr/models/__init__.py +++ b/addons/hr/models/__init__.py @@ -7,5 +7,4 @@ from . import mail_alias from . import mail_channel from . import res_partner from . import res_users - -from . import plan +from . import hr_plan diff --git a/addons/hr/models/plan.py b/addons/hr/models/hr_plan.py index fee13675130..fee13675130 100644 --- a/addons/hr/models/plan.py +++ b/addons/hr/models/hr_plan.py diff --git a/addons/hr/wizard/__init__.py b/addons/hr/wizard/__init__.py index d2c87d24a36..09e602381ea 100644 --- a/addons/hr/wizard/__init__.py +++ b/addons/hr/wizard/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from . import plan_wizard -from . import departure_wizard +from . import hr_plan_wizard +from . import hr_departure_wizard diff --git a/addons/hr/wizard/departure_wizard.py b/addons/hr/wizard/hr_departure_wizard.py index 9efa96351c3..9efa96351c3 100644 --- a/addons/hr/wizard/departure_wizard.py +++ b/addons/hr/wizard/hr_departure_wizard.py diff --git a/addons/hr/wizard/departure_wizard_views.xml b/addons/hr/wizard/hr_departure_wizard_views.xml index 4e0ca36abfe..4e0ca36abfe 100644 --- a/addons/hr/wizard/departure_wizard_views.xml +++ b/addons/hr/wizard/hr_departure_wizard_views.xml diff --git a/addons/hr/wizard/plan_wizard.py b/addons/hr/wizard/hr_plan_wizard.py index b08428829ee..b08428829ee 100644 --- a/addons/hr/wizard/plan_wizard.py +++ b/addons/hr/wizard/hr_plan_wizard.py diff --git a/addons/hr/wizard/plan_wizard_views.xml b/addons/hr/wizard/hr_plan_wizard_views.xml index b6829e17ea3..b6829e17ea3 100644 --- a/addons/hr/wizard/plan_wizard_views.xml +++ b/addons/hr/wizard/hr_plan_wizard_views.xml |