From 6361e2e4537a8495baf57ae70329b4a62c910d1d Mon Sep 17 00:00:00 2001 From: MonsieurB Date: Tue, 31 Jan 2017 14:51:32 +0100 Subject: [PATCH 1/4] modifications V10 std --- calendar_default_value/__manifest__.py | 2 +- calendar_default_value/calendar_view.xml | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/calendar_default_value/__manifest__.py b/calendar_default_value/__manifest__.py index 2cf4e6c..0879127 100644 --- a/calendar_default_value/__manifest__.py +++ b/calendar_default_value/__manifest__.py @@ -18,7 +18,7 @@ Method to override for behavior customization: - string_format() """, - 'version': '8.0.1.0.0', + 'version': '10.0.1.0.0', 'author': 'Akretion', 'category': 'base', 'depends': [ diff --git a/calendar_default_value/calendar_view.xml b/calendar_default_value/calendar_view.xml index 1b7d199..7946a8d 100644 --- a/calendar_default_value/calendar_view.xml +++ b/calendar_default_value/calendar_view.xml @@ -1,7 +1,6 @@ - - + @@ -25,5 +24,4 @@ - - + From 80b3d08ba57c63731d59059b5320f3fb0d81c24f Mon Sep 17 00:00:00 2001 From: MonsieurB Date: Tue, 28 Feb 2017 17:03:45 +0100 Subject: [PATCH 2/4] add a vals before other to renew values : (5,0,0) --- calendar_default_value/calendar_view.xml | 8 +++++--- calendar_default_value/resource.py | 13 ++----------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/calendar_default_value/calendar_view.xml b/calendar_default_value/calendar_view.xml index 7946a8d..00e840a 100644 --- a/calendar_default_value/calendar_view.xml +++ b/calendar_default_value/calendar_view.xml @@ -7,9 +7,11 @@ resource.calendar - - - + + + + + diff --git a/calendar_default_value/resource.py b/calendar_default_value/resource.py index f434858..b89cd9a 100644 --- a/calendar_default_value/resource.py +++ b/calendar_default_value/resource.py @@ -9,32 +9,23 @@ from openerp import models, fields, api class ResourceCalendarAttendance(models.Model): _inherit = 'resource.calendar.attendance' - # PR is done for v9 - # https://github.com/odoo/odoo/pull/10310 calendar_id = fields.Many2one(ondelete='cascade') class ResourceCalendar(models.Model): _inherit = 'resource.calendar' - _rec_name = 'display_name' + #_rec_name = 'display_name' hour_range = fields.Char( string='Hour Range', compute='_compute_hour_range', readonly=True, store=True, help="String representation of working hours") - display_name = fields.Char(compute='_compute_display_name', store=True) - - @api.multi - @api.depends('name', 'hour_range') - def _compute_display_name(self): - for rec in self: - rec.display_name = "%s: %s" % (rec.name, rec.hour_range) @api.model def default_get(self, fields_list): "'attendance_ids' field default value" values = super(ResourceCalendar, self).default_get(fields_list) - vals = [] + vals = [(5,0,0)] # need to renew the values in the client interface params = self.get_my_calendar_data() for day in range(0, params.endday): mapping = self._populate_attendance( From 7f8c4611220ba6b790bf1fff030aba061432ea61 Mon Sep 17 00:00:00 2001 From: MonsieurB Date: Tue, 28 Feb 2017 17:10:19 +0100 Subject: [PATCH 3/4] add display name like in 8.0 --- calendar_default_value/resource.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/calendar_default_value/resource.py b/calendar_default_value/resource.py index b89cd9a..34e2bf1 100644 --- a/calendar_default_value/resource.py +++ b/calendar_default_value/resource.py @@ -20,6 +20,13 @@ class ResourceCalendar(models.Model): string='Hour Range', compute='_compute_hour_range', readonly=True, store=True, help="String representation of working hours") + display_name = fields.Char(compute='_compute_display_name', store=True) + + @api.multi + @api.depends('name', 'hour_range') + def _compute_display_name(self): + for rec in self: + rec.display_name = "%s: %s" % (rec.name, rec.hour_range) @api.model def default_get(self, fields_list): From e30285caf7722188eaf233a64facd3e7dcd8f5b9 Mon Sep 17 00:00:00 2001 From: MonsieurB Date: Wed, 15 Mar 2017 11:18:00 +0100 Subject: [PATCH 4/4] remove add cascade from 8 --- calendar_default_value/calendar_view.xml | 13 ++++--------- calendar_default_value/resource.py | 6 ------ 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/calendar_default_value/calendar_view.xml b/calendar_default_value/calendar_view.xml index 00e840a..5544e68 100644 --- a/calendar_default_value/calendar_view.xml +++ b/calendar_default_value/calendar_view.xml @@ -1,16 +1,13 @@ - - resource.calendar - - - - + + + @@ -24,6 +21,4 @@ - - - + diff --git a/calendar_default_value/resource.py b/calendar_default_value/resource.py index 34e2bf1..0cc546c 100644 --- a/calendar_default_value/resource.py +++ b/calendar_default_value/resource.py @@ -6,12 +6,6 @@ import collections from openerp import models, fields, api -class ResourceCalendarAttendance(models.Model): - _inherit = 'resource.calendar.attendance' - - calendar_id = fields.Many2one(ondelete='cascade') - - class ResourceCalendar(models.Model): _inherit = 'resource.calendar' #_rec_name = 'display_name'