Merge pull request #30 from EBII/10-calendar-def-val
[MIG 10] calendar def val
This commit is contained in:
@@ -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': [
|
||||
|
||||
@@ -1,16 +1,14 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<openerp>
|
||||
<data>
|
||||
|
||||
|
||||
<odoo>
|
||||
<record id="resource_calendar_form" model="ir.ui.view">
|
||||
<field name="model">resource.calendar</field>
|
||||
<field name="inherit_id" ref="resource.resource_calendar_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="name" position="after">
|
||||
<field name="attendance_ids" position="before">
|
||||
<field name="hour_range"/>
|
||||
</field>
|
||||
|
||||
</field>
|
||||
</record>
|
||||
|
||||
@@ -23,7 +21,4 @@
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
</odoo>
|
||||
|
||||
@@ -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(
|
||||
|
||||
Reference in New Issue
Block a user