From d820f0f905c5e591df6b8b67bcfcfddffad37c9b Mon Sep 17 00:00:00 2001 From: Joren Van Onder Date: Fri, 24 Apr 2015 10:06:53 +0200 Subject: [PATCH] [MIG] hr_recruitment: restructure the files according to the guidelines --- addons/hr_recruitment/__init__.py | 5 ++--- addons/hr_recruitment/__openerp__.py | 18 +++++++++--------- .../{ => data}/hr_recruitment_data.xml | 0 .../{ => data}/hr_recruitment_demo.xml | 0 .../survey_survey_data.xml} | 0 addons/hr_recruitment/models/__init__.py | 3 +++ .../{ => models}/hr_department.py | 0 .../{ => models}/hr_recruitment.py | 0 .../hr_recruitment_config_settings.py} | 0 .../report/hr_recruitment_report.py | 2 +- ...iew.xml => hr_recruitment_report_views.xml} | 0 .../hr_department_views.xml} | 0 .../hr_job_views.xml} | 0 .../hr_recruitment_config_settings_views.xml} | 0 ...itment.xml => hr_recruitment_templates.xml} | 0 .../hr_recruitment_views.xml} | 0 16 files changed, 15 insertions(+), 13 deletions(-) rename addons/hr_recruitment/{ => data}/hr_recruitment_data.xml (100%) rename addons/hr_recruitment/{ => data}/hr_recruitment_demo.xml (100%) rename addons/hr_recruitment/{survey_data_recruitment.xml => data/survey_survey_data.xml} (100%) create mode 100644 addons/hr_recruitment/models/__init__.py rename addons/hr_recruitment/{ => models}/hr_department.py (100%) rename addons/hr_recruitment/{ => models}/hr_recruitment.py (100%) rename addons/hr_recruitment/{res_config.py => models/hr_recruitment_config_settings.py} (100%) rename addons/hr_recruitment/report/{hr_recruitment_report_view.xml => hr_recruitment_report_views.xml} (100%) rename addons/hr_recruitment/{hr_dashboard.xml => views/hr_department_views.xml} (100%) rename addons/hr_recruitment/{hr_recruitment_dashboard.xml => views/hr_job_views.xml} (100%) rename addons/hr_recruitment/{res_config_view.xml => views/hr_recruitment_config_settings_views.xml} (100%) rename addons/hr_recruitment/views/{hr_recruitment.xml => hr_recruitment_templates.xml} (100%) rename addons/hr_recruitment/{hr_recruitment_view.xml => views/hr_recruitment_views.xml} (100%) diff --git a/addons/hr_recruitment/__init__.py b/addons/hr_recruitment/__init__.py index 7fa05eecdfc..54bcaa9cd53 100644 --- a/addons/hr_recruitment/__init__.py +++ b/addons/hr_recruitment/__init__.py @@ -1,6 +1,5 @@ # -*- encoding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -import hr_department -import hr_recruitment + +import models import report -import res_config diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py index 1836d2c88c1..b7cf6e6abc0 100644 --- a/addons/hr_recruitment/__openerp__.py +++ b/addons/hr_recruitment/__openerp__.py @@ -28,18 +28,18 @@ You can define the different phases of interviews and easily rate the applicant 'utm', ], 'data': [ - 'hr_recruitment_view.xml', 'security/hr_recruitment_security.xml', 'security/ir.model.access.csv', - 'report/hr_recruitment_report_view.xml', - 'res_config_view.xml', - 'survey_data_recruitment.xml', - 'hr_recruitment_data.xml', - 'views/hr_recruitment.xml', - 'hr_dashboard.xml', - 'hr_recruitment_dashboard.xml', + 'data/survey_survey_data.xml', + 'data/hr_recruitment_data.xml', + 'views/hr_recruitment_views.xml', + 'report/hr_recruitment_report_views.xml', + 'views/hr_recruitment_config_settings_views.xml', + 'views/hr_recruitment_templates.xml', + 'views/hr_department_views.xml', + 'views/hr_job_views.xml', ], - 'demo': ['hr_recruitment_demo.xml'], + 'demo': ['data/hr_recruitment_demo.xml'], 'test': ['test/recruitment_process.yml'], 'installable': True, 'auto_install': False, diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/data/hr_recruitment_data.xml similarity index 100% rename from addons/hr_recruitment/hr_recruitment_data.xml rename to addons/hr_recruitment/data/hr_recruitment_data.xml diff --git a/addons/hr_recruitment/hr_recruitment_demo.xml b/addons/hr_recruitment/data/hr_recruitment_demo.xml similarity index 100% rename from addons/hr_recruitment/hr_recruitment_demo.xml rename to addons/hr_recruitment/data/hr_recruitment_demo.xml diff --git a/addons/hr_recruitment/survey_data_recruitment.xml b/addons/hr_recruitment/data/survey_survey_data.xml similarity index 100% rename from addons/hr_recruitment/survey_data_recruitment.xml rename to addons/hr_recruitment/data/survey_survey_data.xml diff --git a/addons/hr_recruitment/models/__init__.py b/addons/hr_recruitment/models/__init__.py new file mode 100644 index 00000000000..7fe013ee42c --- /dev/null +++ b/addons/hr_recruitment/models/__init__.py @@ -0,0 +1,3 @@ +import hr_department +import hr_recruitment +import hr_recruitment_config_settings diff --git a/addons/hr_recruitment/hr_department.py b/addons/hr_recruitment/models/hr_department.py similarity index 100% rename from addons/hr_recruitment/hr_department.py rename to addons/hr_recruitment/models/hr_department.py diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/models/hr_recruitment.py similarity index 100% rename from addons/hr_recruitment/hr_recruitment.py rename to addons/hr_recruitment/models/hr_recruitment.py diff --git a/addons/hr_recruitment/res_config.py b/addons/hr_recruitment/models/hr_recruitment_config_settings.py similarity index 100% rename from addons/hr_recruitment/res_config.py rename to addons/hr_recruitment/models/hr_recruitment_config_settings.py diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py index 47741295cef..b5755f869b6 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report.py +++ b/addons/hr_recruitment/report/hr_recruitment_report.py @@ -3,7 +3,7 @@ from openerp import tools from openerp.osv import fields, osv -from .. import hr_recruitment +from ..models import hr_recruitment from openerp.addons.decimal_precision import decimal_precision as dp diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_views.xml similarity index 100% rename from addons/hr_recruitment/report/hr_recruitment_report_view.xml rename to addons/hr_recruitment/report/hr_recruitment_report_views.xml diff --git a/addons/hr_recruitment/hr_dashboard.xml b/addons/hr_recruitment/views/hr_department_views.xml similarity index 100% rename from addons/hr_recruitment/hr_dashboard.xml rename to addons/hr_recruitment/views/hr_department_views.xml diff --git a/addons/hr_recruitment/hr_recruitment_dashboard.xml b/addons/hr_recruitment/views/hr_job_views.xml similarity index 100% rename from addons/hr_recruitment/hr_recruitment_dashboard.xml rename to addons/hr_recruitment/views/hr_job_views.xml diff --git a/addons/hr_recruitment/res_config_view.xml b/addons/hr_recruitment/views/hr_recruitment_config_settings_views.xml similarity index 100% rename from addons/hr_recruitment/res_config_view.xml rename to addons/hr_recruitment/views/hr_recruitment_config_settings_views.xml diff --git a/addons/hr_recruitment/views/hr_recruitment.xml b/addons/hr_recruitment/views/hr_recruitment_templates.xml similarity index 100% rename from addons/hr_recruitment/views/hr_recruitment.xml rename to addons/hr_recruitment/views/hr_recruitment_templates.xml diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/views/hr_recruitment_views.xml similarity index 100% rename from addons/hr_recruitment/hr_recruitment_view.xml rename to addons/hr_recruitment/views/hr_recruitment_views.xml