From aadf3e22cce41e3f0fffa4c58c0d4488c9ab18a7 Mon Sep 17 00:00:00 2001 From: Elouan Date: Mon, 9 Sep 2019 16:37:36 +0200 Subject: [PATCH] Migration of module beesdoo_shift to version 11.0 --- beesdoo_shift/__init__.py | 5 ++--- beesdoo_shift/__manifest__.py | 1 - beesdoo_shift/data/cron.xml | 19 ++++++++----------- beesdoo_shift/models/__init__.py | 7 +++---- beesdoo_shift/models/cooperative_status.py | 1 - beesdoo_shift/models/planning.py | 3 +-- beesdoo_shift/models/task.py | 1 - beesdoo_shift/wizard/__init__.py | 14 +++++++------- beesdoo_shift/wizard/assign_super_coop.py | 1 - beesdoo_shift/wizard/batch_template.py | 1 - beesdoo_shift/wizard/extension.py | 1 - beesdoo_shift/wizard/holiday.py | 1 - beesdoo_shift/wizard/instanciate_planning.py | 1 - beesdoo_shift/wizard/subscribe.py | 1 - beesdoo_shift/wizard/temporary_exemption.py | 1 - 15 files changed, 21 insertions(+), 37 deletions(-) diff --git a/beesdoo_shift/__init__.py b/beesdoo_shift/__init__.py index 8d752fb..9b42961 100644 --- a/beesdoo_shift/__init__.py +++ b/beesdoo_shift/__init__.py @@ -1,3 +1,2 @@ -# -*- coding: utf-8 -*- -import models -import wizard +from . import models +from . import wizard diff --git a/beesdoo_shift/__manifest__.py b/beesdoo_shift/__manifest__.py index 97ee7a6..86e46f8 100644 --- a/beesdoo_shift/__manifest__.py +++ b/beesdoo_shift/__manifest__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- { 'name': "Beescoop Shift Management", diff --git a/beesdoo_shift/data/cron.xml b/beesdoo_shift/data/cron.xml index a67f050..bc5a23d 100644 --- a/beesdoo_shift/data/cron.xml +++ b/beesdoo_shift/data/cron.xml @@ -6,9 +6,8 @@ hours -1 - cooperative.status - _set_today - () + + model._set_today() @@ -18,22 +17,20 @@ weeks -1 - beesdoo.shift.planning - _generate_next_planning - () + + model._generate_next_planning() - + Compute Shift Counter 4 hours -1 - cooperative.status - _cron_compute_counter_irregular - () + + model._cron_compute_counter_irregular() - \ No newline at end of file + diff --git a/beesdoo_shift/models/__init__.py b/beesdoo_shift/models/__init__.py index b3d5110..0a24aae 100644 --- a/beesdoo_shift/models/__init__.py +++ b/beesdoo_shift/models/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- -import planning -import task -import cooperative_status +from . import planning +from . import task +from . import cooperative_status diff --git a/beesdoo_shift/models/cooperative_status.py b/beesdoo_shift/models/cooperative_status.py index 846e907..8f8737b 100644 --- a/beesdoo_shift/models/cooperative_status.py +++ b/beesdoo_shift/models/cooperative_status.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from odoo import models, fields, api, _ from odoo.exceptions import ValidationError diff --git a/beesdoo_shift/models/planning.py b/beesdoo_shift/models/planning.py index fec012a..bc2c497 100644 --- a/beesdoo_shift/models/planning.py +++ b/beesdoo_shift/models/planning.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from odoo import models, fields, api, _ from odoo.exceptions import UserError @@ -154,7 +153,7 @@ class TaskTemplate(models.Model): def _generate_task_day(self): tasks = self.env['beesdoo.shift.shift'] for rec in self: - for i in xrange(0, rec.worker_nb): + for i in range(0, rec.worker_nb): worker_id = rec.worker_ids[i] if len(rec.worker_ids) > i else False #remove worker in holiday and temporary exempted if worker_id and worker_id.cooperative_status_ids: diff --git a/beesdoo_shift/models/task.py b/beesdoo_shift/models/task.py index fa9ca95..1632ef0 100644 --- a/beesdoo_shift/models/task.py +++ b/beesdoo_shift/models/task.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from odoo import models, fields, api, _ from odoo.exceptions import UserError, ValidationError import json diff --git a/beesdoo_shift/wizard/__init__.py b/beesdoo_shift/wizard/__init__.py index 59863f5..bea96e2 100644 --- a/beesdoo_shift/wizard/__init__.py +++ b/beesdoo_shift/wizard/__init__.py @@ -1,7 +1,7 @@ -import instanciate_planning -import batch_template -import assign_super_coop -import subscribe -import extension -import holiday -import temporary_exemption \ No newline at end of file +from . import instanciate_planning +from . import batch_template +from . import assign_super_coop +from . import subscribe +from . import extension +from . import holiday +from . import temporary_exemption \ No newline at end of file diff --git a/beesdoo_shift/wizard/assign_super_coop.py b/beesdoo_shift/wizard/assign_super_coop.py index 9ca44de..58b7bd8 100644 --- a/beesdoo_shift/wizard/assign_super_coop.py +++ b/beesdoo_shift/wizard/assign_super_coop.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from odoo import models, fields, api, _ diff --git a/beesdoo_shift/wizard/batch_template.py b/beesdoo_shift/wizard/batch_template.py index c608600..2fde0d0 100644 --- a/beesdoo_shift/wizard/batch_template.py +++ b/beesdoo_shift/wizard/batch_template.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ''' Created on 2 janv. 2017 diff --git a/beesdoo_shift/wizard/extension.py b/beesdoo_shift/wizard/extension.py index 1d3a11c..39856bb 100644 --- a/beesdoo_shift/wizard/extension.py +++ b/beesdoo_shift/wizard/extension.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from odoo import models, fields, api, _ from odoo.exceptions import UserError diff --git a/beesdoo_shift/wizard/holiday.py b/beesdoo_shift/wizard/holiday.py index 387502c..3d387fa 100644 --- a/beesdoo_shift/wizard/holiday.py +++ b/beesdoo_shift/wizard/holiday.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from odoo import models, fields, api, _ from odoo.exceptions import ValidationError diff --git a/beesdoo_shift/wizard/instanciate_planning.py b/beesdoo_shift/wizard/instanciate_planning.py index 40948cf..be91264 100644 --- a/beesdoo_shift/wizard/instanciate_planning.py +++ b/beesdoo_shift/wizard/instanciate_planning.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from odoo import models, fields, api, _ diff --git a/beesdoo_shift/wizard/subscribe.py b/beesdoo_shift/wizard/subscribe.py index af9613d..ce51b12 100644 --- a/beesdoo_shift/wizard/subscribe.py +++ b/beesdoo_shift/wizard/subscribe.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from odoo import models, fields, api, _ from odoo.exceptions import UserError diff --git a/beesdoo_shift/wizard/temporary_exemption.py b/beesdoo_shift/wizard/temporary_exemption.py index f2b20af..c22a470 100644 --- a/beesdoo_shift/wizard/temporary_exemption.py +++ b/beesdoo_shift/wizard/temporary_exemption.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from odoo import models, fields, api, _ from odoo.exceptions import ValidationError