Elabore/odoo-usability
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #30 from EBII/10-calendar-def-val

Browse Source 
[MIG 10] calendar def val
This commit is contained in:
David Beal
2017-03-15 12:14:32 +01:00
committed by GitHub
parent fe7fec797f e30285caf7
commit 1a191c9444
3 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
calendar_default_value/__manifest__.py
View File

@@ -18,7 +18,7 @@ Method to override for behavior customization:
- string_format() - string_format()
""", """,
'version': '8.0.1.0.0', 'version': '10.0.1.0.0',
'author': 'Akretion', 'author': 'Akretion',
'category': 'base', 'category': 'base',
'depends': [ 'depends': [

13
calendar_default_value/calendar_view.xml
View File

@@ -1,16 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <odoo>
<data>
<record id="resource_calendar_form" model="ir.ui.view"> <record id="resource_calendar_form" model="ir.ui.view">
<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="attendance_ids" position="before">
<field name="hour_range"/> <field name="hour_range"/>
</field> </field>
</field> </field>
</record> </record>
@@ -23,7 +21,4 @@
</field> </field>
</field> </field>
</record> </record>
</odoo>
</data>
</openerp>

12
calendar_default_value/resource.py
View File

@@ -6,17 +6,9 @@ import collections
from openerp import models, fields, api 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): 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',
@@ -34,7 +26,7 @@ class ResourceCalendar(models.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(