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
=== modified file 'resource/resource.py'
--- resource/resource.py 2011-10-25 23:31:41 +0000
+++ resource/resource.py 2011-10-26 21:38:24 +0000
@@ -211,15 +211,21 @@
211class resource_calendar_attendance(osv.osv):211class resource_calendar_attendance(osv.osv):
212 _name = "resource.calendar.attendance"212 _name = "resource.calendar.attendance"
213 _description = "Work Detail"213 _description = "Work Detail"
214
214 _columns = {215 _columns = {
215 'name' : fields.char("Name", size=64, required=True),216 'name' : fields.char("Name", size=64, required=True),
216 'dayofweek': fields.selection([('0','Monday'),('1','Tuesday'),('2','Wednesday'),('3','Thursday'),('4','Friday'),('5','Saturday'),('6','Sunday')], 'Day of week'),217 'dayofweek': fields.selection([('0','Monday'),('1','Tuesday'),('2','Wednesday'),('3','Thursday'),('4','Friday'),('5','Saturday'),('6','Sunday')], 'Day of week', required=True),
217 'date_from' : fields.date('Starting date'),218 'date_from' : fields.date('Starting date'),
218 'hour_from' : fields.float('Work from', size=8, required=True, help="Working time will start from"),219 'hour_from' : fields.float('Work from', size=8, required=True, help="Working time will start from"),
219 'hour_to' : fields.float("Work to", size=8, required=True, help="Working time will end at"),220 'hour_to' : fields.float("Work to", size=8, required=True, help="Working time will end at"),
220 'calendar_id' : fields.many2one("resource.calendar", "Resource's Calendar", required=True),221 'calendar_id' : fields.many2one("resource.calendar", "Resource's Calendar", required=True),
221 }222 }
223
222 _order = 'dayofweek, hour_from'224 _order = 'dayofweek, hour_from'
225
226 _defaults = {
227 'dayofweek' : '0'
228 }
223resource_calendar_attendance()229resource_calendar_attendance()
224230
225def convert_timeformat(time_string):231def convert_timeformat(time_string):

Subscribers

People subscribed via source and target branches

to all changes: