1
=== removed file 'project_issue_service/board_project_view.xml'
2
--- project_issue_service/board_project_view.xml	2012-11-22 13:29:38 +0000
3
+++ project_issue_service/board_project_view.xml	1970-01-01 00:00:00 +0000
4
@@ -1,12 +0,0 @@
5
1
<?xml version="1.0" encoding="utf-8"?>
6
2
<openerp>
7
3
    <data>
8
4
9
5
    <record id="project.action_project_vs_remaining_hours_graph" model="ir.actions.act_window">
10
6
        <!-- Exclude admin's projects from graph -->
11
7
        <field name="domain">[('user_id','!=',1),('user_id','=',uid),('state','=','open')]</field>
12
8
    </record>
13
9
    
14
10
    </data>
15
11
</openerp>
16
12
    
17
13
\ No newline at end of file
0
\ No newline at end of file
18
14
1
19
=== removed file 'project_issue_service/project_issue_workflow.xml'
20
--- project_issue_service/project_issue_workflow.xml	2012-11-22 13:29:38 +0000
21
+++ project_issue_service/project_issue_workflow.xml	1970-01-01 00:00:00 +0000
22
@@ -1,108 +0,0 @@
23
1
<?xml version="1.0"?>
24
2
<openerp>
25
3
    <data>
26
4
        <record model="workflow" id="wkf_project_issue">
27
5
            <field name="name">Project Issue Workflow</field>
28
6
            <field name="osv">project.issue</field>
29
7
            <field name="on_create">True</field>
30
8
        </record>
31
9
32
10
        <record model="workflow.activity" id="act_draft">
33
11
            <field name="wkf_id" ref="wkf_project_issue"/>
34
12
            <field name="flow_start">True</field>
35
13
            <field name="name">draft</field>
36
14
            <field name="kind">function</field>
37
15
            <field name="action">write({'state': 'draft'})
38
16
do_routing()</field>
39
17
        </record>
40
18
41
19
        <record model="workflow.activity" id="act_open">
42
20
            <field name="wkf_id" ref="wkf_project_issue"/>
43
21
            <field name="name">open</field>
44
22
            <field name="kind">function</field>
45
23
            <field name="action">write({'state': 'open'})
46
24
do_routing()</field>
47
25
        </record>
48
26
49
27
        <record model="workflow.activity" id="act_pending">
50
28
            <field name="wkf_id" ref="wkf_project_issue"/>
51
29
            <field name="name">pending</field>
52
30
            <field name="kind">function</field>
53
31
            <field name="action">write({'state': 'pending'})</field>
54
32
        </record>
55
33
56
34
        <record model="workflow.activity" id="act_done">
57
35
            <field name="wkf_id" ref="wkf_project_issue"/>
58
36
            <field name="name">done</field>
59
37
            <field name="kind">function</field>
60
38
            <field name="action">write({'state': 'done'})</field>
61
39
            <field name="flow_stop">True</field>
62
40
        </record>
63
41
64
42
        <record model="workflow.activity" id="act_cancel">
65
43
            <field name="wkf_id" ref="wkf_project_issue"/>
66
44
            <field name="name">cancel</field>
67
45
            <field name="kind">function</field>
68
46
            <field name="action">write({'state': 'cancel'})</field>
69
47
            <field name="flow_stop">True</field>
70
48
        </record>
71
49
72
50
73
51
<!-- == TRANSITIONS ==  -->
74
52
        <!-- DRAFT -->
75
53
        <record model="workflow.transition" id="t_draft2cancel">
76
54
            <field name="act_from" ref="act_draft"/>
77
55
            <field name="act_to" ref="act_cancel"/>
78
56
            <field name="signal">case_cancel</field>
79
57
        </record>
80
58
        <record model="workflow.transition" id="t_draft2open">
81
59
            <field name="act_from" ref="act_draft"/>
82
60
            <field name="act_to" ref="act_open"/>
83
61
            <field name="signal">case_open</field>
84
62
        </record>
85
63
86
64
        <!-- OPEN -->
87
65
        <record model="workflow.transition" id="t_open2done">
88
66
            <field name="act_from" ref="act_open"/>
89
67
            <field name="act_to" ref="act_done"/>
90
68
            <field name="signal">case_close</field>
91
69
        </record>
92
70
        <record model="workflow.transition" id="t_open2pending">
93
71
            <field name="act_from" ref="act_open"/>
94
72
            <field name="act_to" ref="act_pending"/>
95
73
            <field name="signal">case_pending</field>
96
74
        </record>
97
75
        <record model="workflow.transition" id="t_open2cancel">
98
76
            <field name="act_from" ref="act_open"/>
99
77
            <field name="act_to" ref="act_cancel"/>
100
78
            <field name="signal">case_cancel</field>
101
79
        </record>
102
80
103
81
        <!-- PENDING -->
104
82
        <record model="workflow.transition" id="t_pending2open">
105
83
            <field name="act_from" ref="act_pending"/>
106
84
            <field name="act_to" ref="act_open"/>
107
85
            <field name="signal">case_open</field>
108
86
        </record>
109
87
110
88
        <!-- not valid
111
89
        <record model="workflow.transition" id="t_done2draft">
112
90
            <field name="act_from" ref="act_done"/>
113
91
            <field name="act_to" ref="act_draft"/>
114
92
            <field name="signal">case_reset</field>
115
93
        </record>
116
94
        <record model="workflow.transition" id="t_cancel2draft">
117
95
            <field name="act_from" ref="act_cancel"/>
118
96
            <field name="act_to" ref="act_draft"/>
119
97
            <field name="signal">case_reset</field>
120
98
        </record>
121
99
        -->
122
100
123
101
    </data>
124
102
</openerp>
125
103
126
104
127
105
128
106
129
107
130
108
131
109
0
132
=== removed directory 'project_issue_service/static'
133
=== removed directory 'project_issue_service/static/src'
134
=== removed directory 'project_issue_service/static/src/img'
135
=== removed file 'project_issue_service/static/src/img/icon.png'
136
110
Binary files project_issue_service/static/src/img/icon.png	2012-11-22 13:29:38 +0000 and project_issue_service/static/src/img/icon.png	1970-01-01 00:00:00 +0000 differ
1
Binary files project_issue_service/static/src/img/icon.png	2012-11-22 13:29:38 +0000 and project_issue_service/static/src/img/icon.png	1970-01-01 00:00:00 +0000 differ
137
=== removed directory 'project_issue_service/wizard'
138
=== removed file 'project_issue_service/wizard/__init__.py'
139
--- project_issue_service/wizard/__init__.py	2012-11-22 13:29:38 +0000
140
+++ project_issue_service/wizard/__init__.py	1970-01-01 00:00:00 +0000
141
@@ -1,1 +0,0 @@
142
1
import project_task_reevaluate
143
2
0
144
=== removed file 'project_issue_service/wizard/project_task_reevaluate.py'
145
--- project_issue_service/wizard/project_task_reevaluate.py	2012-11-22 13:29:38 +0000
146
+++ project_issue_service/wizard/project_task_reevaluate.py	1970-01-01 00:00:00 +0000
147
@@ -1,38 +0,0 @@
148
1
# -*- coding: utf-8 -*-
149
2
##############################################################################
150
3
#    
151
4
#    Copyright (C) 2012 Daniel Reis
152
5
#
153
6
#    This program is free software: you can redistribute it and/or modify
154
7
#    it under the terms of the GNU Affero General Public License as
155
8
#    published by the Free Software Foundation, either version 3 of the
156
9
#    License, or (at your option) any later version.
157
10
#
158
11
#    This program is distributed in the hope that it will be useful,
159
12
#    but WITHOUT ANY WARRANTY; without even the implied warranty of
160
13
#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
161
14
#    GNU Affero General Public License for more details.
162
15
#
163
16
#    You should have received a copy of the GNU Affero General Public License
164
17
#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
165
18
#
166
19
##############################################################################
167
20
from osv import fields, osv
168
21
from tools.translate import _
169
22
170
23
class project_task_reevaluate(osv.osv_memory):
171
24
    _inherit = 'project.task.reevaluate'
172
25
173
26
    def compute_hours(self, cr, uid, ids, context=None):
174
27
        """
175
28
        Reevaluate relinks the Issue's current Task
176
29
        """
177
30
        task_pool  = self.pool.get('project.task')
178
31
        issue_pool = self.pool.get('project.issue')
179
32
        for o in task_pool.browse(cr, uid, context.get('active_ids', list()), context=context):
180
33
            if o.issue_id and not o.issue_id.task_id:
181
34
                issue_pool.write(cr, uid, [o.issue_id.id], {'task_id': o.id}, context=context)  
182
35
        return super(project_task_reevaluate, self).compute_hours(cr, uid, ids, context)
183
36
project_task_reevaluate()
184
37
185
38
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
186
39
0
187
=== renamed directory 'project_issue_service' => 'project_issue_task'
188
=== modified file 'project_issue_task/__init__.py' (properties changed: +x to -x)
189
--- project_issue_service/__init__.py	2012-11-22 13:29:38 +0000
190
+++ project_issue_task/__init__.py	2014-02-25 12:39:41 +0000
191
@@ -1,5 +1,4 @@
192
1
# -*- coding: utf-8 -*-
1
# -*- coding: utf-8 -*-
197
2
import project_issue
2
from . import project_issue
198
3
import project_task
3
from . import project_task_cause
199
4
import wizard
4
from . import project_task
196
5
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
200
6
5
201
=== modified file 'project_issue_task/__openerp__.py' (properties changed: +x to -x)
202
--- project_issue_service/__openerp__.py	2013-05-09 13:35:42 +0000
203
+++ project_issue_task/__openerp__.py	2014-02-25 12:39:41 +0000
204
@@ -1,7 +1,7 @@
205
1
# -*- coding: utf-8 -*-
1
# -*- coding: utf-8 -*-
206
2
##############################################################################
2
##############################################################################
207
3
#
3
#
209
4
#    Copyright (C) 2012 Daniel Reis
4
#    Copyright (C) 2012 - 2013 Daniel Reis
210
5
#
5
#
211
6
#    This program is free software: you can redistribute it and/or modify
6
#    This program is free software: you can redistribute it and/or modify
212
7
#    it under the terms of the GNU Affero General Public License as
7
#    it under the terms of the GNU Affero General Public License as
213
@@ -19,41 +19,34 @@
214
19
##############################################################################
19
##############################################################################
215
20
20
216
21
{
21
{
218
22
    'name': 'Project Issue and Task integration',
22
    'name': 'Project Issue related Tasks',
219
23
    'summary': 'Use Tasks to support Issue resolution reports',
220
23
    'version': '1.1',
24
    'version': '1.1',
221
24
    'category': 'Project Management',
25
    'category': 'Project Management',
222
25
    'description': """\
26
    'description': """\
236
26
Integrate Issues and Tasks in a common workflow, as is common in service management scenarios.
27
Support for the use case where solving an Issue means a Task should be done,
237
27
28
such as an on site visit, and a report must be made to document the work done.
238
28
1. End user creates new Issue
29
This is a common scenario in technical field services.
239
29
2. Service Desk User reviews the new Issue:
30
240
30
    If a technical person intervention is needed, creates a Task for it.
31
The Issue form already has a "Task" field, allowing to create a Task related
241
31
    If not, it's closed without the need for an intervention Task.
32
to an Issue.
242
32
3. Service Team User schedules the new Task
33
This module adds some usability improvements:
243
33
4. Service Team User completes the Task. The issue is automatically closed.
34
244
34
35
  * "Create Task" button on the Issue form
245
35
CHANGE LOG
36
  * Automaticaly Close the Issue when the Task is Closed
246
36
============
37
  * Automatically Cancel the Task when Issue is Cancelled
247
37
1.1    Reference sequence (`ref` field) moved to module `project_issue_sequences`.
38
  * Make the Task also visible to all followers of the related Issue
235
38
248
39
""",
39
""",
249
40
    'author': 'Daniel Reis',
40
    'author': 'Daniel Reis',
250
41
    'website': 'daniel.reis@securitas.pt',
251
42
    'depends': [
41
    'depends': [
252
43
        'project', 'project_functional_blocks',
253
44
        'project_issue',
42
        'project_issue',
254
45
        'project_issue_department',
255
46
        'project_issue_sequences',
256
47
        'crm_categ_hierarchy',
257
48
        'crm',
258
49
        ],
43
        ],
260
50
    'update_xml': [
44
    'data': [
261
51
        'project_issue_view.xml',
45
        'project_issue_view.xml',
262
46
        'project_task_cause_view.xml',
263
52
        'project_task_view.xml',
47
        'project_task_view.xml',
266
53
        'board_project_view.xml',
48
        'security/ir.model.access.csv',
267
54
        #'project_issue_workflow.xml', #<= not using it, to avoid migrating former Issues to the new workflow
49
        'security/project_security.xml',
268
55
        ],
50
        ],
271
56
    'installable': False,
51
    'installable': True,
270
57
    'application': True,
272
58
}
52
}
273
59
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
274
60
53
275
=== added directory 'project_issue_task/i18n'
276
=== added file 'project_issue_task/i18n/fr.po'
277
--- project_issue_task/i18n/fr.po	1970-01-01 00:00:00 +0000
278
+++ project_issue_task/i18n/fr.po	2014-02-25 12:39:41 +0000
279
@@ -0,0 +1,97 @@
280
1
# Translation of OpenERP Server.
281
2
# This file contains the translation of the following modules:
282
3
#	* project_issue_task
283
4
#
284
5
msgid ""
285
6
msgstr ""
286
7
"Project-Id-Version: OpenERP Server 7.0\n"
287
8
"Report-Msgid-Bugs-To: \n"
288
9
"POT-Creation-Date: 2013-11-21 21:31+0000\n"
289
10
"PO-Revision-Date: 2013-11-21 21:31+0000\n"
290
11
"Last-Translator: <>\n"
291
12
"Language-Team: \n"
292
13
"MIME-Version: 1.0\n"
293
14
"Content-Type: text/plain; charset=UTF-8\n"
294
15
"Content-Transfer-Encoding: \n"
295
16
"Plural-Forms: \n"
296
17
297
18
#. module: project_issue_task
298
19
#: code:addons/project_issue_task/project_issue.py:38
299
20
#, python-format
300
21
msgid "Report for %s"
301
22
msgstr "Rapport pour %s"
302
23
303
24
#. module: project_issue_task
304
25
#: view:project.issue:0
305
26
msgid "Task Report"
306
27
msgstr "Rapport de tâche"
307
28
308
29
#. module: project_issue_task
309
30
#: field:project.task.cause,code:0
310
31
msgid "Code"
311
32
msgstr "Code"
312
33
313
34
#. module: project_issue_task
314
35
#: field:project.task.cause,description:0
315
36
msgid "Description"
316
37
msgstr "Description"
317
38
318
39
#. module: project_issue_task
319
40
#: field:project.task,ref:0
320
41
msgid "Reference"
321
42
msgstr "Référence"
322
43
323
44
#. module: project_issue_task
324
45
#: model:ir.model,name:project_issue_task.model_project_issue
325
46
msgid "Project Issue"
326
47
msgstr "Incident"
327
48
328
49
#. module: project_issue_task
329
50
#: field:project.task.cause,sequence:0
330
51
msgid "Sequence"
331
52
msgstr "Sequence"
332
53
333
54
#. module: project_issue_task
334
55
#: field:project.task,reason_id:0
335
56
msgid "Problem Cause"
336
57
msgstr "Cause du problème"
337
58
338
59
#. module: project_issue_task
339
60
#: field:project.task,issue_id:0
340
61
msgid "Related Issue"
341
62
msgstr "Incident lié"
342
63
343
64
#. module: project_issue_task
344
65
#: model:ir.model,name:project_issue_task.model_project_task
345
66
msgid "Task"
346
67
msgstr "Tâche"
347
68
348
69
#. module: project_issue_task
349
70
#: code:addons/project_issue_task/project_issue.py:33
350
71
#, python-format
351
72
msgid "A Task is already assigned to the Issue!"
352
73
msgstr "Une tâche est déjà liée à l'incident!"
353
74
354
75
#. module: project_issue_task
355
76
#: model:ir.model,name:project_issue_task.model_project_task_cause
356
77
msgid "Issue Cause"
357
78
msgstr "Cause de l'incident"
358
79
359
80
#. module: project_issue_task
360
81
#: field:project.task.cause,name:0
361
82
msgid "Cause"
362
83
msgstr "Cause"
363
84
364
85
#. module: project_issue_task
365
86
#: model:ir.actions.act_window,name:project_issue_task.open_task_cause_form
366
87
#: model:ir.ui.menu,name:project_issue_task.menu_task_cause_view
367
88
#: view:project.task.cause:0
368
89
msgid "Task Issue Causes"
369
90
msgstr "Causes des incidents"
370
91
371
92
#. module: project_issue_task
372
93
#: code:addons/project_issue_task/project_issue.py:46
373
94
#, python-format
374
95
msgid "Issue Task Report"
375
96
msgstr "Rapport des tâches de l'incident"
376
97
377
0
98
378
=== added file 'project_issue_task/i18n/project_issue_task.pot'
379
--- project_issue_task/i18n/project_issue_task.pot	1970-01-01 00:00:00 +0000
380
+++ project_issue_task/i18n/project_issue_task.pot	2014-02-25 12:39:41 +0000
381
@@ -0,0 +1,97 @@
382
1
# Translation of OpenERP Server.
383
2
# This file contains the translation of the following modules:
384
3
#	* project_issue_task
385
4
#
386
5
msgid ""
387
6
msgstr ""
388
7
"Project-Id-Version: OpenERP Server 7.0\n"
389
8
"Report-Msgid-Bugs-To: \n"
390
9
"POT-Creation-Date: 2013-11-20 15:02+0000\n"
391
10
"PO-Revision-Date: 2013-11-20 15:02+0000\n"
392
11
"Last-Translator: <>\n"
393
12
"Language-Team: \n"
394
13
"MIME-Version: 1.0\n"
395
14
"Content-Type: text/plain; charset=UTF-8\n"
396
15
"Content-Transfer-Encoding: \n"
397
16
"Plural-Forms: \n"
398
17
399
18
#. module: project_issue_task
400
19
#: code:addons/project_issue_task/project_issue.py:38
401
20
#, python-format
402
21
msgid "Report for %s"
403
22
msgstr ""
404
23
405
24
#. module: project_issue_task
406
25
#: view:project.issue:0
407
26
msgid "Task Report"
408
27
msgstr ""
409
28
410
29
#. module: project_issue_task
411
30
#: field:project.task.cause,code:0
412
31
msgid "Code"
413
32
msgstr ""
414
33
415
34
#. module: project_issue_task
416
35
#: field:project.task.cause,description:0
417
36
msgid "Description"
418
37
msgstr ""
419
38
420
39
#. module: project_issue_task
421
40
#: field:project.task,ref:0
422
41
msgid "Reference"
423
42
msgstr ""
424
43
425
44
#. module: project_issue_task
426
45
#: model:ir.model,name:project_issue_task.model_project_issue
427
46
msgid "Project Issue"
428
47
msgstr ""
429
48
430
49
#. module: project_issue_task
431
50
#: field:project.task.cause,sequence:0
432
51
msgid "Sequence"
433
52
msgstr ""
434
53
435
54
#. module: project_issue_task
436
55
#: field:project.task,reason_id:0
437
56
msgid "Problem Cause"
438
57
msgstr ""
439
58
440
59
#. module: project_issue_task
441
60
#: field:project.task,issue_id:0
442
61
msgid "Related Issue"
443
62
msgstr ""
444
63
445
64
#. module: project_issue_task
446
65
#: model:ir.model,name:project_issue_task.model_project_task
447
66
msgid "Task"
448
67
msgstr ""
449
68
450
69
#. module: project_issue_task
451
70
#: code:addons/project_issue_task/project_issue.py:33
452
71
#, python-format
453
72
msgid "A Task is already assigned to the Issue!"
454
73
msgstr ""
455
74
456
75
#. module: project_issue_task
457
76
#: model:ir.model,name:project_issue_task.model_project_task_cause
458
77
msgid "Issue Cause"
459
78
msgstr ""
460
79
461
80
#. module: project_issue_task
462
81
#: field:project.task.cause,name:0
463
82
msgid "Cause"
464
83
msgstr ""
465
84
466
85
#. module: project_issue_task
467
86
#: model:ir.actions.act_window,name:project_issue_task.open_task_cause_form
468
87
#: model:ir.ui.menu,name:project_issue_task.menu_task_cause_view
469
88
#: view:project.task.cause:0
470
89
msgid "Task Issue Causes"
471
90
msgstr ""
472
91
473
92
#. module: project_issue_task
474
93
#: code:addons/project_issue_task/project_issue.py:46
475
94
#, python-format
476
95
msgid "Issue Task Report"
477
96
msgstr ""
478
97
479
0
98
480
=== added file 'project_issue_task/i18n/pt.po'
481
--- project_issue_task/i18n/pt.po	1970-01-01 00:00:00 +0000
482
+++ project_issue_task/i18n/pt.po	2014-02-25 12:39:41 +0000
483
@@ -0,0 +1,97 @@
484
1
# Translation of OpenERP Server.
485
2
# This file contains the translation of the following modules:
486
3
#	* project_issue_task
487
4
#
488
5
msgid ""
489
6
msgstr ""
490
7
"Project-Id-Version: OpenERP Server 7.0\n"
491
8
"Report-Msgid-Bugs-To: \n"
492
9
"POT-Creation-Date: 2013-11-20 15:02+0000\n"
493
10
"PO-Revision-Date: 2013-11-20 15:02+0000\n"
494
11
"Last-Translator: <>\n"
495
12
"Language-Team: \n"
496
13
"MIME-Version: 1.0\n"
497
14
"Content-Type: text/plain; charset=UTF-8\n"
498
15
"Content-Transfer-Encoding: \n"
499
16
"Plural-Forms: \n"
500
17
501
18
#. module: project_issue_task
502
19
#: code:addons/project_issue_task/project_issue.py:38
503
20
#, python-format
504
21
msgid "Report for %s"
505
22
msgstr "Relatório de %s"
506
23
507
24
#. module: project_issue_task
508
25
#: view:project.issue:0
509
26
msgid "Task Report"
510
27
msgstr "Relatório de Intervenção"
511
28
512
29
#. module: project_issue_task
513
30
#: field:project.task.cause,code:0
514
31
msgid "Code"
515
32
msgstr "Código"
516
33
517
34
#. module: project_issue_task
518
35
#: field:project.task.cause,description:0
519
36
msgid "Description"
520
37
msgstr "Descrição"
521
38
522
39
#. module: project_issue_task
523
40
#: field:project.task,ref:0
524
41
msgid "Reference"
525
42
msgstr "Referência"
526
43
527
44
#. module: project_issue_task
528
45
#: model:ir.model,name:project_issue_task.model_project_issue
529
46
msgid "Project Issue"
530
47
msgstr "Incidente"
531
48
532
49
#. module: project_issue_task
533
50
#: field:project.task.cause,sequence:0
534
51
msgid "Sequence"
535
52
msgstr "Sequência"
536
53
537
54
#. module: project_issue_task
538
55
#: field:project.task,reason_id:0
539
56
msgid "Problem Cause"
540
57
msgstr "Causa do problema"
541
58
542
59
#. module: project_issue_task
543
60
#: field:project.task,issue_id:0
544
61
msgid "Related Issue"
545
62
msgstr "Relativo ao Incidente"
546
63
547
64
#. module: project_issue_task
548
65
#: model:ir.model,name:project_issue_task.model_project_task
549
66
msgid "Task"
550
67
msgstr "Tarefa"
551
68
552
69
#. module: project_issue_task
553
70
#: code:addons/project_issue_task/project_issue.py:33
554
71
#, python-format
555
72
msgid "A Task is already assigned to the Issue!"
556
73
msgstr "O Incidente já tem uma Tarefa associada!"
557
74
558
75
#. module: project_issue_task
559
76
#: model:ir.model,name:project_issue_task.model_project_task_cause
560
77
msgid "Issue Cause"
561
78
msgstr "Causa do Incidente"
562
79
563
80
#. module: project_issue_task
564
81
#: field:project.task.cause,name:0
565
82
msgid "Cause"
566
83
msgstr "Causa"
567
84
568
85
#. module: project_issue_task
569
86
#: model:ir.actions.act_window,name:project_issue_task.open_task_cause_form
570
87
#: model:ir.ui.menu,name:project_issue_task.menu_task_cause_view
571
88
#: view:project.task.cause:0
572
89
msgid "Task Issue Causes"
573
90
msgstr "Causas para Tarefas"
574
91
575
92
#. module: project_issue_task
576
93
#: code:addons/project_issue_task/project_issue.py:46
577
94
#, python-format
578
95
msgid "Issue Task Report"
579
96
msgstr "Relatório de Intervenção"
580
97
581
0
98
582
=== modified file 'project_issue_task/project_issue.py' (properties changed: +x to -x)
583
--- project_issue_service/project_issue.py	2013-01-03 11:34:54 +0000
584
+++ project_issue_task/project_issue.py	2014-02-25 12:39:41 +0000
585
@@ -1,7 +1,7 @@
586
1
# -*- coding: utf-8 -*-
1
# -*- coding: utf-8 -*-
587
2
##############################################################################
2
##############################################################################
590
3
#    
3
#
591
4
#    Copyright (C) 2012 Daniel Reis
4
#    Copyright (C) 2012 - 2013 Daniel Reis
592
5
#
5
#
593
6
#    This program is free software: you can redistribute it and/or modify
6
#    This program is free software: you can redistribute it and/or modify
594
7
#    it under the terms of the GNU Affero General Public License as
7
#    it under the terms of the GNU Affero General Public License as
595
@@ -18,147 +18,45 @@
596
18
#
18
#
597
19
##############################################################################
19
##############################################################################
598
20
20
600
21
from osv import fields, osv
21
from openerp.osv import orm
601
22
from tools.translate import _
22
from tools.translate import _
607
23
from datetime import datetime, timedelta
23
608
24
import time
24
609
25
25
class project_issue(orm.Model):
605
26
606
27
class project_issue(osv.osv):
610
28
    _inherit = 'project.issue'
26
    _inherit = 'project.issue'
728
29
    _columns = {
27
729
30
    #added fields:
28
    def action_create_task(self, cr, uid, ids, context=None):
730
31
        'functional_block_id': fields.many2one('project.functional_block', 'Component', help = "Component (system, module, function) to be adressed"),
29
        """
731
32
        'assigned_to': fields.related('task_id', 'user_id', string = 'Task Assigned to', type="many2one", relation="res.users", store=True, help='This is the current user to whom the related task was assigned'),
30
        Create and a related Task for the visit report, and open it's Form.
732
33
        'tasks': fields.one2many('project.task', 'issue_id', 'Related tasks', help="Task history for the issue"),
31
        """
733
34
        'create_uid': fields.many2one('res.users', 'Created by', help = "Person who reported the issue"),
32
        rec = self.browse(cr, uid, ids[0], context)
734
35
    #modified fields:
33
        assert not rec.task_id, _("A Task is already assigned to the Issue!")
735
36
        'categ_id': fields.many2one('crm.case.categ', 'Category', required=True, 
34
736
37
            domain="[('object_id.model','=','project.issue')]",
35
        rec_fields = ['project_id', 'analytic_account_id', 'location_id']
737
38
            help="Only categories with a parent will be selectable in the Issues form."),
36
        task_data = dict([(x, getattr(rec, x).id) for x in rec_fields
738
39
    }
37
                          if hasattr(rec, x) and getattr(rec, x)])
739
40
38
        task_data['name'] = _('Report for %s') % rec.name
740
41
    def case_open(self, cr, uid, ids, *args):
39
        task_data['issue_id'] = rec.id
741
42
        """Open Issue preserving the assigned user_id.
40
        task_data['categ_ids'] = [(6, 0, [x.id for x in rec.categ_ids])]
742
43
        Standard project_issue.case_open() method forces user_id to the current user.
41
743
44
        This is not appropriate in the case where an administrative user is updating issue status.
42
        task_model = self.pool.get('project.task')
744
45
        With this enhancement, the original user_id is preserved.
43
        task_id = task_model.create(cr, uid, task_data, context=context)
745
46
        """
44
        rec.write({'task_id': task_id}, context=context)
746
47
        orig = self.read(cr, uid, ids, ['id', 'user_id'])
45
        res = {
747
48
        res = super(project_issue, self).case_open(cr, uid, ids, *args)
46
            'name': _('Issue Task Report'),
631
49
        for rec in orig:
632
50
            if rec['user_id'] and rec['user_id'][0]:
633
51
                #Write both 'user_id' and 'date_open' to allow Action Rule Triggers to ignore these changes using "... and not vals.get('date_open')"
634
52
                self.write(cr, uid, [rec['id']], {'date_open': time.strftime('%Y-%m-%d %H:%M:%S'), 'user_id' : rec['user_id'][0]} )
635
53
        return res
636
54
637
55
    def _validate_tasks_inactive(self, cr, uid, ids):
638
56
        """Ensure there are no related active Tasks""" 
639
57
        for issue in self.browse(cr, uid, ids):
640
58
            for task in issue.tasks:
641
59
                if task.state not in ['done', 'cancel']: 
642
60
                    raise osv.except_osv(_('Error !'), _('All related tasks should be inactive. Please check Task "%s".' % task.name))
643
61
644
62
    def case_cancel(self, cr, uid, ids, *args):
645
63
        self._validate_tasks_inactive(cr, uid, ids)
646
64
        return super(project_issue, self).case_cancel(cr, uid, ids, *args)
647
65
648
66
    def case_close(self, cr, uid, ids, *args):
649
67
        self._validate_tasks_inactive(cr, uid, ids)
650
68
        return super(project_issue, self).case_close(cr, uid, ids, *args)
651
69
652
70
    def onchange_partner_id(self, cr, uid, ids, part, email=False, proj_id=None, context=None):
653
71
        """This function returns value of partner address based on partner
654
72
        :param ids: List of case IDs
655
73
        :param part: Partner's id
656
74
        :param email: Partner's email ID
657
75
        """
658
76
        #the Issue Address is copied from the project's Contact Address
659
77
        if  proj_id:
660
78
            data = {}
661
79
            proj_obj = self.pool.get('project.project').browse(cr, uid, proj_id, context)
662
80
            #Copy address from Project
663
81
            contact_id = proj_obj.contact_id and proj_obj.contact_id.id or None
664
82
            data.update( {'partner_address_id': contact_id} )
665
83
            #Copy "reply_to" email from Project, if none already provided
666
84
            if not email:
667
85
                email = proj_obj.reply_to
668
86
                if email:
669
87
                    data.update({'email_from': email})
670
88
            return {'value': data}
671
89
        #else:
672
90
        return super(project_issue, self).onchange_partner_id(cr, uid, ids, part, email)        
673
91
        
674
92
    def on_change_project(self, cr, uid, ids, proj_id=False, context=None):
675
93
        """When changing the Issue's Project:
676
94
            - the Issue Partner is copied from the project's Partner
677
95
            - cascades the change to the Address and e-mail
678
96
        """
679
97
        if not proj_id:
680
98
            return {'value':{}}
681
99
        super_res = super(project_issue, self).on_change_project(cr, uid, ids, proj_id, context = context)
682
100
        data = super_res.get('value', {})
683
101
        #the Issue Partner is copied from the project's Partner
684
102
        proj_obj = self.pool.get('project.project').browse(cr, uid, proj_id, context)
685
103
        if proj_obj.partner_id:
686
104
            data.update( {'partner_id': proj_obj.partner_id.id} )
687
105
        #the Issue Address is copied from the project's Contact Address
688
106
        #TODO: code repeated in onchange_partner_id(); check if it's really necessary
689
107
        contact_id = proj_obj.contact_id and proj_obj.contact_id.id or None
690
108
        data.update( {'partner_address_id': contact_id} )
691
109
        #cascades the change to the Address and e-mail
692
110
        data.update( self.onchange_partner_id(cr, uid, ids, None, proj_id)['value'] )
693
111
        return {'value': data}
694
112
695
113
    def convert_issue_task(self, cr, uid, ids, context=None):
696
114
        for bug in self.browse(cr, uid, ids, context=context):
697
115
            if bug.task_id:
698
116
                new_task_id  = bug.task_id.id
699
117
            else:
700
118
                #Task,user_id must be current user; otherwise Task Access Rules may stop task.create
701
119
                #Task date start defaults to tomorrow 00:00h
702
120
                now = datetime.now()
703
121
                date_start = datetime( now.year, now.month, now.day, 0) + timedelta(days=+1)
704
122
                new_task_id = self.pool.get('project.task').create(cr, uid, {
705
123
                    'section_id': bug.section_id.id,
706
124
                    'project_id': bug.project_id.id,
707
125
                    'partner_id': bug.partner_id.id,
708
126
                    'categ_id': bug.categ_id.id,
709
127
                    'functional_block_id': bug.functional_block_id.id,
710
128
                    'date_deadline': bug.date_deadline,
711
129
                    'date_start': date_start, #changed from standard
712
130
                    'planned_hours': 1, #added
713
131
                    'name': bug.name,
714
132
                    'description':bug.description,
715
133
                    'issue_id': bug.id, #added
716
134
                    'priority': bug.priority,
717
135
                    'user_id': uid, #changed
718
136
                })
719
137
                self.write(cr, uid, [bug.id], {'task_id': new_task_id})
720
138
                self.case_open(cr, uid, [bug.id])
721
139
722
140
        data_obj = self.pool.get('ir.model.data')
723
141
        form_id = data_obj.get_object(cr, uid, 'project', 'view_task_form2').id
724
142
        tree_id = data_obj.get_object(cr, uid, 'project', 'view_task_tree2').id
725
143
        srch_id = data_obj.get_object(cr, uid, 'project', 'view_task_search_form').id
726
144
        return  {
727
145
            'name': _('Tasks'),
748
146
            'view_type': 'form',
47
            'view_type': 'form',
750
147
            'view_mode': 'form,tree', 
48
            'view_mode': 'form',
751
148
            'res_model': 'project.task',
49
            'res_model': 'project.task',
768
149
            'res_id': int(new_task_id),
50
            'res_id': task_id,
769
150
            'view_id': False,
51
            'type': 'ir.actions.act_window'}
770
151
            'views': [(form_id,'form'),(tree_id,'tree'),(False,'calendar'),(False,'graph')],
52
        return res
771
152
            'type': 'ir.actions.act_window',
53
772
153
            'search_view_id': srch_id,
54
    def case_cancel(self, cr, uid, ids, context=None):
773
154
            'nodestroy': True
55
        """ On Issue Cancel, also Cancel Task """
774
155
        }
56
        task_ids = [issue.task_id.id
775
156
57
                    for issue in self.browse(cr, uid, ids, context=context)
776
157
    def convert_issue_task_tree(self, cr, uid, ids, context=None):
58
                    if issue.task_id]
777
158
        """Create Task from Issue, without opening it's form"""
59
        self.pool.get('project.task').case_cancel(
778
159
        self.convert_issue_task(cr, uid, ids, context=context)
60
            cr, uid, task_ids, context=context)
779
160
        return True
61
        return super(project_issue, self).case_cancel(
780
161
62
            cr, uid, ids, context=context)
765
162
project_issue()
766
163
    
767
164
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
781
165
63
782
=== modified file 'project_issue_task/project_issue_view.xml' (properties changed: +x to -x)
783
--- project_issue_service/project_issue_view.xml	2012-12-20 12:06:22 +0000
784
+++ project_issue_task/project_issue_view.xml	2014-02-25 12:39:41 +0000
785
@@ -1,174 +1,20 @@
786
1
<?xml version="1.0" encoding="utf-8"?>
1
<?xml version="1.0" encoding="utf-8"?>
787
2
<openerp>
2
<openerp>
788
3
    <data>
3
    <data>
790
4
        
4
791
5
        <!--PROJECT ISSUE FORM -->
5
        <!--PROJECT ISSUE FORM -->
794
6
        <record id="project_issue_form_view_dreis" model="ir.ui.view">
6
        <record id="project_issue_form_view_task" model="ir.ui.view">
795
7
            <field name="name">project_issue_form_view_dreis</field>
7
            <field name="name">project_issue_form_view_task</field>
796
8
            <field name="model">project.issue</field>
8
            <field name="model">project.issue</field>
797
9
            <field name="inherit_id" ref="project_issue.project_issue_form_view"/>
9
            <field name="inherit_id" ref="project_issue.project_issue_form_view"/>
798
10
            <field name="arch" type="xml">
10
            <field name="arch" type="xml">
799
11
11
959
12
                <field name="categ_id" position="replace"/>
12
               <field name="task_id" position="after">
960
13
                <field name="name" position="replace">
13
                    <button type="object" name="action_create_task" string="Task Report" attrs="{'invisible': [('task_id', '!=', False)]}"/>
961
14
                    <field name="name" colspan="4"/>
14
               </field>
962
15
                    <field name="functional_block_id" select="1" required="1" widget="selection"/>
15
963
16
                    <field name="categ_id" widget="selection" domain="[('object_id.model','=','project.issue')]"/>
16
            </field>
964
17
                        <!--... domain="[('object_id.model', '=', 'project.issue'),('parent_id','!=',None)]" -->
17
        </record>
806
18
                    <field name="create_uid" readonly="1"/>
807
19
                </field>
808
20
                <field name="project_id" position="attributes">
809
21
                    <attribute name="colspan">4</attribute>
810
22
                </field>
811
23
                
812
24
                <field name="version_id" position="attributes">
813
25
                    <attribute name="groups">base.group_extended</attribute>
814
26
                </field>
815
27
816
28
                <!-- Partner Address: add domain -->
817
29
                <field name="partner_id" position="replace">
818
30
                    <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from, project_id)" required="1"/>
819
31
                </field>
820
32
                <field name="partner_address_id" position="replace">
821
33
                    <field name="partner_address_id"  string="Address" required="1" 
822
34
                           on_change="onchange_partner_address_id(partner_address_id, email_from)"
823
35
                           domain="[('partner_id','=',partner_id)]"/>
824
36
                </field>
825
37
                <field name="priority" position="after">
826
38
                    <field name="section_id" string="Service Team" groups="base.group_extended"/>
827
39
                </field>
828
40
829
41
                <!-- Create task Button -->
830
42
                <field name="task_id" position="attributes">
831
43
                    <attribute name="string">Current Task</attribute>
832
44
                </field>
833
45
                <xpath expr='//button[@name="convert_issue_task"]' position="replace">
834
46
                    <button name="convert_issue_task" string="Create Task" icon="gtk-index" type="object" attrs="{'invisible':['|',('task_id','!=',False), ('state','in',['cancel','done'])]}"/>
835
47
                </xpath>
836
48
                
837
49
                <!-- Modify existing buttons -->
838
50
                <button name="case_cancel" position="attributes">
839
51
                    <attribute name="states">draft,open</attribute>
840
52
                    <!--attribute name="type">workflow</attribute-->
841
53
                </button>
842
54
                <button name="case_open" position="attributes">
843
55
                    <attribute name="states">draft,pending</attribute>
844
56
                    <!--attribute name="type">workflow</attribute-->
845
57
                </button>
846
58
                <button name="case_pending" position="attributes">
847
59
                    <attribute name="states">open</attribute>
848
60
                    <!--attribute name="type">workflow</attribute-->
849
61
                </button>
850
62
                <button name="case_close" position="attributes">
851
63
                    <attribute name="states">open</attribute>
852
64
                    <!--attribute name="type">workflow</attribute-->
853
65
                </button>
854
66
                <!-- button name="case_reset" position="replace"/> -->
855
67
                
856
68
                <xpath expr='//page[@string="Communication &amp; History"]' position="attributes">
857
69
                    <attribute name="groups"/>
858
70
                </xpath>
859
71
                <!-- ###BUG https://bugs.launchpad.net/openobject-addons/+bug/944879 -->
860
72
                <field name="email_cc" position="attributes">
861
73
                    <attribute name="widget">email</attribute>
862
74
                </field>
863
75
864
76
                 <!-- Task History tab-->
865
77
                 <xpath expr='//page[@string="Extra Info"]' position="before">
866
78
                    <page string="Task History">
867
79
                        <field name="tasks" nolabel="1" readonly="1"/>
868
80
                    </page>
869
81
                 </xpath>
870
82
                
871
83
            </field>
872
84
        </record>
873
85
874
86
        <!--PROJECT ISSUE SEARCH -->
875
87
        <record id="view_project_issue_filter_dreis" model="ir.ui.view">
876
88
            <field name="name">Project Issue Tracker Search</field>
877
89
            <field name="model">project.issue</field>
878
90
            <field name="inherit_id" ref="project_issue.view_project_issue_filter"/>
879
91
            <field name="arch" type="xml">
880
92
881
93
                   <!-- "To-Do" button relabeled to "In Progress" -->
882
94
                   <filter name="todo" position="attributes">
883
95
                           <attribute name="string">Open</attribute>
884
96
                   </filter>
885
97
                    <!--  name filter -->
886
98
                    <field name="name" position="replace">
887
99
                        <field name="name" string="Issue" colspan="2"
888
100
                               filter_domain="['|','|','|',('project_id','ilike',self), ('partner_id','ilike',self), ('email_from','ilike',self), ('name','ilike',self)]"
889
101
                        />
890
102
                    </field>
891
103
                    <!--  user_id buttons with same order as Tasks  (BUGFIX to report) -->
892
104
                    <field name="user_id" position="replace">
893
105
                        <field name="user_id" filter_domain="['|',('user_id','=',self),('create_uid','=',self)]" string="User">
894
106
                            <filter domain="['|',('user_id','=',uid),('create_uid','=',uid)]"  help="My Issues" icon="terp-personal" />
895
107
                            <filter domain="[('user_id','=',False)]" help="Unassigned Issues" icon="terp-personal-" groups="project.group_project_manager"/>
896
108
                        </field>
897
109
                    </field>
898
110
                    <field name="project_id" position="replace"/>
899
111
900
112
                    <!-- Search by "ref" instead of "id"; add section_id (Team) -->
901
113
                    <field name="id" position="replace">
902
114
                        <field name="section_id" string="Team" widget="selection" groups="base.group_extended"/>
903
115
                    </field>
904
116
                    <!--  GROUP BY -->
905
117
                    <filter string="Partner" position="after">
906
118
                        <filter string="Team" icon="STOCK_SELECT_COLOR" domain="[]" context="{'group_by':'section_id'}"/>
907
119
                    </filter>
908
120
            </field>
909
121
        </record>
910
122
911
123
        <!--PROJECT ISSUE TREE -->
912
124
        <record model="ir.ui.view" id="project_issue_tree_view_reis">
913
125
            <field name="name">Project Issue Tracker Tree</field>
914
126
            <field name="model">project.issue</field>
915
127
            <field name="inherit_id" ref="project_issue.project_issue_tree_view"/>
916
128
            <field name="arch" type="xml">
917
129
              <data>
918
130
                <!-- Colors like Task Tree -->
919
131
                <!-- TODO: red for surpassed dealines  -->
920
132
                <tree position="attributes">
921
133
                      <attribute name="colors">grey:state in ('cancel','done');blue:state == 'pending'</attribute>
922
134
                </tree>
923
135
                <!-- Internal ID, Version and Stage visible only in Extended mode -->
924
136
                <field name="id" position="attributes"><attribute name="invisible">1</attribute></field>
925
137
                <field name="type_id" position="attributes"><attribute name="groups">base.group_extended</attribute></field>
926
138
                <button name="prev_type" position="attributes"><attribute name="groups">base.group_extended</attribute></button>
927
139
                <button name="next_type" position="attributes"><attribute name="groups">base.group_extended</attribute></button>
928
140
                <field name="version_id" position="attributes"><attribute name="groups">base.group_extended</attribute></field>
929
141
                <field name="categ_id" position="attributes"><attribute name="groups">base.group_extended</attribute></field>
930
142
                <!-- Ref and Category visible after issue name -->
931
143
                <field name="user_id" position="after">
932
144
                    <field name="section_id" groups="base.group_extended"/>
933
145
                    <field name="create_uid"/>
934
146
                </field>
935
147
                <!-- State buttons equal to Task Tree -->
936
148
                <button name="case_cancel" position="replace"/>
937
149
                <button name="case_close" position="replace"/>
938
150
                <button name="case_pending" position="replace"/>
939
151
                <button name="case_escalate" position="replace"/>
940
152
                <button name="case_reset" position="replace"/>
941
153
                <button name="case_open" position="replace">
942
154
                    <button name="convert_issue_task_tree" string="Create Task" icon="gtk-index" type="object" 
943
155
                            attrs="{'invisible':['|',('task_id','!=',False), ('state','in',['cancel','done'])]}"/>
944
156
                    <button name="case_open" string="Open" states="draft,pending" type="object" 
945
157
                            icon="gtk-media-play" help="Moves to state In Progress" groups="base.group_extended"/>
946
158
                    <button name="case_close" string="Done" states="open" type="object"  
947
159
                            icon="terp-dialog-close"/>
948
160
                </button>
949
161
950
162
              </data>
951
163
            </field>
952
164
        </record>
953
165
954
166
    <!-- ISSUE KANBAN VIEW: moving from first to last position-->
955
167
    <record model="ir.actions.act_window.view" id="project_issue.action_crm_tag_kanban_view0">
956
168
        <field name="sequence" eval="10"/>
957
169
    </record>
958
170
    <!-- -->
965
171
18
966
172
    </data>
19
    </data>
967
173
</openerp>
20
</openerp>
968
174
969
175
21
970
=== modified file 'project_issue_task/project_task.py' (properties changed: +x to -x)
971
--- project_issue_service/project_task.py	2012-11-22 13:29:38 +0000
972
+++ project_issue_task/project_task.py	2014-02-25 12:39:41 +0000
973
@@ -1,7 +1,7 @@
974
1
# -*- coding: utf-8 -*-
1
# -*- coding: utf-8 -*-
975
2
##############################################################################
2
##############################################################################
978
3
#    
3
#
979
4
#    Copyright (C) 2012 Daniel Reis
4
#    Copyright (C) 2012 - 2013 Daniel Reis
980
5
#
5
#
981
6
#    This program is free software: you can redistribute it and/or modify
6
#    This program is free software: you can redistribute it and/or modify
982
7
#    it under the terms of the GNU Affero General Public License as
7
#    it under the terms of the GNU Affero General Public License as
983
@@ -18,74 +18,37 @@
984
18
#
18
#
985
19
##############################################################################
19
##############################################################################
986
20
20
1011
21
from crm import crm
21
from openerp.osv import fields, orm
1012
22
from osv import fields, osv
22
1013
23
from datetime import datetime, timedelta
23
1014
24
24
class task(orm.Model):
991
25
###TASK_TYPE_USE_GROUPS = [('resolution', 'Resolution Stage'), ('cause', 'Problem Cause')]
992
26
993
27
#class project_task_type(osv.osv):
994
28
#    _inherit = 'project.task.type'
995
29
#    _sort = 'use_group, sequence'
996
30
#    _columns = {
997
31
#        'use_group': fields.selection( TASK_TYPE_USE_GROUPS , 'Usage', size=16),
998
32
#        'code': fields.char('Code', size=10),
999
33
#    }
1000
34
#project_task_type()
1001
35
1002
36
1003
37
#class project_functional_block(osv.osv):
1004
38
#    _inherit = 'project.functional_block'
1005
39
#    _columns = {
1006
40
#        'code': fields.char('Code', size=10),
1007
41
#    }
1008
42
#project_functional_block()
1009
43
1010
44
class task(osv.osv):
1015
45
    _inherit = "project.task"
25
    _inherit = "project.task"
1016
26
1017
27
    def _fld_issue_id(self, cr, uid, ids, field, arg, context=None):
1018
28
        res = {}
1019
29
        issue_model = self.pool.get('project.issue')
1020
30
        for doc in self.browse(cr, uid, ids, context=context):
1021
31
            issue_id = issue_model.search(
1022
32
                cr, uid, [('task_id', '=', doc.id)], context=context)
1023
33
            if issue_id:
1024
34
                res[doc.id] = issue_id[0]
1025
35
            else:
1026
36
                res[doc.id] = None
1027
37
        return res
1028
38
1029
46
    _columns = {
39
    _columns = {
1075
47
        #modified fields:
40
        'issue_id': fields.function(
1076
48
        'section_id': fields.many2one('crm.case.section', 'Service Team', select=True,\
41
            _fld_issue_id, string="Related Issue",
1077
49
            help='Service team to which Task belongs to.'), #standard: relabeled
42
            type="many2one", relation="project.issue", store=True),
1078
50
        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True), #Standard is 0-4; changed to conform with project_issue (1-5)!
43
        'ref': fields.char('Reference', 20),
1079
51
        #added fields:
44
        'reason_id': fields.many2one('project.task.cause', 'Problem Cause'),
1080
52
        'issue_id': fields.many2one('project.issue', 'Related Issue', readonly=True, 
45
        }
1081
53
            help="Issue related to this task"),
46
1082
54
        'categ_id': fields.related('issue_id', 'categ_id', string='Issue Category', type="many2one", relation='crm.case.categ', store=True),
47
    def action_close(self, cr, uid, ids, context=None):
1083
55
    }
48
        """ On Task Close, also close Issue """
1084
56
        
49
        issue_ids = [x.issue_id.id
1085
57
    def do_close(self, cr, uid, ids, context=None):
50
                     for x in self.browse(cr, uid, ids, context=context)
1086
58
        """
51
                     if x.issue_id]
1087
59
        Clean up related Issues's 'Current Task', and set issue state to either
52
        self.pool.get('project.issue').case_close(
1088
60
        'done' or 'pending', if pending work is described in the 'todo_desc' field.
53
            cr, uid, issue_ids, context=context)
1089
61
        """
54
        return super(task, self).action_close(cr, uid, ids, context=context)
1045
62
        #Tasks must be closed first, because Issues with active tasks can't be closed
1046
63
        res = super(task, self).do_close(cr, uid, ids, context)
1047
64
        #Update related issue state
1048
65
        issue_model = self.pool.get('project.issue')
1049
66
        for tsk in self.browse(cr, uid, ids):
1050
67
            if tsk.issue_id and tsk.issue_id.state not in ['done', 'cancel']:
1051
68
                #Current task cleaned up, so that the "Create Task" button is shown again
1052
69
                issue_model.write(cr, uid, [tsk.issue_id.id], {'task_id': None}, context=context)
1053
70
                #If pending work, issue is not closed, but set to "PENDING"
1054
71
                if tsk.todo_desc:
1055
72
                    issue_model.case_pending(cr, uid, [tsk.issue_id.id])
1056
73
                else:
1057
74
                    issue_model.case_close(cr, uid, [tsk.issue_id.id])
1058
75
        return res
1059
76
   
1060
77
    def do_cancel(self, cr, uid, ids, context=None):
1061
78
        """
1062
79
        Clean up related Issues's 'Current Task'
1063
80
        """ 
1064
81
        issue_model = self.pool.get('project.issue')
1065
82
        for tsk in self.browse(cr, uid, ids):
1066
83
            if tsk.issue_id and tsk.issue_id.state not in ['closed', 'cancelled']:
1067
84
                issue_model.write(cr, uid, [tsk.issue_id.id], {'task_id': None}, context=context)
1068
85
        return super(task, self).do_cancel(cr, uid, ids, context)
1069
86
1070
87
task()
1071
88
1072
89
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
1073
90
1074
91
1090
92
55
1091
=== renamed file 'project_task_service/project_task_cause.py' => 'project_issue_task/project_task_cause.py' (properties changed: +x to -x)
1092
--- project_task_service/project_task_cause.py	2012-11-22 13:29:38 +0000
1093
+++ project_issue_task/project_task_cause.py	2014-02-25 12:39:41 +0000
1094
@@ -1,6 +1,6 @@
1095
1
# -*- coding: utf-8 -*-
1
# -*- coding: utf-8 -*-
1096
2
##############################################################################
2
##############################################################################
1098
3
#    
3
#
1099
4
#    Copyright (C) 2012 Daniel Reis
4
#    Copyright (C) 2012 Daniel Reis
1100
5
#
5
#
1101
6
#    This program is free software: you can redistribute it and/or modify
6
#    This program is free software: you can redistribute it and/or modify
1102
@@ -18,11 +18,12 @@
1103
18
#
18
#
1104
19
##############################################################################
19
##############################################################################
1105
20
20
1109
21
from osv import fields, osv
21
from openerp.osv import fields, orm
1110
22
22
1111
23
class project_task_cause(osv.osv):
23
1112
24
class project_task_cause(orm.Model):
1113
24
    _name = 'project.task.cause'
25
    _name = 'project.task.cause'
1115
25
    _description = 'Incident Cause'
26
    _description = 'Issue Cause'
1116
26
    _order = 'sequence'
27
    _order = 'sequence'
1117
27
    _columns = {
28
    _columns = {
1118
28
        'name': fields.char('Cause', required=True, size=64, translate=True),
29
        'name': fields.char('Cause', required=True, size=64, translate=True),
1119
@@ -33,8 +34,3 @@
1120
33
    _defaults = {
34
    _defaults = {
1121
34
        'sequence': 10
35
        'sequence': 10
1122
35
    }
36
    }
1123
36
project_task_cause()
1124
37
    
1125
38
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
1126
39
1127
40
1128
41
37
1129
=== renamed file 'project_task_service/project_task_cause_view.xml' => 'project_issue_task/project_task_cause_view.xml' (properties changed: +x to -x)
1130
--- project_task_service/project_task_cause_view.xml	2012-11-22 14:24:56 +0000
1131
+++ project_issue_task/project_task_cause_view.xml	2014-02-25 12:39:41 +0000
1132
@@ -6,39 +6,48 @@
1133
6
        <record id="task_cause_edit" model="ir.ui.view">
6
        <record id="task_cause_edit" model="ir.ui.view">
1134
7
            <field name="name">project.task.cause.form</field>
7
            <field name="name">project.task.cause.form</field>
1135
8
            <field name="model">project.task.cause</field>
8
            <field name="model">project.task.cause</field>
1136
9
            <field name="type">form</field>
1137
10
            <field name="arch" type="xml">
9
            <field name="arch" type="xml">
1139
11
                <form string="Task Incident Causes">
10
1140
11
              <form string="Task Issue Causes">
1141
12
                <group>
1142
13
                  <group>
1143
12
                    <field name="name"/>
14
                    <field name="name"/>
1144
15
                    <field name="description"/>
1145
16
                  </group>
1146
17
                  <group>
1147
13
                    <field name="sequence"/>
18
                    <field name="sequence"/>
1148
14
                    <field name="code"/>
19
                    <field name="code"/>
1152
15
                    <separator string="Description" colspan="4"/>
20
                  </group>
1153
16
                    <field colspan="4" name="description" nolabel="1"/>
21
                </group>
1154
17
                </form>
22
              </form>
1155
23
1156
18
            </field>
24
            </field>
1157
19
        </record>
25
        </record>
1158
20
26
1159
21
        <record id="task_cause_tree" model="ir.ui.view">
27
        <record id="task_cause_tree" model="ir.ui.view">
1160
22
            <field name="name">project.task.cause.tree</field>
28
            <field name="name">project.task.cause.tree</field>
1163
23
            <field name="model">project.cause.type</field>
29
            <field name="model">project.task.cause</field>
1162
24
            <field name="type">tree</field>
1164
25
            <field name="arch" type="xml">
30
            <field name="arch" type="xml">
1166
26
                <tree string="Task Incident Causes">
31
1167
32
                <tree string="Task Issue Causes">
1168
27
                    <field name="sequence"/>
33
                    <field name="sequence"/>
1169
28
                    <field name="code"/>
34
                    <field name="code"/>
1170
29
                    <field name="name"/>
35
                    <field name="name"/>
1171
30
                </tree>
36
                </tree>
1172
37
1173
31
            </field>
38
            </field>
1174
32
        </record>
39
        </record>
1175
33
40
1176
34
        <record id="open_task_cause_form" model="ir.actions.act_window">
41
        <record id="open_task_cause_form" model="ir.actions.act_window">
1178
35
            <field name="name">Causes</field>
42
            <field name="name">Task Issue Causes</field>
1179
36
            <field name="res_model">project.task.cause</field>
43
            <field name="res_model">project.task.cause</field>
1180
37
            <field name="view_type">form</field>
44
            <field name="view_type">form</field>
1181
38
            <field name="view_id" ref="task_cause_tree"/>
45
            <field name="view_id" ref="task_cause_tree"/>
1182
39
        </record>
46
        </record>
1183
40
47
1185
41
        <menuitem action="open_task_cause_form" id="menu_task_cause_view" parent="project.menu_project_config_project" sequence="3"/>
48
        <menuitem action="open_task_cause_form"
1186
49
                  id="menu_task_cause_view"
1187
50
                  parent="base.menu_definitions"/>
1188
42
51
1189
43
    </data>
52
    </data>
1190
44
</openerp>
53
</openerp>
1191
45
54
1192
=== modified file 'project_issue_task/project_task_view.xml' (properties changed: +x to -x)
1193
--- project_issue_service/project_task_view.xml	2012-11-22 14:24:56 +0000
1194
+++ project_issue_task/project_task_view.xml	2014-02-25 12:39:41 +0000
1195
@@ -2,50 +2,25 @@
1196
2
<openerp>
2
<openerp>
1197
3
    <data>
3
    <data>
1198
4
4
1214
5
        <!--PROJECT TASK CATEGORIES -->
5
        <record id="view_project_task_form_issue" model="ir.ui.view">
1215
6
        <record id="project_task_categ_action" model="ir.actions.act_window">
6
            <field name="name">project.task.form.issue</field>
1201
7
            <field name="name">Task Categories</field>
1202
8
            <field name="res_model">crm.case.categ</field>
1203
9
            <field name="view_type">form</field>
1204
10
            <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
1205
11
            <field name="domain">[('object_id.model', '=', 'project.task')]</field>
1206
12
            <field name="context" eval="{'object_id': ref('project.model_project_task')}"/>
1207
13
        </record>
1208
14
        <menuitem action="project_task_categ_action" name="Categories" id="menu_project_task_category_act" parent="project.menu_project_config_project" />
1209
15
1210
16
1211
17
        <!-- TASK FORM -->
1212
18
        <record id="view_project_task_form_dreis" model="ir.ui.view">
1213
19
            <field name="name">project.task.form.dreis</field>
1216
20
            <field name="model">project.task</field>
7
            <field name="model">project.task</field>
1217
21
            <field name="inherit_id" ref="project.view_task_form2"/>
8
            <field name="inherit_id" ref="project.view_task_form2"/>
1218
22
            <field name="arch" type="xml">
9
            <field name="arch" type="xml">
1220
23
                <field name="progress" position="after">
10
1221
11
                <field name="date_deadline" position="before">
1222
12
                    <field name="ref"/>
1223
13
                </field>
1224
14
                <field name="partner_id" position="after">
1225
24
                    <field name="issue_id"/>
15
                    <field name="issue_id"/>
1237
25
                    <field name="categ_id" widget="selection" 
16
                </field>
1238
26
                           domain="['|',('object_id.model', '=', 'project.task'),('object_id.model', '=', 'project.issue'),('parent_id','!=',None)]"/>
17
                <field name="description" position="before">
1239
27
                </field>
18
                  <group>
1240
28
                <field name="partner_id" position="after">
19
                    <field name="reason_id"
1241
29
                    <field name="section_id"/>
20
                           attrs="{'invisible': [('issue_id','=',False)]}"/>
1242
30
                </field>
21
                  </group>
1243
31
                <field name="description" position="attributes">
22
                </field>
1233
32
                    <attribute name="attrs">{'readonly':[('state','!=','draft')]}</attribute>
1234
33
                </field>
1235
34
            </field>
1236
35
        </record>
1244
36
23
1245
37
        <!-- TASK TREE -->
1246
38
        <record id="view_task_tree2" model="ir.ui.view">
1247
39
            <field name="name">project.task.tree</field>
1248
40
            <field name="model">project.task</field>
1249
41
            <field name="inherit_id" ref="project.view_task_tree2"/>
1250
42
            <field name="arch" type="xml">
1251
43
            
1252
44
                <field name="user_id" position="after">
1253
45
                    <field name="date_start"/>
1254
46
                    <field name="date_end"/>
1255
47
                </field>
1256
48
            
1257
49
            </field>
24
            </field>
1258
50
        </record>
25
        </record>
1259
51
26
1260
52
27
1261
=== renamed directory 'project_task_service/security' => 'project_issue_task/security'
1262
=== modified file 'project_issue_task/security/ir.model.access.csv' (properties changed: +x to -x)
1263
--- project_task_service/security/ir.model.access.csv	2012-11-22 13:29:38 +0000
1264
+++ project_issue_task/security/ir.model.access.csv	2014-02-25 12:39:41 +0000
1265
@@ -1,3 +1,3 @@
1266
1
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
1
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
1267
2
"access_project_task_cause_project_manager","project_task_cause_project_manager","model_project_task_cause","project.group_project_manager",1,1,1,1
2
"access_project_task_cause_project_manager","project_task_cause_project_manager","model_project_task_cause","project.group_project_manager",1,1,1,1
1269
3
"access_project_task_cause_project_user","project_task_cause_project_user","model_project_task_cause","project.group_project_user",1,0,0,0
3
"access_project_task_cause_project_user","project_task_cause_project_user","model_project_task_cause","base.group_user",1,0,0,0
1270
4
4
1271
=== added file 'project_issue_task/security/project_security.xml'
1272
--- project_issue_task/security/project_security.xml	1970-01-01 00:00:00 +0000
1273
+++ project_issue_task/security/project_security.xml	2014-02-25 12:39:41 +0000
1274
@@ -0,0 +1,30 @@
1275
1
<?xml version="1.0" encoding="utf-8"?>
1276
2
<openerp>
1277
3
    <data noupdate="1">
1278
4
1279
5
1280
6
        <record model="ir.rule" id="issue_related_task_employee">
1281
7
            <field name="name">Project/Task: Employees can view Issue's related Task</field>
1282
8
            <field name="model_id" ref="project.model_project_task"/>
1283
9
            <field name="groups" eval="[(4,ref('base.group_user'))]"/>
1284
10
            <field name="domain_force">[('issue_id.message_follower_ids', 'in', [user.partner_id.id])]</field>
1285
11
            <field name="perm_read" eval="True"/>
1286
12
            <field name="perm_create" eval="False"/>
1287
13
            <field name="perm_write" eval="False"/>
1288
14
            <field name="perm_unlink" eval="False"/>
1289
15
        </record>
1290
16
1291
17
        <record model="ir.rule" id="issue_related_task_project_user">
1292
18
            <field name="name">Project/Task: Project Users can edit Issue's related Task</field>
1293
19
            <field name="model_id" ref="project.model_project_task"/>
1294
20
            <field name="groups" eval="[(4,ref('project.group_project_user'))]"/>
1295
21
            <field name="domain_force">[('issue_id.message_follower_ids', 'in', [user.partner_id.id])]</field>
1296
22
            <field name="perm_read" eval="True"/>
1297
23
            <field name="perm_create" eval="True"/>
1298
24
            <field name="perm_write" eval="True"/>
1299
25
            <field name="perm_unlink" eval="True"/>
1300
26
        </record>
1301
27
1302
28
1303
29
    </data>
1304
30
</openerp>
1305
0
31
1306
=== removed directory 'project_task_service'
1307
=== removed file 'project_task_service/__init__.py'
1308
--- project_task_service/__init__.py	2012-11-22 13:29:38 +0000
1309
+++ project_task_service/__init__.py	1970-01-01 00:00:00 +0000
1310
@@ -1,4 +0,0 @@
1311
1
# -*- coding: utf-8 -*-
1312
2
import project_task_cause
1313
3
import project_task
1314
4
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
1315
5
0
1316
=== removed file 'project_task_service/__openerp__.py'
1317
--- project_task_service/__openerp__.py	2013-03-04 16:16:31 +0000
1318
+++ project_task_service/__openerp__.py	1970-01-01 00:00:00 +0000
1319
@@ -1,52 +0,0 @@
1320
1
# -*- coding: utf-8 -*-
1321
2
##############################################################################
1322
3
#
1323
4
#    Copyright (C) 2012 Daniel Reis
1324
5
#
1325
6
#    This program is free software: you can redistribute it and/or modify
1326
7
#    it under the terms of the GNU Affero General Public License as
1327
8
#    published by the Free Software Foundation, either version 3 of the
1328
9
#    License, or (at your option) any later version.
1329
10
#
1330
11
#    This program is distributed in the hope that it will be useful,
1331
12
#    but WITHOUT ANY WARRANTY; without even the implied warranty of
1332
13
#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1333
14
#    GNU Affero General Public License for more details.
1334
15
#
1335
16
#    You should have received a copy of the GNU Affero General Public License
1336
17
#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
1337
18
#
1338
19
##############################################################################
1339
20
1340
21
{
1341
22
    'name': 'Project Task Record',
1342
23
    'version': '1.0',
1343
24
    "category": "Project Management",
1344
25
    'description': """\
1345
26
Add to project tasks all necessary fields to record a service intervention:
1346
27
* Time spent
1347
28
* Materials used
1348
29
* Work done description
1349
30
* Work pending description
1350
31
* Problem cause identification
1351
32
1352
33
Before creating new Projects, review the following configurations::
1353
34
* Stages: the task stages ""common to all projects" are assigned to new projects by default.
1354
35
* Causes: the possible reasons for problem causing a service incidents.
1355
36
* Functional Blocks: the sub-components or sub-systems for projects.
1356
37
1357
38
Contributions are appreciated. Some ideas to develop:
1358
39
* add a 'crm_category_stages' module, to make configurable the stages (type_ids) valid for each Category.
1359
40
""",
1360
41
    'author': 'Daniel Reis',
1361
42
    'website': 'daniel.reis@securitas.pt',
1362
43
    'depends': ['project', 'project_functional_blocks', 'project_department'],
1363
44
    'update_xml': [
1364
45
        'project_task_cause_view.xml',
1365
46
        'project_task_view.xml',
1366
47
        'security/ir.model.access.csv',
1367
48
    ],
1368
49
    'installable': False,
1369
50
    'application': False,
1370
51
}
1371
52
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
1372
53
0
1373
=== removed file 'project_task_service/project_task.py'
1374
--- project_task_service/project_task.py	2012-11-22 13:29:38 +0000
1375
+++ project_task_service/project_task.py	1970-01-01 00:00:00 +0000
1376
@@ -1,88 +0,0 @@
1377
1
# -*- coding: utf-8 -*-
1378
2
##############################################################################
1379
3
#    
1380
4
#    Copyright (C) 2012 Daniel Reis
1381
5
#
1382
6
#    This program is free software: you can redistribute it and/or modify
1383
7
#    it under the terms of the GNU Affero General Public License as
1384
8
#    published by the Free Software Foundation, either version 3 of the
1385
9
#    License, or (at your option) any later version.
1386
10
#
1387
11
#    This program is distributed in the hope that it will be useful,
1388
12
#    but WITHOUT ANY WARRANTY; without even the implied warranty of
1389
13
#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1390
14
#    GNU Affero General Public License for more details.
1391
15
#
1392
16
#    You should have received a copy of the GNU Affero General Public License
1393
17
#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
1394
18
#
1395
19
##############################################################################
1396
20
1397
21
from osv import fields, osv
1398
22
from datetime import datetime, timedelta
1399
23
1400
24
class task(osv.osv):
1401
25
    #FUTURE: use task recurrency, to generate maintenance plans
1402
26
    #FUTURE: Apply maintenance plan templates (use Project templates?)
1403
27
    _inherit = "project.task"
1404
28
    _columns = {
1405
29
        #modified fields:
1406
30
        'functional_block_id': fields.many2one('project.functional_block', 'Component', 
1407
31
            help = "Component (system, module, function) to be addressed"),
1408
32
        #added fields:
1409
33
        'ref': fields.char('Code', 20, help="Service Order number"),
1410
34
        'report_desc': fields.text('Work description'),
1411
35
        'todo_desc': fields.text('Pending issues description'),
1412
36
        'reason_id': fields.many2one('project.task.cause', 'Problem Cause', \
1413
37
            help='Cause for the incident that made this task necessary. Available list depends on the Task Type.'),
1414
38
    }
1415
39
1416
40
    def do_close(self, cr, uid, ids, context=None):
1417
41
        #Automatically adjust Task Start and End dates based on Work details:
1418
42
        for t in  self.browse(cr, uid, ids, context=context):
1419
43
            task_dts = t.date_start
1420
44
            task_dte = t.date_end or t.date_start
1421
45
            for w in t.work_ids:
1422
46
                #Task start date should not be later than the oldest work line
1423
47
                work_dts = w.date
1424
48
                task_dts = min(task_dts, work_dts) or work_dts
1425
49
                #Task end date should not be before the last work line
1426
50
                d = datetime.strptime(w.date, '%Y-%m-%d %H:%M:%S') \
1427
51
                    + timedelta(seconds=round(w.hours*3600) )
1428
52
                work_dte = d.strftime('%Y-%m-%d %H:%M:%S')
1429
53
                task_dte = max(task_dte, work_dte) or work_dte
1430
54
            vals = {'date_start': task_dts, 'date_end': task_dte}
1431
55
            self.write(cr, uid, [t.id],vals, context=context)
1432
56
        return super(task, self).do_close(cr, uid, ids, context)
1433
57
    
1434
58
task()
1435
59
1436
60
1437
61
class project_work(osv.osv):
1438
62
    #Changed Task work default Date to Y-m-d
1439
63
    _inherit = "project.task.work"
1440
64
    _defaults = {
1441
65
        'date': lambda *a: datetime.now().strftime('%Y-%m-%d'),
1442
66
    }
1443
67
project_work()
1444
68
1445
69
1446
70
class project_task_type(osv.osv):
1447
71
    _inherit = 'project.task.type'
1448
72
    _columns = {
1449
73
        'code': fields.char('Code', size=10),
1450
74
    }
1451
75
project_task_type()
1452
76
1453
77
1454
78
class project_functional_block(osv.osv):
1455
79
    _inherit = 'project.functional_block'
1456
80
    _columns = {
1457
81
        'code': fields.char('Code', size=10),
1458
82
    }
1459
83
project_functional_block()
1460
84
1461
85
1462
86
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
1463
87
1464
88
1465
89
0
1466
=== removed file 'project_task_service/project_task_view.xml'
1467
--- project_task_service/project_task_view.xml	2012-11-22 13:29:38 +0000
1468
+++ project_task_service/project_task_view.xml	1970-01-01 00:00:00 +0000
1469
@@ -1,152 +0,0 @@
1470
1
<?xml version="1.0" encoding="utf-8"?>
1471
2
<openerp>
1472
3
    <data>
1473
4
    
1474
5
        <!-- Task type CODE -->
1475
6
        <record id="task_type_edit_dreis" model="ir.ui.view">
1476
7
            <field name="name">project.task.type.form.dreis</field>
1477
8
            <field name="model">project.task.type</field>
1478
9
            <field name="inherit_id" ref="project.task_type_edit"/>
1479
10
            <field name="arch" type="xml">
1480
11
                <field name="sequence" position="after">
1481
12
                    <field name="code"/>
1482
13
                </field>
1483
14
            </field>
1484
15
        </record>
1485
16
1486
17
        <!-- Task FORM -->
1487
18
        <record id="view_project_task_form_dreis" model="ir.ui.view">
1488
19
            <field name="name">project.task.form.dreis</field>
1489
20
            <field name="model">project.task</field>
1490
21
            <field name="inherit_id" ref="project.view_task_form2"/>
1491
22
            <field name="arch" type="xml">
1492
23
                <field name="progress" position="after">
1493
24
                    <field name="ref" string="Service Order Id"/>
1494
25
                </field>
1495
26
                <!-- State allowed transitions: 
1496
27
                      draft   -> open, cancel
1497
28
                      open    -> draft, pending, close 
1498
29
                      pending -> open
1499
30
                      close   -> draft ("reset"
1500
31
                -->
1501
32
                <button name="do_cancel" position="attributes">
1502
33
                    <attribute name="states">draft, open</attribute>
1503
34
                </button>
1504
35
                <button name="do_draft" position="attributes">
1505
36
                    <attribute name="states">close,cancel</attribute>
1506
37
                </button>
1507
38
                <button name="do_pending" position="attributes">
1508
39
                    <attribute name="states">open</attribute>
1509
40
                </button>
1510
41
                <button name="do_open" position="attributes">
1511
42
                    <attribute name="states">draft,pending</attribute>
1512
43
                </button>
1513
44
                <button name="action_close" position="attributes">
1514
45
                    <attribute name="states">open</attribute>
1515
46
                </button>
1516
47
1517
48
                <field name="type_id" position="replace"/>
1518
49
                <button name="prev_type" position="replace"/>
1519
50
                <button name="next_type" position="replace"/>
1520
51
1521
52
                <field name="work_ids" position="replace">
1522
53
                    <!-- Task Time spent -->
1523
54
                    <field colspan="4" name="work_ids" nolabel="1" 
1524
55
                           attrs="{'readonly':[('state','in',['done','draft'])]}">
1525
56
                        <tree string="Task Work" editable="top">
1526
57
                            <field name="date" string="Start Datetime"/>
1527
58
                            <field name="hours" widget="float_time" sum="Spent Hours" string="Spent Hours (hh:mm)"/>
1528
59
                            <field name="user_id"/>
1529
60
                            <field name="name" string="Comments"/>
1530
61
                        </tree>
1531
62
                    </field>
1532
63
                    <!-- Task Work Description -->
1533
64
                    <group col="4" colspan="4" attrs="{'invisible':[('state','in',['draft','cancel'])]}">
1534
65
                        <separator string="Work Description" colspan="4"/>
1535
66
                        <field name="report_desc" nolabel="1" colspan="4"/>
1536
67
                        <field name="reason_id" widget="selection"/>
1537
68
                        <group col="4" colspan="2">
1538
69
                            <field name="type_id" widget="selection" domain="[('code','!=',None)]"/>
1539
70
                            <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
1540
71
                            <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
1541
72
                        </group>
1542
73
                        <label string="Issues to be adressed" colspan="4"/>
1543
74
                        <field name="todo_desc" nolabel="1" colspan="4"/>
1544
75
                    </group>
1545
76
                </field>
1546
77
            </field>
1547
78
        </record>
1548
79
        
1549
80
        <!-- TASK TREE -->
1550
81
        <record id="view_project_task_tree_dreis" model="ir.ui.view">
1551
82
            <field name="name">project.task.tree.dreis</field>
1552
83
            <field name="model">project.task</field>
1553
84
            <field name="inherit_id" ref="project.view_task_tree2"/>
1554
85
            <field name="arch" type="xml">
1555
86
                <!-- States: OPEN:draft,pending; CLOSE:open,pending -->
1556
87
                <button name="do_open" position="attributes">
1557
88
                    <attribute name="states">draft,pending</attribute>
1558
89
                </button>
1559
90
                <button name="action_close" position="attributes">
1560
91
                    <attribute name="states">open</attribute>
1561
92
                </button>
1562
93
            </field>
1563
94
        </record>
1564
95
1565
96
        <!-- TASK SEARCH -->
1566
97
        <record id="view_project_task_search_dreis" model="ir.ui.view">
1567
98
            <field name="name">project.task.search.dreis</field>
1568
99
            <field name="model">project.task</field>
1569
100
            <field name="inherit_id" ref="project.view_task_search_form"/>
1570
101
            <field name="arch" type="xml">
1571
102
                <field name="project_id" position="replace">
1572
103
                        <field name="project_id"
1573
104
                               filter_domain="['|','|', ('project_id','ilike',self), ('partner_id','ilike',self), ('name','ilike',self)]"/>
1574
105
                </field>
1575
106
            </field>
1576
107
        </record>
1577
108
1578
109
        <!--Task Calendar: project_id before name, uses date_start, not date_deadline-->
1579
110
        <record id="view_task_calendar_reis1" model="ir.ui.view">
1580
111
            <field name="name">project.task.calendar.reis</field>
1581
112
            <field name="model">project.task</field>
1582
113
            <field name="type">calendar</field>
1583
114
            <field eval="1" name="priority"/>
1584
115
            <field name="arch" type="xml">
1585
116
                <calendar color="user_id" date_start="date_start" date_delay="planned_hours" string="Tasks">
1586
117
                    <field name="project_id"/>
1587
118
                    <field name="name"/>
1588
119
                </calendar>
1589
120
            </field>
1590
121
        </record>
1591
122
        
1592
123
        <!-- TASK MENU ACTION:
1593
124
            * No filter buttons activated by default
1594
125
            * User's "Department_id" selected by default
1595
126
            * Kanban view sequence moved to last   
1596
127
        -->
1597
128
        <record id="project.action_view_task" model="ir.actions.act_window">
1598
129
            <field name="name">Tasks</field>
1599
130
            <field name="res_model">project.task</field>
1600
131
            <field name="view_type">form</field>
1601
132
            <field name="view_mode">tree,form,calendar,gantt,graph,kanban</field>
1602
133
            <field eval="False" name="filter"/>
1603
134
            <field name="view_id" eval="False"/>
1604
135
            <field name="context">{"search_default_project_id": project_id, "search_default_department_id": department_id}</field>
1605
136
            <field name="search_view_id" ref="project.view_task_search_form"/>
1606
137
            <field name="help">A task represents a work that has to be done. Each user works in his own list of tasks where he can record his task work in hours. He can work and close the task itself or delegate it to another user. If you delegate a task to another user, you get a new task in pending state, which will be reopened when you have to review the work achieved. If you install the project_timesheet module, task work can be invoiced based on the project configuration. With the project_mrp module, sales orders can create tasks automatically when they are confirmed.</field>
1607
138
        </record>
1608
139
        <record id="project.open_view_task_list_kanban" model="ir.actions.act_window.view">
1609
140
            <field name="sequence" eval="10"/>
1610
141
        </record>
1611
142
1612
143
        <!--### REPORT 
1613
144
        <report auto="False" id="project_task_webkitreport" 
1614
145
        model="project.task" 
1615
146
        name="project_task_webkitreport"  
1616
147
        file="project_service/report/report_project_task.mako" 
1617
148
        string="Print Task Report" report_type="webkit" />
1618
149
        -->
1619
150
1620
151
        </data>
1621
152
</openerp>
1622
153
0
1623
=== removed directory 'project_task_service/static'
1624
=== removed directory 'project_task_service/static/src'
1625
=== removed directory 'project_task_service/static/src/img'
1626
=== removed file 'project_task_service/static/src/img/icon.png'
1627
154
Binary files project_task_service/static/src/img/icon.png	2012-11-22 13:29:38 +0000 and project_task_service/static/src/img/icon.png	1970-01-01 00:00:00 +0000 differ
1
Binary files project_task_service/static/src/img/icon.png	2012-11-22 13:29:38 +0000 and project_task_service/static/src/img/icon.png	1970-01-01 00:00:00 +0000 differ
Status:	Merged
Merged at revision:	38
Proposed branch:	lp:~dreis-pt/project-service/7.0-issue_task-dr
Merge into:	lp:~project-core-editors/project-service/trunk
Diff against target:	1627 lines (+467/-922) 21 files modified project_issue_service/board_project_view.xml (+0/-12) project_issue_service/project_issue_workflow.xml (+0/-108) project_issue_service/wizard/__init__.py (+0/-1) project_issue_service/wizard/project_task_reevaluate.py (+0/-38) project_issue_task/__init__.py (+3/-4) project_issue_task/__openerp__.py (+20/-27) project_issue_task/i18n/fr.po (+97/-0) project_issue_task/i18n/project_issue_task.pot (+97/-0) project_issue_task/i18n/pt.po (+97/-0) project_issue_task/project_issue.py (+40/-142) project_issue_task/project_issue_view.xml (+9/-163) project_issue_task/project_task.py (+34/-71) project_issue_task/project_task_cause.py (+6/-10) project_issue_task/project_task_cause_view.xml (+19/-10) project_issue_task/project_task_view.xml (+14/-39) project_issue_task/security/ir.model.access.csv (+1/-1) project_issue_task/security/project_security.xml (+30/-0) project_task_service/__init__.py (+0/-4) project_task_service/__openerp__.py (+0/-52) project_task_service/project_task.py (+0/-88) project_task_service/project_task_view.xml (+0/-152)
To merge this branch:	bzr merge lp:~dreis-pt/project-service/7.0-issue_task-dr
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Guewen Baconnier @ Camptocamp	code review		Approve on 2014-04-25
Joël Grand-Guillaume @ camptocamp	code review, no tests	2013-11-20	Approve on 2014-04-25
Yannick Vaucher @ Camptocamp	code review, no tests		Approve on 2014-02-26
Review via email: mp+195985@code.launchpad.net