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..5544e68 100644 --- a/calendar_default_value/calendar_view.xml +++ b/calendar_default_value/calendar_view.xml @@ -1,16 +1,14 @@ - - - - + resource.calendar - + + @@ -23,7 +21,4 @@ - - - - + diff --git a/calendar_default_value/resource.py b/calendar_default_value/resource.py index f434858..0cc546c 100644 --- a/calendar_default_value/resource.py +++ b/calendar_default_value/resource.py @@ -6,17 +6,9 @@ import collections 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', @@ -34,7 +26,7 @@ class ResourceCalendar(models.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(