1
=== modified file 'hr_attendance/__openerp__.py'
2
--- hr_attendance/__openerp__.py	2011-07-06 12:29:28 +0000
3
+++ hr_attendance/__openerp__.py	2011-09-15 11:57:57 +0000
4
@@ -46,7 +46,7 @@
5
46
        'wizard/hr_attendance_error_view.xml',
46
        'wizard/hr_attendance_error_view.xml',
6
47
        'wizard/hr_attendance_sign_in_out_view.xml',
47
        'wizard/hr_attendance_sign_in_out_view.xml',
7
48
    ],
48
    ],
9
49
    'demo_xml': ['hr_attendance_demo.xml'],
49
    'demo_xml': ['hr_attendance_demo.yml'],
10
50
    'test': ['test/test_hr_attendance.yml',
50
    'test': ['test/test_hr_attendance.yml',
11
51
             'test/hr_attendance_report.yml'
51
             'test/hr_attendance_report.yml'
12
52
    ],
52
    ],
13
53
53
14
=== removed file 'hr_attendance/hr_attendance_demo.xml'
15
--- hr_attendance/hr_attendance_demo.xml	2011-07-07 12:25:42 +0000
16
+++ hr_attendance/hr_attendance_demo.xml	1970-01-01 00:00:00 +0000
17
@@ -1,142 +0,0 @@
18
1
<?xml version="1.0" encoding="utf-8"?>
19
2
<openerp>
20
3
    <data noupdate="True">
21
4
22
5
        <record id="attendance1" model="hr.attendance">
23
6
            <field eval="time.strftime('%Y-%m-01 08:21')" name="name"/>
24
7
            <field name="action">sign_in</field>
25
8
            <field name="employee_id" ref="hr.employee1"/>
26
9
        </record>
27
10
28
11
        <record id="attendance2" model="hr.attendance">
29
12
            <field eval="time.strftime('%Y-%m-01 11:51')" name="name"/>
30
13
            <field name="action">sign_out</field>
31
14
            <field name="employee_id" ref="hr.employee1"/>
32
15
        </record>
33
16
34
17
        <record id="attendance3" model="hr.attendance">
35
18
            <field eval="time.strftime('%Y-%m-02 12:47')" name="name"/>
36
19
            <field name="action">sign_in</field>
37
20
            <field name="employee_id" ref="hr.employee1"/>
38
21
        </record>
39
22
40
23
        <record id="attendance4" model="hr.attendance">
41
24
            <field eval="time.strftime('%Y-%m-02 19:53')" name="name"/>
42
25
            <field name="action">sign_out</field>
43
26
            <field name="employee_id" ref="hr.employee1"/>
44
27
        </record>
45
28
46
29
        <record id="attendance5" model="hr.attendance">
47
30
            <field eval="time.strftime('%Y-%m-03 07:32')" name="name"/>
48
31
            <field name="action">sign_in</field>
49
32
            <field name="employee_id" ref="hr.employee1"/>
50
33
        </record>
51
34
52
35
        <record id="attendance6" model="hr.attendance">
53
36
            <field eval="time.strftime('%Y-%m-03 12:32')" name="name"/>
54
37
            <field name="action">sign_out</field>
55
38
            <field name="employee_id" ref="hr.employee1"/>
56
39
        </record>
57
40
58
41
        <record id="attendance7" model="hr.attendance">
59
42
            <field eval="time.strftime('%Y-%m-04 14:01')" name="name"/>
60
43
            <field name="action">sign_in</field>
61
44
            <field name="employee_id" ref="hr.employee1"/>
62
45
        </record>
63
46
64
47
        <record id="attendance8" model="hr.attendance">
65
48
            <field eval="time.strftime('%Y-%m-04 17:21')" name="name"/>
66
49
            <field name="action">sign_out</field>
67
50
            <field name="employee_id" ref="hr.employee1"/>
68
51
        </record>
69
52
70
53
        <record id="attendance9" model="hr.attendance">
71
54
            <field eval="time.strftime('%Y-%m-05 09:10')" name="name"/>
72
55
            <field name="action">sign_in</field>
73
56
            <field name="employee_id" ref="hr.employee1"/>
74
57
        </record>
75
58
76
59
        <record id="attendance10" model="hr.attendance">
77
60
            <field eval="time.strftime('%Y-%m-05 12:42')" name="name"/>
78
61
            <field name="action">sign_out</field>
79
62
            <field name="employee_id" ref="hr.employee1"/>
80
63
        </record>
81
64
82
65
        <record id="attendance11" model="hr.attendance">
83
66
            <field eval="time.strftime('%Y-%m-06 13:10')" name="name"/>
84
67
            <field name="action">sign_in</field>
85
68
            <field name="employee_id" ref="hr.employee1"/>
86
69
        </record>
87
70
88
71
        <record id="attendance12" model="hr.attendance">
89
72
            <field eval="time.strftime('%Y-%m-06 18:34')" name="name"/>
90
73
            <field name="action">sign_out</field>
91
74
            <field name="employee_id" ref="hr.employee1"/>
92
75
        </record>
93
76
94
77
        <record id="attendance13" model="hr.attendance">
95
78
            <field eval="time.strftime('%Y-%m-07 08:21')" name="name"/>
96
79
            <field name="action">sign_in</field>
97
80
            <field name="employee_id" ref="hr.employee1"/>
98
81
        </record>
99
82
100
83
        <record id="attendance14" model="hr.attendance">
101
84
            <field eval="time.strftime('%Y-%m-07 18:21')" name="name"/>
102
85
            <field name="action">sign_out</field>
103
86
            <field name="employee_id" ref="hr.employee1"/>
104
87
        </record>
105
88
106
89
        <record id="attendance15" model="hr.attendance">
107
90
            <field eval="time.strftime('%Y-%m-08 08:21')" name="name"/>
108
91
            <field name="action">sign_in</field>
109
92
            <field name="employee_id" ref="hr.employee1"/>
110
93
        </record>
111
94
112
95
        <record id="attendance16" model="hr.attendance">
113
96
            <field eval="time.strftime('%Y-%m-08 12:54')" name="name"/>
114
97
            <field name="action">sign_out</field>
115
98
            <field name="employee_id" ref="hr.employee1"/>
116
99
        </record>
117
100
118
101
        <record id="attendance17" model="hr.attendance">
119
102
            <field eval="time.strftime('%Y-%m-09 13:32')" name="name"/>
120
103
            <field name="action">sign_in</field>
121
104
            <field name="employee_id" ref="hr.employee1"/>
122
105
        </record>
123
106
124
107
        <record id="attendance18" model="hr.attendance">
125
108
            <field eval="time.strftime('%Y-%m-09 19:31')" name="name"/>
126
109
            <field name="action">sign_out</field>
127
110
            <field name="employee_id" ref="hr.employee1"/>
128
111
        </record>
129
112
130
113
        <record id="attendance19" model="hr.attendance">
131
114
            <field eval="time.strftime('%Y-%m-10 07:10')" name="name"/>
132
115
            <field name="action">sign_in</field>
133
116
            <field name="employee_id" ref="hr.employee1"/>
134
117
        </record>
135
118
136
119
        <record id="attendance20" model="hr.attendance">
137
120
            <field eval="time.strftime('%Y-%m-10 12:34')" name="name"/>
138
121
            <field name="action">sign_out</field>
139
122
            <field name="employee_id" ref="hr.employee1"/>
140
123
        </record>
141
124
        
142
125
<!-- FIXME! Commented out to enable installation without creating conflicts
143
126
     during the first days of a month. To be properly fixed, see
144
127
     launchpad bug 791087!
145
128
146
129
        <record id="attendance21" model="hr.attendance">
147
130
            <field eval="time.strftime('%Y-%m-%d 10:00')" name="name"/>
148
131
            <field name="action">sign_in</field>
149
132
            <field name="employee_id" ref="hr.employee1"/>
150
133
        </record>
151
134
        
152
135
        <record id="attendance22" model="hr.attendance">
153
136
            <field eval="time.strftime('%Y-%m-%d 18:00')" name="name"/>
154
137
            <field name="action">sign_out</field>
155
138
            <field name="employee_id" ref="hr.employee1"/>
156
139
        </record>
157
140
-->
158
141
    </data>
159
142
</openerp>
160
143
0
161
=== added file 'hr_attendance/hr_attendance_demo.yml'
162
--- hr_attendance/hr_attendance_demo.yml	1970-01-01 00:00:00 +0000
163
+++ hr_attendance/hr_attendance_demo.yml	2011-09-15 11:57:57 +0000
164
@@ -0,0 +1,131 @@
165
1
-
166
2
  Creating demo data for attendance for current week consisting of five working days.
167
3
-
168
4
  !python {model: hr.attendance}: |
169
5
    import time
170
6
    from datetime import datetime, date
171
7
    from datetime import timedelta
172
8
    current_date = date(datetime.today().year, datetime.today().month, datetime.today().day)
173
9
    day_of_week = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday','Saturday', 'Sunday']
174
10
    current_day = day_of_week[date.weekday(current_date)]
175
11
    days = {'Monday': 1, 'Tuesday': 2, 'Wednesday': 3, 'Thursday': 4, 'Friday': 5}
176
12
    loop = days[current_day]
177
13
    employee_id = ref('hr.employee1')
178
14
    names_in = [(current_date - timedelta(i)).strftime('%Y-%m-%d 10:00:00') for i in range(loop)]
179
15
    names_out = [(current_date - timedelta(i)).strftime('%Y-%m-%d 19:00:00') for i in range(loop)]
180
16
    attendance_ids = self.search(cr, uid, ['|',('name', 'in', names_in), ('name', 'in', names_out), ('employee_id','=',employee_id)])
181
17
    names = []
182
18
    if attendance_ids:
183
19
        names = self.read(cr, uid, attendance_ids, ['id','name'], context=context)
184
20
185
21
    def check_data(data, names=names):
186
22
        if data['name'] in [i['name'] for i in names]:
187
23
            return [i['id'] for i in names if data['name']==i['name']]
188
24
189
25
    if current_day in ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday']:
190
26
        sign_in = {
191
27
            'name': (current_date).strftime('%Y-%m-%d 10:00:00'),
192
28
            'action': 'sign_in',
193
29
            'employee_id': employee_id
194
30
        }
195
31
        ids = check_data(sign_in)
196
32
        if ids:
197
33
            self.write(cr, uid, ids, sign_in, context=context)
198
34
        else:
199
35
            self.create(cr, uid, sign_in, context=context)
200
36
        sign_out = {
201
37
            'name': (current_date).strftime('%Y-%m-%d 19:00:00'),
202
38
            'action': 'sign_out',
203
39
            'employee_id': employee_id
204
40
        }
205
41
        ids = check_data(sign_out)
206
42
        if ids:
207
43
            self.write(cr, uid, ids, sign_out, context=context)
208
44
        else:
209
45
            self.create(cr, uid, sign_out, context=context)
210
46
    if current_day in ['Tuesday', 'Wednesday', 'Thursday', 'Friday']:
211
47
        sign_in = {
212
48
            'name': (current_date - timedelta(1)).strftime('%Y-%m-%d 10:00:00'),
213
49
            'action': 'sign_in',
214
50
            'employee_id': employee_id
215
51
        }
216
52
        ids = check_data(sign_in)
217
53
        if ids:
218
54
            self.write(cr, uid, ids, sign_in, context=context)
219
55
        else:
220
56
            self.create(cr, uid, sign_in, context=context)
221
57
        sign_out = {
222
58
            'name': (current_date - timedelta(1)).strftime('%Y-%m-%d 19:00:00'),
223
59
            'action': 'sign_out',
224
60
            'employee_id': employee_id
225
61
        }
226
62
        ids = check_data(sign_out)
227
63
        if ids:
228
64
            self.write(cr, uid, ids, sign_out, context=context)
229
65
        else:
230
66
            self.create(cr, uid, sign_out, context=context)
231
67
    if current_day in ['Wednesday', 'Thursday', 'Friday']:
232
68
        sign_in = {
233
69
            'name': (current_date - timedelta(2)).strftime('%Y-%m-%d 10:00:00'),
234
70
            'action': 'sign_in',
235
71
            'employee_id': employee_id
236
72
        }
237
73
        ids = check_data(sign_in)
238
74
        if ids:
239
75
            self.write(cr, uid, ids, sign_in, context=context)
240
76
        else:
241
77
            self.create(cr, uid, sign_in, context=context)
242
78
        sign_out = {
243
79
            'name': (current_date - timedelta(2)).strftime('%Y-%m-%d 19:00:00'),
244
80
            'action': 'sign_out',
245
81
            'employee_id': employee_id
246
82
        }
247
83
        ids = check_data(sign_out)
248
84
        if ids:
249
85
            self.write(cr, uid, ids, sign_out, context=context)
250
86
        else:
251
87
            self.create(cr, uid, sign_out, context=context)
252
88
    if current_day in ['Thursday', 'Friday']:
253
89
        sign_in = {
254
90
            'name': (current_date - timedelta(3)).strftime('%Y-%m-%d 10:00:00'),
255
91
            'action': 'sign_in',
256
92
            'employee_id': employee_id
257
93
        }
258
94
        ids = check_data(sign_in)
259
95
        if ids:
260
96
            self.write(cr, uid, ids, sign_in, context=context)
261
97
        else:
262
98
            self.create(cr, uid, sign_in, context=context)
263
99
        sign_out = {
264
100
            'name': (current_date - timedelta(3)).strftime('%Y-%m-%d 19:00:00'),
265
101
            'action': 'sign_out',
266
102
            'employee_id': employee_id
267
103
        }
268
104
        ids = check_data(sign_out)
269
105
        if ids:
270
106
            self.write(cr, uid, ids, sign_out, context=context)
271
107
        else:
272
108
            self.create(cr, uid, sign_out, context=context)
273
109
    if current_day == 'Friday':
274
110
        sign_in = {
275
111
            'name': (current_date - timedelta(4)).strftime('%Y-%m-%d 10:00:00'),
276
112
            'action': 'sign_in',
277
113
            'employee_id': employee_id
278
114
        }
279
115
        ids = check_data(sign_in)
280
116
        if ids:
281
117
            self.write(cr, uid, ids, sign_in, context=context)
282
118
        else:
283
119
            self.create(cr, uid, sign_in, context=context)
284
120
        sign_out = {
285
121
            'name': (current_date - timedelta(4)).strftime('%Y-%m-%d 19:00:00'),
286
122
            'action': 'sign_out',
287
123
            'employee_id': employee_id
288
124
        }
289
125
        ids = check_data(sign_out)
290
126
        if ids:
291
127
            self.write(cr, uid, ids, sign_out, context=context)
292
128
        else:
293
129
            self.create(cr, uid, sign_out, context=context)
294
130
  
295
131
Status:	Rejected
Rejected by:	Fabien (Open ERP) on 2011-09-27
Proposed branch:	lp:~openerp-dev/openobject-addons/trunk-bug-791087-mtr
Merge into:	lp:openobject-addons
Diff against target:	295 lines (+132/-143) 3 files modified hr_attendance/__openerp__.py (+1/-1) hr_attendance/hr_attendance_demo.xml (+0/-142) hr_attendance/hr_attendance_demo.yml (+131/-0)
To merge this branch:	bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-791087-mtr
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
Mustufa Rangwala (Open ERP) (community)	2011-06-07	Approve on 2011-07-19
Ujjvala Collins (community)		Needs Resubmitting on 2011-07-15
Meera Trambadia (OpenERP) (community)		Needs Resubmitting on 2011-07-14
Olivier Dony (Odoo)		Disapprove on 2011-07-07
qdp (OpenERP)	2011-06-07	Pending
Review via email: mp+63661@code.launchpad.net