From 7cf2f5c48349342699866d87352f462bf4fe227b Mon Sep 17 00:00:00 2001 From: Pedro Gonzalez Date: Tue, 10 Dec 2019 15:52:30 +0100 Subject: [PATCH] [MIG] 13.0 hr_attendance_report_theoretical_time --- hr_attendance_report_theoretical_time/README.rst | 8 ++++---- hr_attendance_report_theoretical_time/i18n/fr.po | 2 +- .../i18n/hr_attendance_report_theoretical_time.pot | 2 +- .../readme/CONTRIBUTORS.rst | 1 + .../hr_attendance_theoretical_time_report_views.xml | 2 +- .../static/description/index.html | 6 +++--- .../wizards/recompute_theoretical_attendance.py | 2 +- .../wizards/recompute_theoretical_attendance_views.xml | 2 +- .../wizards/wizard_theoretical_time.py | 4 ++-- oca_dependencies.txt | 1 + 10 files changed, 16 insertions(+), 14 deletions(-) create mode 100644 oca_dependencies.txt diff --git a/hr_attendance_report_theoretical_time/README.rst b/hr_attendance_report_theoretical_time/README.rst index e194b7eb8..d23252589 100644 --- a/hr_attendance_report_theoretical_time/README.rst +++ b/hr_attendance_report_theoretical_time/README.rst @@ -14,13 +14,13 @@ Theoretical vs Attended Time Analysis :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fhr-lightgray.png?logo=github - :target: https://github.com/OCA/hr/tree/12.0/hr_attendance_report_theoretical_time + :target: https://github.com/OCA/hr/tree/13.0/hr_attendance_report_theoretical_time :alt: OCA/hr .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png :target: https://translation.odoo-community.org/projects/hr-12-0/hr-12-0-hr_attendance_report_theoretical_time :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/116/12.0 + :target: https://runbot.odoo-community.org/runbot/116/13.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -122,7 +122,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -162,6 +162,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/hr `_ project on GitHub. +This module is part of the `OCA/hr `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/hr_attendance_report_theoretical_time/i18n/fr.po b/hr_attendance_report_theoretical_time/i18n/fr.po index ad77cea12..fbf70f06f 100644 --- a/hr_attendance_report_theoretical_time/i18n/fr.po +++ b/hr_attendance_report_theoretical_time/i18n/fr.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 12.0\n" +"Project-Id-Version: Odoo Server 13.0\n" "Report-Msgid-Bugs-To: \n" "PO-Revision-Date: 2019-05-24 14:19+0000\n" "Last-Translator: Kévin Allard \n" diff --git a/hr_attendance_report_theoretical_time/i18n/hr_attendance_report_theoretical_time.pot b/hr_attendance_report_theoretical_time/i18n/hr_attendance_report_theoretical_time.pot index 2b4149db5..6b25de7d6 100644 --- a/hr_attendance_report_theoretical_time/i18n/hr_attendance_report_theoretical_time.pot +++ b/hr_attendance_report_theoretical_time/i18n/hr_attendance_report_theoretical_time.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 12.0\n" +"Project-Id-Version: Odoo Server 13.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: <>\n" "Language-Team: \n" diff --git a/hr_attendance_report_theoretical_time/readme/CONTRIBUTORS.rst b/hr_attendance_report_theoretical_time/readme/CONTRIBUTORS.rst index 26349ca94..7c0ea63c1 100644 --- a/hr_attendance_report_theoretical_time/readme/CONTRIBUTORS.rst +++ b/hr_attendance_report_theoretical_time/readme/CONTRIBUTORS.rst @@ -2,3 +2,4 @@ * Pedro M. Baeza. * David Vidal +* Pedro Gonzalez diff --git a/hr_attendance_report_theoretical_time/reports/hr_attendance_theoretical_time_report_views.xml b/hr_attendance_report_theoretical_time/reports/hr_attendance_theoretical_time_report_views.xml index a575892b4..6cfca7334 100644 --- a/hr_attendance_report_theoretical_time/reports/hr_attendance_theoretical_time_report_views.xml +++ b/hr_attendance_report_theoretical_time/reports/hr_attendance_theoretical_time_report_views.xml @@ -44,7 +44,7 @@ Theoretical vs Attended Time Analysis hr.attendance.theoretical.time.report - form + {'search_default_previous_month': 1, 'search_default_current_month': 1, 'search_default_my': 1} pivot,graph diff --git a/hr_attendance_report_theoretical_time/static/description/index.html b/hr_attendance_report_theoretical_time/static/description/index.html index da9dc7fb0..5f88842c7 100644 --- a/hr_attendance_report_theoretical_time/static/description/index.html +++ b/hr_attendance_report_theoretical_time/static/description/index.html @@ -367,7 +367,7 @@

Theoretical vs Attended Time Analysis

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/hr Translate me on Weblate Try me on Runbot

+

Beta License: AGPL-3 OCA/hr Translate me on Weblate Try me on Runbot

This module adds a new report called “Theoretical vs Attended Time Analysis” that compares worked time, measured through attendances records, with the theoretical time, computed from employee’s working calendar, public holidays @@ -472,7 +472,7 @@

Bug Tracker

Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -feedback.

+feedback.

Do not contact contributors directly about support or help with technical issues.

@@ -507,7 +507,7 @@

Maintainers

OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.

-

This module is part of the OCA/hr project on GitHub.

+

This module is part of the OCA/hr project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

diff --git a/hr_attendance_report_theoretical_time/wizards/recompute_theoretical_attendance.py b/hr_attendance_report_theoretical_time/wizards/recompute_theoretical_attendance.py index 5ea0b17eb..a6035477d 100644 --- a/hr_attendance_report_theoretical_time/wizards/recompute_theoretical_attendance.py +++ b/hr_attendance_report_theoretical_time/wizards/recompute_theoretical_attendance.py @@ -20,7 +20,7 @@ class RecomputeTheoreticalAttendance(models.TransientModel): string="To", required=True, help="Recompute attendances up to this date" ) - @api.multi + def action_recompute(self): self.ensure_one() attendances = self.env["hr.attendance"].search( diff --git a/hr_attendance_report_theoretical_time/wizards/recompute_theoretical_attendance_views.xml b/hr_attendance_report_theoretical_time/wizards/recompute_theoretical_attendance_views.xml index 98a396ae9..d77e77307 100644 --- a/hr_attendance_report_theoretical_time/wizards/recompute_theoretical_attendance_views.xml +++ b/hr_attendance_report_theoretical_time/wizards/recompute_theoretical_attendance_views.xml @@ -4,7 +4,7 @@ Recompute Theoretical Attendances recompute.theoretical.attendance - form + form new diff --git a/hr_attendance_report_theoretical_time/wizards/wizard_theoretical_time.py b/hr_attendance_report_theoretical_time/wizards/wizard_theoretical_time.py index 0d3681c57..831f93a23 100644 --- a/hr_attendance_report_theoretical_time/wizards/wizard_theoretical_time.py +++ b/hr_attendance_report_theoretical_time/wizards/wizard_theoretical_time.py @@ -29,7 +29,7 @@ def _prepare_employee_domain(self): res.append(("department_id", "child_of", self.department_id.id)) return res - @api.multi + def populate(self): domain = self._prepare_employee_domain() self.employee_ids = self.env["hr.employee"].search(domain) @@ -44,7 +44,7 @@ def populate(self): } return action - @api.multi + def view_report(self): self.ensure_one() action = { diff --git a/oca_dependencies.txt b/oca_dependencies.txt new file mode 100644 index 000000000..573d7ab32 --- /dev/null +++ b/oca_dependencies.txt @@ -0,0 +1 @@ +hr-holidays