diff --git a/hr_timesheet_computation_holiday/README.rst b/hr_timesheet_computation_holiday/README.rst index 9d52d7fa..c960f642 100644 --- a/hr_timesheet_computation_holiday/README.rst +++ b/hr_timesheet_computation_holiday/README.rst @@ -32,8 +32,8 @@ Contributors Maintainer ---------- -.. image:: https://opensynergy-indonesia.com/logo.png - :alt: OpenSynergy Indonesia - :target: https://opensynergy-indonesia.com +.. image:: https://simetri-sinergi.id/logo.png + :alt: PT. Simetri Sinergi Indonesia + :target: https://simetri-sinergi.id.com -This module is maintained by the OpenSynergy Indonesia. +This module is maintained by the PT. Simetri Sinergi Indonesia. diff --git a/hr_timesheet_computation_holiday/__init__.py b/hr_timesheet_computation_holiday/__init__.py index 814c5234..2709ef8f 100644 --- a/hr_timesheet_computation_holiday/__init__.py +++ b/hr_timesheet_computation_holiday/__init__.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- # Copyright 2018 OpenSynergy Indonesia +# Copyright 2020 PT. Simetri Sinergi Indonesia # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -from . import models +from . import ( + models, +) diff --git a/hr_timesheet_computation_holiday/__openerp__.py b/hr_timesheet_computation_holiday/__openerp__.py index f1598e3e..a801847b 100644 --- a/hr_timesheet_computation_holiday/__openerp__.py +++ b/hr_timesheet_computation_holiday/__openerp__.py @@ -1,18 +1,23 @@ # -*- coding: utf-8 -*- # Copyright 2018 OpenSynergy Indonesia +# Copyright 2020 PT. Simetri Sinergi Indonesia # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +# pylint: disable=locally-disabled, manifest-required-author { "name": "Timesheet Computation Integration With Holiday", - "version": "8.0.1.0.0", + "version": "8.0.1.0.1", "category": "Human Resource", - "website": "https://opensynergy-indonesia.com", - "author": "OpenSynergy Indonesia", + "website": "https://simetri-sinergi.id", + "author": "OpenSynergy Indonesia, PT. Simetri Sinergi Indonesia", "license": "AGPL-3", "installable": True, "depends": [ "hr_timesheet_computation", "hr_holidays", ], + "images": [ + "static/description/banner.png", + ], "data": [ "views/hr_timesheet_sheet_views.xml", "views/hr_holidays_views.xml", diff --git a/hr_timesheet_computation_holiday/models/__init__.py b/hr_timesheet_computation_holiday/models/__init__.py index c6f7222d..ecfc72cc 100644 --- a/hr_timesheet_computation_holiday/models/__init__.py +++ b/hr_timesheet_computation_holiday/models/__init__.py @@ -1,7 +1,9 @@ # -*- coding: utf-8 -*- # Copyright 2018 OpenSynergy Indonesia +# Copyright 2020 PT. Simetri Sinergi Indonesia # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -from . import hr_holidays -from . import hr_timesheet_computation_item -from . import hr_timesheet_sheet +from . import ( + hr_holidays, + hr_timesheet_computation_item, + hr_timesheet_sheet, +) diff --git a/hr_timesheet_computation_holiday/models/hr_holidays.py b/hr_timesheet_computation_holiday/models/hr_holidays.py index 9db71cd2..44b323a2 100644 --- a/hr_timesheet_computation_holiday/models/hr_holidays.py +++ b/hr_timesheet_computation_holiday/models/hr_holidays.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- # Copyright 2018 OpenSynergy Indonesia +# Copyright 2020 PT. Simetri Sinergi Indonesia # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from openerp import models, fields, api @@ -20,7 +21,7 @@ def _compute_sheet(self): criteria = [ ("employee_id", "=", holiday.employee_id.id), ("date_from", "<=", holiday.date_from), - ("date_to", ">=", holiday.date_from), + ("date_to", ">=", holiday.date_to), ] sheets = obj_sheet.search(criteria, limit=1) holiday.sheet_id = sheets[0].id if len(sheets) > 0 else False diff --git a/hr_timesheet_computation_holiday/models/hr_timesheet_computation_item.py b/hr_timesheet_computation_holiday/models/hr_timesheet_computation_item.py index 20869505..4ec2d05d 100644 --- a/hr_timesheet_computation_holiday/models/hr_timesheet_computation_item.py +++ b/hr_timesheet_computation_holiday/models/hr_timesheet_computation_item.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- # Copyright 2018 OpenSynergy Indonesia +# Copyright 2020 PT. Simetri Sinergi Indonesia # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from openerp import models, api diff --git a/hr_timesheet_computation_holiday/models/hr_timesheet_sheet.py b/hr_timesheet_computation_holiday/models/hr_timesheet_sheet.py index eaba6d26..b979bd0e 100644 --- a/hr_timesheet_computation_holiday/models/hr_timesheet_sheet.py +++ b/hr_timesheet_computation_holiday/models/hr_timesheet_sheet.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- # Copyright 2018 OpenSynergy Indonesia +# Copyright 2020 PT. Simetri Sinergi Indonesia # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from openerp import models, fields diff --git a/hr_timesheet_computation_holiday/static/description/banner.png b/hr_timesheet_computation_holiday/static/description/banner.png new file mode 100644 index 00000000..c93ebf1a Binary files /dev/null and b/hr_timesheet_computation_holiday/static/description/banner.png differ diff --git a/hr_timesheet_computation_holiday/static/description/icon.png b/hr_timesheet_computation_holiday/static/description/icon.png index 270415f7..4c8e1127 100644 Binary files a/hr_timesheet_computation_holiday/static/description/icon.png and b/hr_timesheet_computation_holiday/static/description/icon.png differ diff --git a/hr_timesheet_computation_holiday/views/hr_holidays_views.xml b/hr_timesheet_computation_holiday/views/hr_holidays_views.xml index 8c74bf66..f73c308d 100644 --- a/hr_timesheet_computation_holiday/views/hr_holidays_views.xml +++ b/hr_timesheet_computation_holiday/views/hr_holidays_views.xml @@ -1,5 +1,6 @@ diff --git a/hr_timesheet_computation_holiday/views/hr_timesheet_sheet_views.xml b/hr_timesheet_computation_holiday/views/hr_timesheet_sheet_views.xml index aaf9c689..0a335281 100644 --- a/hr_timesheet_computation_holiday/views/hr_timesheet_sheet_views.xml +++ b/hr_timesheet_computation_holiday/views/hr_timesheet_sheet_views.xml @@ -1,5 +1,6 @@