Merge lp:~serpent-consulting-services/openobject-addons/trunk-881839-SerpentCS-solutionA into lp:openobject-addons

Proposed by Serpent Consulting Services
Status: Merged
Merged at revision: 5577
Proposed branch: lp:~serpent-consulting-services/openobject-addons/trunk-881839-SerpentCS-solutionA
Merge into: lp:openobject-addons
Diff against target: 26 lines (+7/-1)
1 file modified
resource/resource.py (+7/-1)
To merge this branch: bzr merge lp:~serpent-consulting-services/openobject-addons/trunk-881839-SerpentCS-solutionA
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+80511@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Serpent Consulting Services (serpent-consulting-services) wrote :

This branch sets the Day of the week 'required', and sets a default value.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'resource/resource.py'
2--- resource/resource.py 2011-10-25 23:31:41 +0000
3+++ resource/resource.py 2011-10-26 21:38:24 +0000
4@@ -211,15 +211,21 @@
5 class resource_calendar_attendance(osv.osv):
6 _name = "resource.calendar.attendance"
7 _description = "Work Detail"
8+
9 _columns = {
10 'name' : fields.char("Name", size=64, required=True),
11- 'dayofweek': fields.selection([('0','Monday'),('1','Tuesday'),('2','Wednesday'),('3','Thursday'),('4','Friday'),('5','Saturday'),('6','Sunday')], 'Day of week'),
12+ 'dayofweek': fields.selection([('0','Monday'),('1','Tuesday'),('2','Wednesday'),('3','Thursday'),('4','Friday'),('5','Saturday'),('6','Sunday')], 'Day of week', required=True),
13 'date_from' : fields.date('Starting date'),
14 'hour_from' : fields.float('Work from', size=8, required=True, help="Working time will start from"),
15 'hour_to' : fields.float("Work to", size=8, required=True, help="Working time will end at"),
16 'calendar_id' : fields.many2one("resource.calendar", "Resource's Calendar", required=True),
17 }
18+
19 _order = 'dayofweek, hour_from'
20+
21+ _defaults = {
22+ 'dayofweek' : '0'
23+ }
24 resource_calendar_attendance()
25
26 def convert_timeformat(time_string):

Subscribers

People subscribed via source and target branches

to all changes: