From c30fd5cac7655d52cee099bf261a1be6762be693 Mon Sep 17 00:00:00 2001 From: Ravi Gohil Date: Thu, 3 Sep 2015 13:08:01 +0530 Subject: [PATCH] [MOV] hr: reorganise module directory --- addons/hr/__init__.py | 5 +---- addons/hr/__openerp__.py | 14 ++++++++------ addons/hr/{ => data}/hr_data.xml | 0 addons/hr/{ => data}/hr_demo.xml | 0 .../hr/{hr_tip_data.xml => data/web_tip_data.xml} | 0 addons/hr/models/__init__.py | 6 ++++++ addons/hr/{ => models}/hr.py | 0 addons/hr/{ => models}/res_partner.py | 0 addons/hr/{ => models}/res_users.py | 0 addons/hr/{ => views}/hr_dashboard.xml | 0 addons/hr/views/{hr.xml => hr_templates.xml} | 0 addons/hr/{hr_view.xml => views/hr_views.xml} | 0 12 files changed, 15 insertions(+), 10 deletions(-) rename addons/hr/{ => data}/hr_data.xml (100%) rename addons/hr/{ => data}/hr_demo.xml (100%) rename addons/hr/{hr_tip_data.xml => data/web_tip_data.xml} (100%) create mode 100644 addons/hr/models/__init__.py rename addons/hr/{ => models}/hr.py (100%) rename addons/hr/{ => models}/res_partner.py (100%) rename addons/hr/{ => models}/res_users.py (100%) rename addons/hr/{ => views}/hr_dashboard.xml (100%) rename addons/hr/views/{hr.xml => hr_templates.xml} (100%) rename addons/hr/{hr_view.xml => views/hr_views.xml} (100%) diff --git a/addons/hr/__init__.py b/addons/hr/__init__.py index 07286aeea05..81fc81d29c9 100644 --- a/addons/hr/__init__.py +++ b/addons/hr/__init__.py @@ -1,7 +1,4 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -import hr - -import res_users -import res_partner +import models diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py index 9529e1324f7..69271a45976 100644 --- a/addons/hr/__openerp__.py +++ b/addons/hr/__openerp__.py @@ -37,13 +37,15 @@ You can manage: 'data': [ 'security/hr_security.xml', 'security/ir.model.access.csv', - 'hr_view.xml', - 'hr_data.xml', - 'hr_tip_data.xml', - 'views/hr.xml', - 'hr_dashboard.xml', + 'views/hr_views.xml', + 'views/hr_templates.xml', + 'views/hr_dashboard.xml', + 'data/hr_data.xml', + 'data/web_tip_data.xml', + ], + 'demo': [ + 'data/hr_demo.xml' ], - 'demo': ['hr_demo.xml'], 'test': [ 'test/hr_users.yml', 'test/open2recruit2close_job.yml', diff --git a/addons/hr/hr_data.xml b/addons/hr/data/hr_data.xml similarity index 100% rename from addons/hr/hr_data.xml rename to addons/hr/data/hr_data.xml diff --git a/addons/hr/hr_demo.xml b/addons/hr/data/hr_demo.xml similarity index 100% rename from addons/hr/hr_demo.xml rename to addons/hr/data/hr_demo.xml diff --git a/addons/hr/hr_tip_data.xml b/addons/hr/data/web_tip_data.xml similarity index 100% rename from addons/hr/hr_tip_data.xml rename to addons/hr/data/web_tip_data.xml diff --git a/addons/hr/models/__init__.py b/addons/hr/models/__init__.py new file mode 100644 index 00000000000..c870236ee6c --- /dev/null +++ b/addons/hr/models/__init__.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +import hr +import res_partner +import res_users diff --git a/addons/hr/hr.py b/addons/hr/models/hr.py similarity index 100% rename from addons/hr/hr.py rename to addons/hr/models/hr.py diff --git a/addons/hr/res_partner.py b/addons/hr/models/res_partner.py similarity index 100% rename from addons/hr/res_partner.py rename to addons/hr/models/res_partner.py diff --git a/addons/hr/res_users.py b/addons/hr/models/res_users.py similarity index 100% rename from addons/hr/res_users.py rename to addons/hr/models/res_users.py diff --git a/addons/hr/hr_dashboard.xml b/addons/hr/views/hr_dashboard.xml similarity index 100% rename from addons/hr/hr_dashboard.xml rename to addons/hr/views/hr_dashboard.xml diff --git a/addons/hr/views/hr.xml b/addons/hr/views/hr_templates.xml similarity index 100% rename from addons/hr/views/hr.xml rename to addons/hr/views/hr_templates.xml diff --git a/addons/hr/hr_view.xml b/addons/hr/views/hr_views.xml similarity index 100% rename from addons/hr/hr_view.xml rename to addons/hr/views/hr_views.xml