From ea2e47660639db0a4f783a0a7a1afb87dead53c2 Mon Sep 17 00:00:00 2001 From: Ravi Gohil Date: Mon, 25 Apr 2016 14:44:42 +0530 Subject: [PATCH] [MOV] hr_holidays: reorganize module directory Also, - removed unused hr_bel_holidays_2008.xml file - removed unused action with xml_id 'act_hr_employee_holiday_request_approved' from hr_holidays_views.xml --- addons/hr_holidays/__init__.py | 3 +- addons/hr_holidays/__openerp__.py | 40 +++++----- .../{ => data}/hr_holidays_data.xml | 0 .../{ => data}/hr_holidays_demo.xml | 0 .../{ => data}/hr_holidays_workflow.xml | 0 addons/hr_holidays/hr_bel_holidays_2008.xml | 76 ------------------- addons/hr_holidays/models/__init__.py | 5 ++ .../{hr_department.py => models/hr.py} | 0 .../hr_holidays/{ => models}/hr_holidays.py | 0 addons/hr_holidays/report/__init__.py | 2 +- ...report.py => hr_holidays_leaves_report.py} | 0 ...ml => hr_holidays_leaves_report_views.xml} | 0 .../hr_holidays_reports.xml} | 0 .../hr_holidays_templates.xml} | 0 ...olidays_view.xml => hr_holidays_views.xml} | 0 .../{ir_rule.xml => hr_holidays_security.xml} | 0 .../hr_holidays_views.xml} | 0 .../{hr_dashboard.xml => views/hr_views.xml} | 0 ... hr_holidays_summary_department_views.xml} | 0 ...> hr_holidays_summary_employees_views.xml} | 0 20 files changed, 30 insertions(+), 96 deletions(-) rename addons/hr_holidays/{ => data}/hr_holidays_data.xml (100%) rename addons/hr_holidays/{ => data}/hr_holidays_demo.xml (100%) rename addons/hr_holidays/{ => data}/hr_holidays_workflow.xml (100%) delete mode 100644 addons/hr_holidays/hr_bel_holidays_2008.xml create mode 100644 addons/hr_holidays/models/__init__.py rename addons/hr_holidays/{hr_department.py => models/hr.py} (100%) rename addons/hr_holidays/{ => models}/hr_holidays.py (100%) rename addons/hr_holidays/report/{hr_holidays_report.py => hr_holidays_leaves_report.py} (100%) rename addons/hr_holidays/report/{hr_holidays_report_view.xml => hr_holidays_leaves_report_views.xml} (100%) rename addons/hr_holidays/{hr_holidays_report.xml => report/hr_holidays_reports.xml} (100%) rename addons/hr_holidays/{views/report_hr_holidays_summary.xml => report/hr_holidays_templates.xml} (100%) rename addons/hr_holidays/report/{available_holidays_view.xml => hr_holidays_views.xml} (100%) rename addons/hr_holidays/security/{ir_rule.xml => hr_holidays_security.xml} (100%) rename addons/hr_holidays/{hr_holidays_view.xml => views/hr_holidays_views.xml} (100%) rename addons/hr_holidays/{hr_dashboard.xml => views/hr_views.xml} (100%) rename addons/hr_holidays/wizard/{hr_holidays_summary_department_view.xml => hr_holidays_summary_department_views.xml} (100%) rename addons/hr_holidays/wizard/{hr_holidays_summary_employees_view.xml => hr_holidays_summary_employees_views.xml} (100%) diff --git a/addons/hr_holidays/__init__.py b/addons/hr_holidays/__init__.py index f9bd12244c0..d84fb182e8f 100644 --- a/addons/hr_holidays/__init__.py +++ b/addons/hr_holidays/__init__.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -import hr_department -import hr_holidays +import models import report import wizard diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py index 3c39fb66d13..1cf00f98666 100644 --- a/addons/hr_holidays/__openerp__.py +++ b/addons/hr_holidays/__openerp__.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. - { 'name': 'Leave Management', 'version': '1.5', @@ -17,7 +16,7 @@ This application controls the leave schedule of your company. It allows employee You can configure several kinds of leaves (sickness, paid days, ...) and allocate leaves to an employee or department quickly using leave allocation. An employee can also make a request for more days off by making a new Leave allocation. It will increase the total of available days for that leave type (if the request is accepted). -You can keep track of leaves in different ways by following reports: +You can keep track of leaves in different ways by following reports: * Leaves Summary * Leaves by Department @@ -28,25 +27,32 @@ A synchronization with an internal agenda (Meetings of the CRM module) is also p 'depends': ['hr', 'calendar', 'resource', 'product'], 'data': [ 'data/report_paperformat.xml', + 'data/hr_holidays_data.xml', + 'data/hr_holidays_workflow.xml', + 'security/ir.model.access.csv', - 'security/ir_rule.xml', - 'hr_holidays_workflow.xml', - 'hr_holidays_view.xml', - 'hr_holidays_data.xml', - 'hr_holidays_report.xml', - 'views/report_hr_holidays_summary.xml', - 'report/hr_holidays_report_view.xml', - 'report/available_holidays_view.xml', - 'wizard/hr_holidays_summary_department_view.xml', - 'wizard/hr_holidays_summary_employees_view.xml', - 'hr_dashboard.xml', - ], - 'demo': ['hr_holidays_demo.xml',], + 'security/hr_holidays_security.xml', + + 'views/hr_views.xml', + 'views/hr_holidays_views.xml', + + 'wizard/hr_holidays_summary_department_views.xml', + 'wizard/hr_holidays_summary_employees_views.xml', + + 'report/hr_holidays_templates.xml', + 'report/hr_holidays_reports.xml', + 'report/hr_holidays_leaves_report_views.xml', + 'report/hr_holidays_views.xml', + ], + 'demo': [ + 'data/hr_holidays_demo.xml', + ], 'qweb': [ 'static/src/xml/*.xml', ], - 'test': ['test/test_hr_holiday.yml', - 'test/hr_holidays_report.yml', + 'test': [ + 'test/test_hr_holiday.yml', + 'test/hr_holidays_report.yml', ], 'installable': True, 'application': True, diff --git a/addons/hr_holidays/hr_holidays_data.xml b/addons/hr_holidays/data/hr_holidays_data.xml similarity index 100% rename from addons/hr_holidays/hr_holidays_data.xml rename to addons/hr_holidays/data/hr_holidays_data.xml diff --git a/addons/hr_holidays/hr_holidays_demo.xml b/addons/hr_holidays/data/hr_holidays_demo.xml similarity index 100% rename from addons/hr_holidays/hr_holidays_demo.xml rename to addons/hr_holidays/data/hr_holidays_demo.xml diff --git a/addons/hr_holidays/hr_holidays_workflow.xml b/addons/hr_holidays/data/hr_holidays_workflow.xml similarity index 100% rename from addons/hr_holidays/hr_holidays_workflow.xml rename to addons/hr_holidays/data/hr_holidays_workflow.xml diff --git a/addons/hr_holidays/hr_bel_holidays_2008.xml b/addons/hr_holidays/hr_bel_holidays_2008.xml deleted file mode 100644 index 7b9a305704b..00000000000 --- a/addons/hr_holidays/hr_bel_holidays_2008.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - New Year - 2008-01-01 08:00 - 2008-01-01 18:00 - - - - - Easter Monday - 2008-03-24 08:00 - 2008-03-24 18:00 - - - - - Labour Day - 2008-05-01 08:00 - 2008-05-01 18:00 - - - - - Ascension - 2008-05-02 08:00 - 2008-05-02 18:00 - - - - - Pentecost Monday - 2008-05-12 08:00 - 2008-05-12 18:00 - - - - - National Day - 2008-07-21 08:00 - 2008-07-21 18:00 - - - - - Assumption Day - 2008-08-15 08:00 - 2008-08-15 18:00 - - - - - All Saints - 2008-11-01 08:00 - 2008-11-01 18:00 - - - - - Armistice - 2008-11-11 08:00 - 2008-11-11 18:00 - - - - - Christmas - 2008-12-25 08:00 - 2008-12-25 18:00 - - - - - diff --git a/addons/hr_holidays/models/__init__.py b/addons/hr_holidays/models/__init__.py new file mode 100644 index 00000000000..b5a5729a71f --- /dev/null +++ b/addons/hr_holidays/models/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +import hr +import hr_holidays diff --git a/addons/hr_holidays/hr_department.py b/addons/hr_holidays/models/hr.py similarity index 100% rename from addons/hr_holidays/hr_department.py rename to addons/hr_holidays/models/hr.py diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/models/hr_holidays.py similarity index 100% rename from addons/hr_holidays/hr_holidays.py rename to addons/hr_holidays/models/hr_holidays.py diff --git a/addons/hr_holidays/report/__init__.py b/addons/hr_holidays/report/__init__.py index e46445d3e77..125f7befa33 100644 --- a/addons/hr_holidays/report/__init__.py +++ b/addons/hr_holidays/report/__init__.py @@ -2,4 +2,4 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. import holidays_summary_report -import hr_holidays_report +import hr_holidays_leaves_report diff --git a/addons/hr_holidays/report/hr_holidays_report.py b/addons/hr_holidays/report/hr_holidays_leaves_report.py similarity index 100% rename from addons/hr_holidays/report/hr_holidays_report.py rename to addons/hr_holidays/report/hr_holidays_leaves_report.py diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_leaves_report_views.xml similarity index 100% rename from addons/hr_holidays/report/hr_holidays_report_view.xml rename to addons/hr_holidays/report/hr_holidays_leaves_report_views.xml diff --git a/addons/hr_holidays/hr_holidays_report.xml b/addons/hr_holidays/report/hr_holidays_reports.xml similarity index 100% rename from addons/hr_holidays/hr_holidays_report.xml rename to addons/hr_holidays/report/hr_holidays_reports.xml diff --git a/addons/hr_holidays/views/report_hr_holidays_summary.xml b/addons/hr_holidays/report/hr_holidays_templates.xml similarity index 100% rename from addons/hr_holidays/views/report_hr_holidays_summary.xml rename to addons/hr_holidays/report/hr_holidays_templates.xml diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/hr_holidays_views.xml similarity index 100% rename from addons/hr_holidays/report/available_holidays_view.xml rename to addons/hr_holidays/report/hr_holidays_views.xml diff --git a/addons/hr_holidays/security/ir_rule.xml b/addons/hr_holidays/security/hr_holidays_security.xml similarity index 100% rename from addons/hr_holidays/security/ir_rule.xml rename to addons/hr_holidays/security/hr_holidays_security.xml diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/views/hr_holidays_views.xml similarity index 100% rename from addons/hr_holidays/hr_holidays_view.xml rename to addons/hr_holidays/views/hr_holidays_views.xml diff --git a/addons/hr_holidays/hr_dashboard.xml b/addons/hr_holidays/views/hr_views.xml similarity index 100% rename from addons/hr_holidays/hr_dashboard.xml rename to addons/hr_holidays/views/hr_views.xml diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_views.xml similarity index 100% rename from addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml rename to addons/hr_holidays/wizard/hr_holidays_summary_department_views.xml diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_employees_views.xml similarity index 100% rename from addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml rename to addons/hr_holidays/wizard/hr_holidays_summary_employees_views.xml