add a vals before other to renew values : (5,0,0)
This commit is contained in:
@@ -7,9 +7,11 @@
|
|||||||
<field name="model">resource.calendar</field>
|
<field name="model">resource.calendar</field>
|
||||||
<field name="inherit_id" ref="resource.resource_calendar_form"/>
|
<field name="inherit_id" ref="resource.resource_calendar_form"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="name" position="after">
|
|
||||||
<field name="hour_range"/>
|
<field name="attendance_ids" position="before">
|
||||||
</field>
|
<field name="hour_range" class="oe_left"/>
|
||||||
|
</field>
|
||||||
|
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
|||||||
@@ -9,32 +9,23 @@ from openerp import models, fields, api
|
|||||||
class ResourceCalendarAttendance(models.Model):
|
class ResourceCalendarAttendance(models.Model):
|
||||||
_inherit = 'resource.calendar.attendance'
|
_inherit = 'resource.calendar.attendance'
|
||||||
|
|
||||||
# PR is done for v9
|
|
||||||
# https://github.com/odoo/odoo/pull/10310
|
|
||||||
calendar_id = fields.Many2one(ondelete='cascade')
|
calendar_id = fields.Many2one(ondelete='cascade')
|
||||||
|
|
||||||
|
|
||||||
class ResourceCalendar(models.Model):
|
class ResourceCalendar(models.Model):
|
||||||
_inherit = 'resource.calendar'
|
_inherit = 'resource.calendar'
|
||||||
_rec_name = 'display_name'
|
#_rec_name = 'display_name'
|
||||||
|
|
||||||
hour_range = fields.Char(
|
hour_range = fields.Char(
|
||||||
string='Hour Range', compute='_compute_hour_range',
|
string='Hour Range', compute='_compute_hour_range',
|
||||||
readonly=True, store=True,
|
readonly=True, store=True,
|
||||||
help="String representation of working hours")
|
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
|
@api.model
|
||||||
def default_get(self, fields_list):
|
def default_get(self, fields_list):
|
||||||
"'attendance_ids' field default value"
|
"'attendance_ids' field default value"
|
||||||
values = super(ResourceCalendar, self).default_get(fields_list)
|
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()
|
params = self.get_my_calendar_data()
|
||||||
for day in range(0, params.endday):
|
for day in range(0, params.endday):
|
||||||
mapping = self._populate_attendance(
|
mapping = self._populate_attendance(
|
||||||
|
|||||||
Reference in New Issue
Block a user