Merge lp:~openerp-dev/openobject-addons/trunk-legend-widget-mba-1 into lp:openobject-addons
- trunk-legend-widget-mba-1
- Merge into trunk
Proposed by
Mahendra Barad(OpenERP)
Status: | Merged |
---|---|
Merged at revision: | 9429 |
Proposed branch: | lp:~openerp-dev/openobject-addons/trunk-legend-widget-mba-1 |
Merge into: | lp:openobject-addons |
Diff against target: |
1100 lines (+125/-234) 29 files modified
crm/crm.py (+5/-5) crm/crm_lead.py (+0/-15) crm/crm_lead_demo.xml (+15/-15) crm/crm_lead_view.xml (+6/-5) crm/crm_phonecall.py (+2/-2) crm/crm_phonecall_demo.xml (+5/-5) crm/crm_phonecall_view.xml (+1/-1) crm/report/crm_phonecall_report.py (+1/-1) crm_claim/crm_claim.py (+2/-2) crm_claim/crm_claim_demo.xml (+6/-6) crm_claim/crm_claim_view.xml (+1/-1) crm_claim/report/crm_claim_report.py (+3/-5) crm_helpdesk/crm_helpdesk.py (+2/-2) crm_helpdesk/crm_helpdesk_demo.xml (+3/-3) crm_helpdesk/crm_helpdesk_view.xml (+1/-1) hr_recruitment/hr_recruitment.py (+4/-20) hr_recruitment/hr_recruitment_demo.xml (+1/-1) hr_recruitment/hr_recruitment_view.xml (+6/-17) portal_project_issue/portal_project_issue_view.xml (+1/-15) project/project.py (+6/-25) project/project_data.xml (+6/-0) project/project_demo.xml (+4/-4) project/project_view.xml (+11/-15) project/report/project_report.py (+1/-1) project_issue/project_issue.py (+4/-25) project_issue/project_issue_data.xml (+6/-0) project_issue/project_issue_demo.xml (+10/-10) project_issue/project_issue_view.xml (+11/-31) project_issue/report/project_issue_report.py (+1/-1) |
To merge this branch: | bzr merge lp:~openerp-dev/openobject-addons/trunk-legend-widget-mba-1 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenERP Core Team | Pending | ||
Review via email: mp+206482@code.launchpad.net |
Commit message
Description of the change
[IMP] crm, hr_recruitment, project, project_issue: use the newly-introduced widgets for the kanban state and the priority management.
This branch comes with a web branch holding those new widgets for form and kanban views.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'crm/crm.py' | |||
2 | --- crm/crm.py 2014-02-11 11:09:36 +0000 | |||
3 | +++ crm/crm.py 2014-05-08 15:35:32 +0000 | |||
4 | @@ -28,11 +28,11 @@ | |||
5 | 28 | from openerp.osv import osv | 28 | from openerp.osv import osv |
6 | 29 | 29 | ||
7 | 30 | AVAILABLE_PRIORITIES = [ | 30 | AVAILABLE_PRIORITIES = [ |
13 | 31 | ('1', 'Highest'), | 31 | ('0', 'Very Low'), |
14 | 32 | ('2', 'High'), | 32 | ('1', 'Low'), |
15 | 33 | ('3', 'Normal'), | 33 | ('2', 'Normal'), |
16 | 34 | ('4', 'Low'), | 34 | ('3', 'High'), |
17 | 35 | ('5', 'Lowest'), | 35 | ('4', 'Very High'), |
18 | 36 | ] | 36 | ] |
19 | 37 | 37 | ||
20 | 38 | class crm_case_channel(osv.osv): | 38 | class crm_case_channel(osv.osv): |
21 | 39 | 39 | ||
22 | === modified file 'crm/crm_lead.py' | |||
23 | --- crm/crm_lead.py 2014-05-07 10:09:54 +0000 | |||
24 | +++ crm/crm_lead.py 2014-05-08 15:35:32 +0000 | |||
25 | @@ -455,21 +455,6 @@ | |||
26 | 455 | self.write(cr, uid, [case.id], data, context=context) | 455 | self.write(cr, uid, [case.id], data, context=context) |
27 | 456 | return True | 456 | return True |
28 | 457 | 457 | ||
29 | 458 | def set_priority(self, cr, uid, ids, priority, context=None): | ||
30 | 459 | """ Set lead priority | ||
31 | 460 | """ | ||
32 | 461 | return self.write(cr, uid, ids, {'priority': priority}, context=context) | ||
33 | 462 | |||
34 | 463 | def set_high_priority(self, cr, uid, ids, context=None): | ||
35 | 464 | """ Set lead priority to high | ||
36 | 465 | """ | ||
37 | 466 | return self.set_priority(cr, uid, ids, '1', context=context) | ||
38 | 467 | |||
39 | 468 | def set_normal_priority(self, cr, uid, ids, context=None): | ||
40 | 469 | """ Set lead priority to normal | ||
41 | 470 | """ | ||
42 | 471 | return self.set_priority(cr, uid, ids, '3', context=context) | ||
43 | 472 | |||
44 | 473 | def _merge_get_result_type(self, cr, uid, opps, context=None): | 458 | def _merge_get_result_type(self, cr, uid, opps, context=None): |
45 | 474 | """ | 459 | """ |
46 | 475 | Define the type of the result of the merge. If at least one of the | 460 | Define the type of the result of the merge. If at least one of the |
47 | 476 | 461 | ||
48 | === modified file 'crm/crm_lead_demo.xml' | |||
49 | --- crm/crm_lead_demo.xml 2013-10-27 12:31:04 +0000 | |||
50 | +++ crm/crm_lead_demo.xml 2014-05-08 15:35:32 +0000 | |||
51 | @@ -54,7 +54,7 @@ | |||
52 | 54 | <field name="type_id" ref="type_lead7"/> | 54 | <field name="type_id" ref="type_lead7"/> |
53 | 55 | <field name="categ_ids" eval="[(6, 0, [categ_oppor2])]"/> | 55 | <field name="categ_ids" eval="[(6, 0, [categ_oppor2])]"/> |
54 | 56 | <field name="channel_id" ref="crm_case_channel_website"/> | 56 | <field name="channel_id" ref="crm_case_channel_website"/> |
56 | 57 | <field name="priority">4</field> | 57 | <field name="priority">1</field> |
57 | 58 | <field name="section_id" ref="section_sales_department"/> | 58 | <field name="section_id" ref="section_sales_department"/> |
58 | 59 | <field name="user_id" ref="base.user_root"/> | 59 | <field name="user_id" ref="base.user_root"/> |
59 | 60 | <field name="stage_id" ref="stage_lead1"/> | 60 | <field name="stage_id" ref="stage_lead1"/> |
60 | @@ -104,7 +104,7 @@ | |||
61 | 104 | <field name="type_id" ref="type_lead8"/> | 104 | <field name="type_id" ref="type_lead8"/> |
62 | 105 | <field name="categ_ids" eval="[(6, 0, [categ_oppor5])]"/> | 105 | <field name="categ_ids" eval="[(6, 0, [categ_oppor5])]"/> |
63 | 106 | <field name="channel_id" ref=""/> | 106 | <field name="channel_id" ref=""/> |
65 | 107 | <field name="priority">3</field> | 107 | <field name="priority">2</field> |
66 | 108 | <field name="section_id" ref="crm_case_section_2"/> | 108 | <field name="section_id" ref="crm_case_section_2"/> |
67 | 109 | <field name="user_id" ref="base.user_demo"/> | 109 | <field name="user_id" ref="base.user_demo"/> |
68 | 110 | <field name="stage_id" ref="stage_lead6"/> | 110 | <field name="stage_id" ref="stage_lead6"/> |
69 | @@ -129,7 +129,7 @@ | |||
70 | 129 | <field name="type_id" ref="type_lead3"/> | 129 | <field name="type_id" ref="type_lead3"/> |
71 | 130 | <field name="categ_ids" eval="[(6, 0, [categ_oppor1])]"/> | 130 | <field name="categ_ids" eval="[(6, 0, [categ_oppor1])]"/> |
72 | 131 | <field name="channel_id" ref="crm_case_channel_website"/> | 131 | <field name="channel_id" ref="crm_case_channel_website"/> |
74 | 132 | <field name="priority">3</field> | 132 | <field name="priority">2</field> |
75 | 133 | <field name="section_id" ref="crm_case_section_1"/> | 133 | <field name="section_id" ref="crm_case_section_1"/> |
76 | 134 | <field name="user_id" ref=""/> | 134 | <field name="user_id" ref=""/> |
77 | 135 | <field name="stage_id" ref="stage_lead1"/> | 135 | <field name="stage_id" ref="stage_lead1"/> |
78 | @@ -156,7 +156,7 @@ | |||
79 | 156 | <field name="type_id" ref="type_lead3"/> | 156 | <field name="type_id" ref="type_lead3"/> |
80 | 157 | <field name="categ_ids" eval="[(6, 0, [categ_oppor3,categ_oppor4])]"/> | 157 | <field name="categ_ids" eval="[(6, 0, [categ_oppor3,categ_oppor4])]"/> |
81 | 158 | <field name="channel_id" ref=""/> | 158 | <field name="channel_id" ref=""/> |
83 | 159 | <field name="priority">3</field> | 159 | <field name="priority">2</field> |
84 | 160 | <field name="section_id" ref="crm_case_section_2"/> | 160 | <field name="section_id" ref="crm_case_section_2"/> |
85 | 161 | <field name="user_id" ref=""/> | 161 | <field name="user_id" ref=""/> |
86 | 162 | <field name="stage_id" ref="stage_lead1"/> | 162 | <field name="stage_id" ref="stage_lead1"/> |
87 | @@ -174,7 +174,7 @@ | |||
88 | 174 | <field name="type_id" ref="type_lead8"/> | 174 | <field name="type_id" ref="type_lead8"/> |
89 | 175 | <field name="categ_ids" eval="[(6, 0, [categ_oppor4])]"/> | 175 | <field name="categ_ids" eval="[(6, 0, [categ_oppor4])]"/> |
90 | 176 | <field name="channel_id" ref=""/> | 176 | <field name="channel_id" ref=""/> |
92 | 177 | <field name="priority">5</field> | 177 | <field name="priority">0</field> |
93 | 178 | <field name="section_id" ref="crm_case_section_2"/> | 178 | <field name="section_id" ref="crm_case_section_2"/> |
94 | 179 | <field name="user_id" ref="base.user_root"/> | 179 | <field name="user_id" ref="base.user_root"/> |
95 | 180 | <field name="stage_id" ref="stage_lead1"/> | 180 | <field name="stage_id" ref="stage_lead1"/> |
96 | @@ -193,7 +193,7 @@ | |||
97 | 193 | <field name="type_id" ref="type_lead5"/> | 193 | <field name="type_id" ref="type_lead5"/> |
98 | 194 | <field name="categ_ids" eval="[(6, 0, [categ_oppor6,categ_oppor8])]"/> | 194 | <field name="categ_ids" eval="[(6, 0, [categ_oppor6,categ_oppor8])]"/> |
99 | 195 | <field name="channel_id" ref=""/> | 195 | <field name="channel_id" ref=""/> |
101 | 196 | <field name="priority">4</field> | 196 | <field name="priority">1</field> |
102 | 197 | <field name="section_id" ref="section_sales_department"/> | 197 | <field name="section_id" ref="section_sales_department"/> |
103 | 198 | <field name="user_id" ref="base.user_root"/> | 198 | <field name="user_id" ref="base.user_root"/> |
104 | 199 | <field name="stage_id" ref="stage_lead1"/> | 199 | <field name="stage_id" ref="stage_lead1"/> |
105 | @@ -253,7 +253,7 @@ | |||
106 | 253 | <field name="type_id" ref="type_lead3"/> | 253 | <field name="type_id" ref="type_lead3"/> |
107 | 254 | <field name="categ_ids" eval="[(6, 0, [categ_oppor7])]"/> | 254 | <field name="categ_ids" eval="[(6, 0, [categ_oppor7])]"/> |
108 | 255 | <field name="channel_id" ref="crm_case_channel_direct"/> | 255 | <field name="channel_id" ref="crm_case_channel_direct"/> |
110 | 256 | <field name="priority">3</field> | 256 | <field name="priority">2</field> |
111 | 257 | <field name="section_id" ref="crm_case_section_1"/> | 257 | <field name="section_id" ref="crm_case_section_1"/> |
112 | 258 | <field name="user_id" ref=""/> | 258 | <field name="user_id" ref=""/> |
113 | 259 | <field name="stage_id" ref="stage_lead1"/> | 259 | <field name="stage_id" ref="stage_lead1"/> |
114 | @@ -331,7 +331,7 @@ | |||
115 | 331 | <field name="type_id" ref="type_lead3"/> | 331 | <field name="type_id" ref="type_lead3"/> |
116 | 332 | <field name="categ_ids" eval="[(6, 0, [categ_oppor2])]"/> | 332 | <field name="categ_ids" eval="[(6, 0, [categ_oppor2])]"/> |
117 | 333 | <field name="channel_id" ref="crm_case_channel_website"/> | 333 | <field name="channel_id" ref="crm_case_channel_website"/> |
119 | 334 | <field name="priority">3</field> | 334 | <field name="priority">2</field> |
120 | 335 | <field eval="time.strftime('%Y-%m-23')" name="date_deadline"/> | 335 | <field eval="time.strftime('%Y-%m-23')" name="date_deadline"/> |
121 | 336 | <field eval="time.strftime('%Y-%m-10')" name="date_action"/> | 336 | <field eval="time.strftime('%Y-%m-10')" name="date_action"/> |
122 | 337 | <field name="title_action">Send Catalogue by Email</field> | 337 | <field name="title_action">Send Catalogue by Email</field> |
123 | @@ -404,7 +404,7 @@ | |||
124 | 404 | <field name="type_id" ref="type_lead3"/> | 404 | <field name="type_id" ref="type_lead3"/> |
125 | 405 | <field name="categ_ids" eval="[(6, 0, [categ_oppor3,categ_oppor4])]"/> | 405 | <field name="categ_ids" eval="[(6, 0, [categ_oppor3,categ_oppor4])]"/> |
126 | 406 | <field name="channel_id" ref="crm_case_channel_website"/> | 406 | <field name="channel_id" ref="crm_case_channel_website"/> |
128 | 407 | <field name="priority">4</field> | 407 | <field name="priority">1</field> |
129 | 408 | <field eval="time.strftime('%Y-%m-8')" name="date_deadline"/> | 408 | <field eval="time.strftime('%Y-%m-8')" name="date_deadline"/> |
130 | 409 | <field eval="time.strftime('%Y-%m-3')" name="date_action"/> | 409 | <field eval="time.strftime('%Y-%m-3')" name="date_action"/> |
131 | 410 | <field name="title_action">Send price list regarding our interventions</field> | 410 | <field name="title_action">Send price list regarding our interventions</field> |
132 | @@ -431,7 +431,7 @@ | |||
133 | 431 | <field name="partner_id" ref="base.res_partner_4"/> | 431 | <field name="partner_id" ref="base.res_partner_4"/> |
134 | 432 | <field name="type_id" ref="type_lead8"/> | 432 | <field name="type_id" ref="type_lead8"/> |
135 | 433 | <field name="categ_ids" eval="[(6, 0, [categ_oppor4,categ_oppor6])]"/> | 433 | <field name="categ_ids" eval="[(6, 0, [categ_oppor4,categ_oppor6])]"/> |
137 | 434 | <field name="priority">4</field> | 434 | <field name="priority">1</field> |
138 | 435 | <field eval="time.strftime('%Y-%m-13')" name="date_deadline"/> | 435 | <field eval="time.strftime('%Y-%m-13')" name="date_deadline"/> |
139 | 436 | <field eval="time.strftime('%Y-%m-4')" name="date_action"/> | 436 | <field eval="time.strftime('%Y-%m-4')" name="date_action"/> |
140 | 437 | <field name="title_action">Call to define real needs about training</field> | 437 | <field name="title_action">Call to define real needs about training</field> |
141 | @@ -492,7 +492,7 @@ | |||
142 | 492 | <field name="type_id" ref="type_lead2"/> | 492 | <field name="type_id" ref="type_lead2"/> |
143 | 493 | <field name="categ_ids" eval="[(6, 0, [categ_oppor7])]"/> | 493 | <field name="categ_ids" eval="[(6, 0, [categ_oppor7])]"/> |
144 | 494 | <field name="channel_id" ref="crm_case_channel_phone"/> | 494 | <field name="channel_id" ref="crm_case_channel_phone"/> |
146 | 495 | <field name="priority">3</field> | 495 | <field name="priority">2</field> |
147 | 496 | <field name="section_id" ref="crm_case_section_2"/> | 496 | <field name="section_id" ref="crm_case_section_2"/> |
148 | 497 | <field name="user_id" ref="base.user_root"/> | 497 | <field name="user_id" ref="base.user_root"/> |
149 | 498 | <field name="stage_id" ref="crm.stage_lead4"/> | 498 | <field name="stage_id" ref="crm.stage_lead4"/> |
150 | @@ -510,7 +510,7 @@ | |||
151 | 510 | <field name="type_id" ref="type_lead7"/> | 510 | <field name="type_id" ref="type_lead7"/> |
152 | 511 | <field name="categ_ids" eval="[(6, 0, [categ_oppor3])]"/> | 511 | <field name="categ_ids" eval="[(6, 0, [categ_oppor3])]"/> |
153 | 512 | <field name="channel_id" ref="crm_case_channel_email"/> | 512 | <field name="channel_id" ref="crm_case_channel_email"/> |
155 | 513 | <field name="priority">3</field> | 513 | <field name="priority">1</field> |
156 | 514 | <field name="section_id" ref="crm_case_section_2"/> | 514 | <field name="section_id" ref="crm_case_section_2"/> |
157 | 515 | <field name="user_id" ref="base.user_root"/> | 515 | <field name="user_id" ref="base.user_root"/> |
158 | 516 | <field name="stage_id" ref="crm.stage_lead5"/> | 516 | <field name="stage_id" ref="crm.stage_lead5"/> |
159 | @@ -525,7 +525,7 @@ | |||
160 | 525 | <field name="type_id" ref="type_lead5"/> | 525 | <field name="type_id" ref="type_lead5"/> |
161 | 526 | <field name="categ_ids" eval="[(6, 0, [categ_oppor3])]"/> | 526 | <field name="categ_ids" eval="[(6, 0, [categ_oppor3])]"/> |
162 | 527 | <field name="channel_id" ref="crm_case_channel_direct"/> | 527 | <field name="channel_id" ref="crm_case_channel_direct"/> |
164 | 528 | <field name="priority">5</field> | 528 | <field name="priority">0</field> |
165 | 529 | <field name="section_id" ref="section_sales_department"/> | 529 | <field name="section_id" ref="section_sales_department"/> |
166 | 530 | <field name="user_id" ref="base.user_demo"/> | 530 | <field name="user_id" ref="base.user_demo"/> |
167 | 531 | <field name="stage_id" ref="crm.stage_lead5"/> | 531 | <field name="stage_id" ref="crm.stage_lead5"/> |
168 | @@ -543,7 +543,7 @@ | |||
169 | 543 | <field name="type_id" ref="type_lead8"/> | 543 | <field name="type_id" ref="type_lead8"/> |
170 | 544 | <field name="categ_ids" eval="[(6, 0, [categ_oppor7])]"/> | 544 | <field name="categ_ids" eval="[(6, 0, [categ_oppor7])]"/> |
171 | 545 | <field name="channel_id" ref="crm_case_channel_website"/> | 545 | <field name="channel_id" ref="crm_case_channel_website"/> |
173 | 546 | <field name="priority">5</field> | 546 | <field name="priority">0</field> |
174 | 547 | <field eval="time.strftime('%Y-%m-6')" name="date_deadline"/> | 547 | <field eval="time.strftime('%Y-%m-6')" name="date_deadline"/> |
175 | 548 | <field name="section_id" ref="section_sales_department"/> | 548 | <field name="section_id" ref="section_sales_department"/> |
176 | 549 | <field name="user_id" ref="base.user_root"/> | 549 | <field name="user_id" ref="base.user_root"/> |
177 | @@ -588,7 +588,7 @@ | |||
178 | 588 | <field name="type_id" ref="type_lead3"/> | 588 | <field name="type_id" ref="type_lead3"/> |
179 | 589 | <field name="categ_ids" eval="[(6, 0, [categ_oppor2])]"/> | 589 | <field name="categ_ids" eval="[(6, 0, [categ_oppor2])]"/> |
180 | 590 | <field name="channel_id" ref="crm_case_channel_website"/> | 590 | <field name="channel_id" ref="crm_case_channel_website"/> |
182 | 591 | <field name="priority">3</field> | 591 | <field name="priority">2</field> |
183 | 592 | <field eval="time.strftime('%Y-%m-23')" name="date_deadline"/> | 592 | <field eval="time.strftime('%Y-%m-23')" name="date_deadline"/> |
184 | 593 | <field eval="time.strftime('%Y-%m-10')" name="date_action"/> | 593 | <field eval="time.strftime('%Y-%m-10')" name="date_action"/> |
185 | 594 | <field name="title_action">Send Catalogue by Email</field> | 594 | <field name="title_action">Send Catalogue by Email</field> |
186 | 595 | 595 | ||
187 | === modified file 'crm/crm_lead_view.xml' | |||
188 | --- crm/crm_lead_view.xml 2014-05-02 13:22:58 +0000 | |||
189 | +++ crm/crm_lead_view.xml 2014-05-08 15:35:32 +0000 | |||
190 | @@ -158,7 +158,7 @@ | |||
191 | 158 | <field name="type" invisible="1"/> | 158 | <field name="type" invisible="1"/> |
192 | 159 | </group> | 159 | </group> |
193 | 160 | <group> | 160 | <group> |
195 | 161 | <field name="priority"/> | 161 | <field name="priority" widget="priority"/> |
196 | 162 | <field name="categ_ids" | 162 | <field name="categ_ids" |
197 | 163 | widget="many2many_tags" | 163 | widget="many2many_tags" |
198 | 164 | domain="[('object_id.model','=','crm.lead')]" | 164 | domain="[('object_id.model','=','crm.lead')]" |
199 | @@ -303,9 +303,10 @@ | |||
200 | 303 | <field name="title_action"/> | 303 | <field name="title_action"/> |
201 | 304 | </div> | 304 | </div> |
202 | 305 | <div class="oe_kanban_bottom_right"> | 305 | <div class="oe_kanban_bottom_right"> |
206 | 306 | <a t-if="record.priority.raw_value == 1" type="object" name="set_normal_priority" class="oe_e oe_star_on">7</a> | 306 | <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar pull-right"/> |
207 | 307 | <a t-if="record.priority.raw_value != 1" type="object" name="set_high_priority" class="oe_e oe_star_off">7</a> | 307 | <div class="pull-left" groups="base.group_user"> |
208 | 308 | <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar" t-if="record.user_id.value"/> | 308 | <field name="priority" widget="priority"/> |
209 | 309 | </div> | ||
210 | 309 | </div> | 310 | </div> |
211 | 310 | <div class="oe_kanban_footer_left"> | 311 | <div class="oe_kanban_footer_left"> |
212 | 311 | <t t-raw="record.message_summary.raw_value"/> | 312 | <t t-raw="record.message_summary.raw_value"/> |
213 | @@ -430,7 +431,7 @@ | |||
214 | 430 | <field name="title_action" class="oe_inline" nolabel="1" placeholder="e.g. Call for proposal"/> | 431 | <field name="title_action" class="oe_inline" nolabel="1" placeholder="e.g. Call for proposal"/> |
215 | 431 | </div> | 432 | </div> |
216 | 432 | <field name="date_deadline"/> | 433 | <field name="date_deadline"/> |
218 | 433 | <field name="priority"/> | 434 | <field name="priority" widget="priority"/> |
219 | 434 | </group> | 435 | </group> |
220 | 435 | 436 | ||
221 | 436 | <group> | 437 | <group> |
222 | 437 | 438 | ||
223 | === modified file 'crm/crm_phonecall.py' | |||
224 | --- crm/crm_phonecall.py 2014-05-07 09:45:53 +0000 | |||
225 | +++ crm/crm_phonecall.py 2014-05-08 15:35:32 +0000 | |||
226 | @@ -62,7 +62,7 @@ | |||
227 | 62 | ('object_id.model', '=', 'crm.phonecall')]"), | 62 | ('object_id.model', '=', 'crm.phonecall')]"), |
228 | 63 | 'partner_phone': fields.char('Phone', size=32), | 63 | 'partner_phone': fields.char('Phone', size=32), |
229 | 64 | 'partner_mobile': fields.char('Mobile', size=32), | 64 | 'partner_mobile': fields.char('Mobile', size=32), |
231 | 65 | 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), | 65 | 'priority': fields.selection([('0','Low'), ('1','Normal'), ('2','High')], 'Priority'), |
232 | 66 | 'date_closed': fields.datetime('Closed', readonly=True), | 66 | 'date_closed': fields.datetime('Closed', readonly=True), |
233 | 67 | 'date': fields.datetime('Date'), | 67 | 'date': fields.datetime('Date'), |
234 | 68 | 'opportunity_id': fields.many2one ('crm.lead', 'Lead/Opportunity'), | 68 | 'opportunity_id': fields.many2one ('crm.lead', 'Lead/Opportunity'), |
235 | @@ -75,7 +75,7 @@ | |||
236 | 75 | 75 | ||
237 | 76 | _defaults = { | 76 | _defaults = { |
238 | 77 | 'date': fields.datetime.now, | 77 | 'date': fields.datetime.now, |
240 | 78 | 'priority': crm.AVAILABLE_PRIORITIES[2][0], | 78 | 'priority': '1', |
241 | 79 | 'state': _get_default_state, | 79 | 'state': _get_default_state, |
242 | 80 | 'user_id': lambda self, cr, uid, ctx: uid, | 80 | 'user_id': lambda self, cr, uid, ctx: uid, |
243 | 81 | 'active': 1 | 81 | 'active': 1 |
244 | 82 | 82 | ||
245 | === modified file 'crm/crm_phonecall_demo.xml' | |||
246 | --- crm/crm_phonecall_demo.xml 2013-10-27 12:31:04 +0000 | |||
247 | +++ crm/crm_phonecall_demo.xml 2014-05-08 15:35:32 +0000 | |||
248 | @@ -6,7 +6,7 @@ | |||
249 | 6 | <record id="crm_phonecall_1" model="crm.phonecall"> | 6 | <record id="crm_phonecall_1" model="crm.phonecall"> |
250 | 7 | <field eval="time.strftime('%Y-%m-04 10:45:36')" name="date"/> | 7 | <field eval="time.strftime('%Y-%m-04 10:45:36')" name="date"/> |
251 | 8 | <field name="partner_id" ref="base.res_partner_11"/> | 8 | <field name="partner_id" ref="base.res_partner_11"/> |
253 | 9 | <field eval="'3'" name="priority"/> | 9 | <field eval="'1'" name="priority"/> |
254 | 10 | <field name="user_id" ref="base.user_root"/> | 10 | <field name="user_id" ref="base.user_root"/> |
255 | 11 | <field name="name">Left the message</field> | 11 | <field name="name">Left the message</field> |
256 | 12 | <field name="state">done</field> | 12 | <field name="state">done</field> |
257 | @@ -19,7 +19,7 @@ | |||
258 | 19 | <record id="crm_phonecall_2" model="crm.phonecall"> | 19 | <record id="crm_phonecall_2" model="crm.phonecall"> |
259 | 20 | <field eval="time.strftime('%Y-%m-11 11:19:25')" name="date"/> | 20 | <field eval="time.strftime('%Y-%m-11 11:19:25')" name="date"/> |
260 | 21 | <field name="partner_id" ref="base.res_partner_7"/> | 21 | <field name="partner_id" ref="base.res_partner_7"/> |
262 | 22 | <field eval="'4'" name="priority"/> | 22 | <field eval="'0'" name="priority"/> |
263 | 23 | <field name="user_id" ref="base.user_root"/> | 23 | <field name="user_id" ref="base.user_root"/> |
264 | 24 | <field name="name">Need more information on the proposed deal</field> | 24 | <field name="name">Need more information on the proposed deal</field> |
265 | 25 | <field name="state">done</field> | 25 | <field name="state">done</field> |
266 | @@ -44,7 +44,7 @@ | |||
267 | 44 | </record> | 44 | </record> |
268 | 45 | <record id="crm_phonecall_4" model="crm.phonecall"> | 45 | <record id="crm_phonecall_4" model="crm.phonecall"> |
269 | 46 | <field eval="time.strftime('%Y-%m-21 14:10:23')" name="date"/> | 46 | <field eval="time.strftime('%Y-%m-21 14:10:23')" name="date"/> |
271 | 47 | <field eval="'3'" name="priority"/> | 47 | <field eval="'1'" name="priority"/> |
272 | 48 | <field name="user_id" ref="base.user_root"/> | 48 | <field name="user_id" ref="base.user_root"/> |
273 | 49 | <field name="name">Wanted information about pricing of laptops</field> | 49 | <field name="name">Wanted information about pricing of laptops</field> |
274 | 50 | <field name="state">done</field> | 50 | <field name="state">done</field> |
275 | @@ -58,7 +58,7 @@ | |||
276 | 58 | <record id="crm_phonecall_5" model="crm.phonecall"> | 58 | <record id="crm_phonecall_5" model="crm.phonecall"> |
277 | 59 | <field eval="time.strftime('%Y-%m-28 16:20:43')" name="date"/> | 59 | <field eval="time.strftime('%Y-%m-28 16:20:43')" name="date"/> |
278 | 60 | <field name="partner_id" ref="base.res_partner_5"/> | 60 | <field name="partner_id" ref="base.res_partner_5"/> |
280 | 61 | <field eval="'3'" name="priority"/> | 61 | <field eval="'1'" name="priority"/> |
281 | 62 | <field name="user_id" ref="base.user_root"/> | 62 | <field name="user_id" ref="base.user_root"/> |
282 | 63 | <field name="name">More information on the proposed deal</field> | 63 | <field name="name">More information on the proposed deal</field> |
283 | 64 | <field name="state">pending</field> | 64 | <field name="state">pending</field> |
284 | @@ -69,7 +69,7 @@ | |||
285 | 69 | <field eval="2.08" name="duration"/> | 69 | <field eval="2.08" name="duration"/> |
286 | 70 | </record> | 70 | </record> |
287 | 71 | <record id="crm_phonecall_6" model="crm.phonecall"> | 71 | <record id="crm_phonecall_6" model="crm.phonecall"> |
289 | 72 | <field eval="'3'" name="priority"/> | 72 | <field eval="'1'" name="priority"/> |
290 | 73 | <field name="user_id" ref="base.user_root"/> | 73 | <field name="user_id" ref="base.user_root"/> |
291 | 74 | <field name="name">Proposal for discount offer</field> | 74 | <field name="name">Proposal for discount offer</field> |
292 | 75 | <field name="state">open</field> | 75 | <field name="state">open</field> |
293 | 76 | 76 | ||
294 | === modified file 'crm/crm_phonecall_view.xml' | |||
295 | --- crm/crm_phonecall_view.xml 2014-05-02 13:07:53 +0000 | |||
296 | +++ crm/crm_phonecall_view.xml 2014-05-08 15:35:32 +0000 | |||
297 | @@ -103,7 +103,7 @@ | |||
298 | 103 | <field name="categ_id" widget="selection" | 103 | <field name="categ_id" widget="selection" |
299 | 104 | domain="[('object_id.model', '=', 'crm.phonecall')]"/> | 104 | domain="[('object_id.model', '=', 'crm.phonecall')]"/> |
300 | 105 | <field name="partner_mobile"/> | 105 | <field name="partner_mobile"/> |
302 | 106 | <field name="priority"/> | 106 | <field name="priority" widget="priority"/> |
303 | 107 | <field name="opportunity_id" on_change="on_change_opportunity(opportunity_id)"/> | 107 | <field name="opportunity_id" on_change="on_change_opportunity(opportunity_id)"/> |
304 | 108 | </group> | 108 | </group> |
305 | 109 | <field name="description" placeholder="Description..."/> | 109 | <field name="description" placeholder="Description..."/> |
306 | 110 | 110 | ||
307 | === modified file 'crm/report/crm_phonecall_report.py' | |||
308 | --- crm/report/crm_phonecall_report.py 2014-01-29 09:56:55 +0000 | |||
309 | +++ crm/report/crm_phonecall_report.py 2014-05-08 15:35:32 +0000 | |||
310 | @@ -42,7 +42,7 @@ | |||
311 | 42 | _columns = { | 42 | _columns = { |
312 | 43 | 'user_id':fields.many2one('res.users', 'User', readonly=True), | 43 | 'user_id':fields.many2one('res.users', 'User', readonly=True), |
313 | 44 | 'section_id':fields.many2one('crm.case.section', 'Section', readonly=True), | 44 | 'section_id':fields.many2one('crm.case.section', 'Section', readonly=True), |
315 | 45 | 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), | 45 | 'priority': fields.selection([('0','Low'), ('1','Normal'), ('2','High')], 'Priority'), |
316 | 46 | 'nbr': fields.integer('# of Cases', readonly=True), | 46 | 'nbr': fields.integer('# of Cases', readonly=True), |
317 | 47 | 'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True), | 47 | 'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True), |
318 | 48 | 'create_date': fields.datetime('Create Date', readonly=True, select=True), | 48 | 'create_date': fields.datetime('Create Date', readonly=True, select=True), |
319 | 49 | 49 | ||
320 | === modified file 'crm_claim/crm_claim.py' | |||
321 | --- crm_claim/crm_claim.py 2014-05-07 08:17:23 +0000 | |||
322 | +++ crm_claim/crm_claim.py 2014-05-08 15:35:32 +0000 | |||
323 | @@ -88,7 +88,7 @@ | |||
324 | 88 | 'categ_id': fields.many2one('crm.case.categ', 'Category', \ | 88 | 'categ_id': fields.many2one('crm.case.categ', 'Category', \ |
325 | 89 | domain="[('section_id','=',section_id),\ | 89 | domain="[('section_id','=',section_id),\ |
326 | 90 | ('object_id.model', '=', 'crm.claim')]"), | 90 | ('object_id.model', '=', 'crm.claim')]"), |
328 | 91 | 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), | 91 | 'priority': fields.selection([('0','Low'), ('1','Normal'), ('2','High')], 'Priority'), |
329 | 92 | 'type_action': fields.selection([('correction','Corrective Action'),('prevention','Preventive Action')], 'Action Type'), | 92 | 'type_action': fields.selection([('correction','Corrective Action'),('prevention','Preventive Action')], 'Action Type'), |
330 | 93 | 'user_id': fields.many2one('res.users', 'Responsible'), | 93 | 'user_id': fields.many2one('res.users', 'Responsible'), |
331 | 94 | 'user_fault': fields.char('Trouble Responsible', size=64), | 94 | 'user_fault': fields.char('Trouble Responsible', size=64), |
332 | @@ -111,7 +111,7 @@ | |||
333 | 111 | 'section_id': lambda s, cr, uid, c: s._get_default_section_id(cr, uid, c), | 111 | 'section_id': lambda s, cr, uid, c: s._get_default_section_id(cr, uid, c), |
334 | 112 | 'date': fields.datetime.now, | 112 | 'date': fields.datetime.now, |
335 | 113 | 'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c), | 113 | 'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c), |
337 | 114 | 'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0], | 114 | 'priority': '1', |
338 | 115 | 'active': lambda *a: 1, | 115 | 'active': lambda *a: 1, |
339 | 116 | 'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c) | 116 | 'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c) |
340 | 117 | } | 117 | } |
341 | 118 | 118 | ||
342 | === modified file 'crm_claim/crm_claim_demo.xml' | |||
343 | --- crm_claim/crm_claim_demo.xml 2012-11-29 22:26:45 +0000 | |||
344 | +++ crm_claim/crm_claim_demo.xml 2014-05-08 15:35:32 +0000 | |||
345 | @@ -9,7 +9,7 @@ | |||
346 | 9 | <record id="crm_claim_1" model="crm.claim"> | 9 | <record id="crm_claim_1" model="crm.claim"> |
347 | 10 | <field eval="time.strftime('%Y-%m-04 10:45:36')" name="date"/> | 10 | <field eval="time.strftime('%Y-%m-04 10:45:36')" name="date"/> |
348 | 11 | <field name="partner_id" ref="base.res_partner_11"/> | 11 | <field name="partner_id" ref="base.res_partner_11"/> |
350 | 12 | <field eval=""3"" name="priority"/> | 12 | <field eval=""1"" name="priority"/> |
351 | 13 | <field name="user_id" ref="base.user_root"/> | 13 | <field name="user_id" ref="base.user_root"/> |
352 | 14 | <field eval=""Problem with the delivery of goods"" name="name"/> | 14 | <field eval=""Problem with the delivery of goods"" name="name"/> |
353 | 15 | <field name="section_id" ref="crm.section_sales_department"/> | 15 | <field name="section_id" ref="crm.section_sales_department"/> |
354 | @@ -21,7 +21,7 @@ | |||
355 | 21 | <record id="crm_claim_2" model="crm.claim"> | 21 | <record id="crm_claim_2" model="crm.claim"> |
356 | 22 | <field eval="time.strftime('%Y-%m-11 11:19:25')" name="date"/> | 22 | <field eval="time.strftime('%Y-%m-11 11:19:25')" name="date"/> |
357 | 23 | <field name="partner_id" ref="base.res_partner_6"/> | 23 | <field name="partner_id" ref="base.res_partner_6"/> |
359 | 24 | <field eval=""4"" name="priority"/> | 24 | <field eval=""0"" name="priority"/> |
360 | 25 | <field name="user_id" ref="base.user_root"/> | 25 | <field name="user_id" ref="base.user_root"/> |
361 | 26 | <field eval=""Damaged Products"" name="name"/> | 26 | <field eval=""Damaged Products"" name="name"/> |
362 | 27 | <field name="section_id" ref="crm.section_sales_department"/> | 27 | <field name="section_id" ref="crm.section_sales_department"/> |
363 | @@ -46,7 +46,7 @@ | |||
364 | 46 | <record id="crm_claim_4" model="crm.claim"> | 46 | <record id="crm_claim_4" model="crm.claim"> |
365 | 47 | <field eval="time.strftime('%Y-%m-21 14:10:23')" name="date"/> | 47 | <field eval="time.strftime('%Y-%m-21 14:10:23')" name="date"/> |
366 | 48 | <field name="partner_id" ref="base.res_partner_18"/> | 48 | <field name="partner_id" ref="base.res_partner_18"/> |
368 | 49 | <field eval=""3"" name="priority"/> | 49 | <field eval=""1"" name="priority"/> |
369 | 50 | <field name="user_id" ref="base.user_root"/> | 50 | <field name="user_id" ref="base.user_root"/> |
370 | 51 | <field eval=""Product quality not maintained"" name="name"/> | 51 | <field eval=""Product quality not maintained"" name="name"/> |
371 | 52 | <field name="section_id" ref="crm.section_sales_department"/> | 52 | <field name="section_id" ref="crm.section_sales_department"/> |
372 | @@ -58,7 +58,7 @@ | |||
373 | 58 | <record id="crm_claim_5" model="crm.claim"> | 58 | <record id="crm_claim_5" model="crm.claim"> |
374 | 59 | <field eval="time.strftime('%Y-%m-28 16:20:43')" name="date"/> | 59 | <field eval="time.strftime('%Y-%m-28 16:20:43')" name="date"/> |
375 | 60 | <field name="partner_id" ref="base.res_partner_5"/> | 60 | <field name="partner_id" ref="base.res_partner_5"/> |
377 | 61 | <field eval=""3"" name="priority"/> | 61 | <field eval=""1"" name="priority"/> |
378 | 62 | <field name="user_id" ref="base.user_root"/> | 62 | <field name="user_id" ref="base.user_root"/> |
379 | 63 | <field eval=""Some products missing"" name="name"/> | 63 | <field eval=""Some products missing"" name="name"/> |
380 | 64 | <field name="section_id" ref="crm.section_sales_department"/> | 64 | <field name="section_id" ref="crm.section_sales_department"/> |
381 | @@ -69,7 +69,7 @@ | |||
382 | 69 | 69 | ||
383 | 70 | <record id="crm_claim_6" model="crm.claim"> | 70 | <record id="crm_claim_6" model="crm.claim"> |
384 | 71 | <field name="partner_id" ref="base.res_partner_9"/> | 71 | <field name="partner_id" ref="base.res_partner_9"/> |
386 | 72 | <field eval=""3"" name="priority"/> | 72 | <field eval=""1"" name="priority"/> |
387 | 73 | <field name="user_id" ref="base.user_root"/> | 73 | <field name="user_id" ref="base.user_root"/> |
388 | 74 | <field eval=""Problem with the delivery of assignments"" name="name"/> | 74 | <field eval=""Problem with the delivery of assignments"" name="name"/> |
389 | 75 | <field name="section_id" ref="crm.section_sales_department"/> | 75 | <field name="section_id" ref="crm.section_sales_department"/> |
390 | @@ -82,7 +82,7 @@ | |||
391 | 82 | 82 | ||
392 | 83 | <record id="crm_claim_7" model="crm.claim"> | 83 | <record id="crm_claim_7" model="crm.claim"> |
393 | 84 | <field name="partner_id" ref="base.res_partner_19"/> | 84 | <field name="partner_id" ref="base.res_partner_19"/> |
395 | 85 | <field eval=""3"" name="priority"/> | 85 | <field eval=""1"" name="priority"/> |
396 | 86 | <field name="user_id" ref="base.user_root"/> | 86 | <field name="user_id" ref="base.user_root"/> |
397 | 87 | <field eval=""Documents unclear"" name="name"/> | 87 | <field eval=""Documents unclear"" name="name"/> |
398 | 88 | <field name="section_id" ref="crm.section_sales_department"/> | 88 | <field name="section_id" ref="crm.section_sales_department"/> |
399 | 89 | 89 | ||
400 | === modified file 'crm_claim/crm_claim_view.xml' | |||
401 | --- crm_claim/crm_claim_view.xml 2013-10-27 12:31:04 +0000 | |||
402 | +++ crm_claim/crm_claim_view.xml 2014-05-08 15:35:32 +0000 | |||
403 | @@ -107,7 +107,7 @@ | |||
404 | 107 | </group> | 107 | </group> |
405 | 108 | <group colspan="4" col="4" groups="base.group_user"> | 108 | <group colspan="4" col="4" groups="base.group_user"> |
406 | 109 | <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'base.group_sale_salesman_all_leads']}"/> | 109 | <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'base.group_sale_salesman_all_leads']}"/> |
408 | 110 | <field name="priority"/> | 110 | <field name="priority" widget="priority"/> |
409 | 111 | <field name="section_id" groups="base.group_multi_salesteams"/> | 111 | <field name="section_id" groups="base.group_multi_salesteams"/> |
410 | 112 | <field name="date_deadline"/> | 112 | <field name="date_deadline"/> |
411 | 113 | </group> | 113 | </group> |
412 | 114 | 114 | ||
413 | === modified file 'crm_claim/report/crm_claim_report.py' | |||
414 | --- crm_claim/report/crm_claim_report.py 2013-10-27 12:31:04 +0000 | |||
415 | +++ crm_claim/report/crm_claim_report.py 2014-05-08 15:35:32 +0000 | |||
416 | @@ -23,11 +23,9 @@ | |||
417 | 23 | from openerp import tools | 23 | from openerp import tools |
418 | 24 | 24 | ||
419 | 25 | AVAILABLE_PRIORITIES = [ | 25 | AVAILABLE_PRIORITIES = [ |
425 | 26 | ('5', 'Lowest'), | 26 | ('0', 'Low'), |
426 | 27 | ('4', 'Low'), | 27 | ('1', 'Normal'), |
427 | 28 | ('3', 'Normal'), | 28 | ('2', 'High') |
423 | 29 | ('2', 'High'), | ||
424 | 30 | ('1', 'Highest') | ||
428 | 31 | ] | 29 | ] |
429 | 32 | 30 | ||
430 | 33 | 31 | ||
431 | 34 | 32 | ||
432 | === modified file 'crm_helpdesk/crm_helpdesk.py' | |||
433 | --- crm_helpdesk/crm_helpdesk.py 2013-11-27 15:32:57 +0000 | |||
434 | +++ crm_helpdesk/crm_helpdesk.py 2014-05-08 15:35:32 +0000 | |||
435 | @@ -59,7 +59,7 @@ | |||
436 | 59 | 'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel."), | 59 | 'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel."), |
437 | 60 | 'planned_revenue': fields.float('Planned Revenue'), | 60 | 'planned_revenue': fields.float('Planned Revenue'), |
438 | 61 | 'planned_cost': fields.float('Planned Costs'), | 61 | 'planned_cost': fields.float('Planned Costs'), |
440 | 62 | 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), | 62 | 'priority': fields.selection([('0','Low'), ('1','Normal'), ('2','High')], 'Priority'), |
441 | 63 | 'probability': fields.float('Probability (%)'), | 63 | 'probability': fields.float('Probability (%)'), |
442 | 64 | 'categ_id': fields.many2one('crm.case.categ', 'Category', \ | 64 | 'categ_id': fields.many2one('crm.case.categ', 'Category', \ |
443 | 65 | domain="['|',('section_id','=',False),('section_id','=',section_id),\ | 65 | domain="['|',('section_id','=',False),('section_id','=',section_id),\ |
444 | @@ -83,7 +83,7 @@ | |||
445 | 83 | 'state': lambda *a: 'draft', | 83 | 'state': lambda *a: 'draft', |
446 | 84 | 'date': fields.datetime.now, | 84 | 'date': fields.datetime.now, |
447 | 85 | 'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c), | 85 | 'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c), |
449 | 86 | 'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0], | 86 | 'priority': '1', |
450 | 87 | } | 87 | } |
451 | 88 | 88 | ||
452 | 89 | def on_change_partner_id(self, cr, uid, ids, partner_id, context=None): | 89 | def on_change_partner_id(self, cr, uid, ids, partner_id, context=None): |
453 | 90 | 90 | ||
454 | === modified file 'crm_helpdesk/crm_helpdesk_demo.xml' | |||
455 | --- crm_helpdesk/crm_helpdesk_demo.xml 2012-11-29 22:26:45 +0000 | |||
456 | +++ crm_helpdesk/crm_helpdesk_demo.xml 2014-05-08 15:35:32 +0000 | |||
457 | @@ -5,7 +5,7 @@ | |||
458 | 5 | <field eval="1" name="active"/> | 5 | <field eval="1" name="active"/> |
459 | 6 | <field name="user_id" ref="base.user_root"/> | 6 | <field name="user_id" ref="base.user_root"/> |
460 | 7 | <field name="company_id" ref="base.main_company"/> | 7 | <field name="company_id" ref="base.main_company"/> |
462 | 8 | <field name="priority">3</field> | 8 | <field name="priority">1</field> |
463 | 9 | <field name="state">draft</field> | 9 | <field name="state">draft</field> |
464 | 10 | <field name="section_id" ref="crm.section_sales_department"/> | 10 | <field name="section_id" ref="crm.section_sales_department"/> |
465 | 11 | <field name="date" eval="time.strftime('%Y-%m-04 11:10:36')"/> | 11 | <field name="date" eval="time.strftime('%Y-%m-04 11:10:36')"/> |
466 | @@ -17,7 +17,7 @@ | |||
467 | 17 | <field eval="1" name="active"/> | 17 | <field eval="1" name="active"/> |
468 | 18 | <field name="user_id" ref="base.user_demo"/> | 18 | <field name="user_id" ref="base.user_demo"/> |
469 | 19 | <field name="company_id" ref="base.main_company"/> | 19 | <field name="company_id" ref="base.main_company"/> |
471 | 20 | <field name="priority">3</field> | 20 | <field name="priority">1</field> |
472 | 21 | <field name="state">draft</field> | 21 | <field name="state">draft</field> |
473 | 22 | <field name="section_id" ref="crm.section_sales_department"/> | 22 | <field name="section_id" ref="crm.section_sales_department"/> |
474 | 23 | <field name="date" eval="time.strftime('%Y-%m-12 11:12:09')"/> | 23 | <field name="date" eval="time.strftime('%Y-%m-12 11:12:09')"/> |
475 | @@ -42,7 +42,7 @@ | |||
476 | 42 | <field name="partner_id" ref="base.res_partner_2"/> | 42 | <field name="partner_id" ref="base.res_partner_2"/> |
477 | 43 | <field name="user_id" ref="base.user_root"/> | 43 | <field name="user_id" ref="base.user_root"/> |
478 | 44 | <field name="company_id" ref="base.main_company"/> | 44 | <field name="company_id" ref="base.main_company"/> |
480 | 45 | <field name="priority">3</field> | 45 | <field name="priority">1</field> |
481 | 46 | <field name="state">draft</field> | 46 | <field name="state">draft</field> |
482 | 47 | <field name="date" eval="time.strftime('%Y-%m-12 11:15:17')"/> | 47 | <field name="date" eval="time.strftime('%Y-%m-12 11:15:17')"/> |
483 | 48 | <field name="name">How to create a new module</field> | 48 | <field name="name">How to create a new module</field> |
484 | 49 | 49 | ||
485 | === modified file 'crm_helpdesk/crm_helpdesk_view.xml' | |||
486 | --- crm_helpdesk/crm_helpdesk_view.xml 2014-04-17 11:26:55 +0000 | |||
487 | +++ crm_helpdesk/crm_helpdesk_view.xml 2014-05-08 15:35:32 +0000 | |||
488 | @@ -51,7 +51,7 @@ | |||
489 | 51 | <field name="email_from"/> | 51 | <field name="email_from"/> |
490 | 52 | </group> | 52 | </group> |
491 | 53 | <group string="Categorization"> | 53 | <group string="Categorization"> |
493 | 54 | <field name="priority"/> | 54 | <field name="priority" widget="priority"/> |
494 | 55 | <field name="categ_id" domain="[('object_id.model', '=', 'crm.helpdesk')]" context="{'object_name': 'crm.helpdesk'}"/> | 55 | <field name="categ_id" domain="[('object_id.model', '=', 'crm.helpdesk')]" context="{'object_name': 'crm.helpdesk'}"/> |
495 | 56 | <field name="channel_id"/> | 56 | <field name="channel_id"/> |
496 | 57 | </group> | 57 | </group> |
497 | 58 | 58 | ||
498 | === modified file 'hr_recruitment/hr_recruitment.py' | |||
499 | --- hr_recruitment/hr_recruitment.py 2014-05-07 13:16:29 +0000 | |||
500 | +++ hr_recruitment/hr_recruitment.py 2014-05-08 15:35:32 +0000 | |||
501 | @@ -25,12 +25,11 @@ | |||
502 | 25 | 25 | ||
503 | 26 | 26 | ||
504 | 27 | AVAILABLE_PRIORITIES = [ | 27 | AVAILABLE_PRIORITIES = [ |
508 | 28 | ('', ''), | 28 | ('0', 'Bad'), |
509 | 29 | ('5', 'Not Good'), | 29 | ('1', 'Below Average'), |
510 | 30 | ('4', 'On Average'), | 30 | ('2', 'Average'), |
511 | 31 | ('3', 'Good'), | 31 | ('3', 'Good'), |
514 | 32 | ('2', 'Very Good'), | 32 | ('4', 'Excellent') |
513 | 33 | ('1', 'Excellent') | ||
515 | 34 | ] | 33 | ] |
516 | 35 | 34 | ||
517 | 36 | class hr_recruitment_source(osv.osv): | 35 | class hr_recruitment_source(osv.osv): |
518 | @@ -489,21 +488,6 @@ | |||
519 | 489 | dict_act_window['view_mode'] = 'form,tree' | 488 | dict_act_window['view_mode'] = 'form,tree' |
520 | 490 | return dict_act_window | 489 | return dict_act_window |
521 | 491 | 490 | ||
522 | 492 | def set_priority(self, cr, uid, ids, priority, *args): | ||
523 | 493 | """Set applicant priority | ||
524 | 494 | """ | ||
525 | 495 | return self.write(cr, uid, ids, {'priority': priority}) | ||
526 | 496 | |||
527 | 497 | def set_high_priority(self, cr, uid, ids, *args): | ||
528 | 498 | """Set applicant priority to high | ||
529 | 499 | """ | ||
530 | 500 | return self.set_priority(cr, uid, ids, '1') | ||
531 | 501 | |||
532 | 502 | def set_normal_priority(self, cr, uid, ids, *args): | ||
533 | 503 | """Set applicant priority to normal | ||
534 | 504 | """ | ||
535 | 505 | return self.set_priority(cr, uid, ids, '3') | ||
536 | 506 | |||
537 | 507 | def get_empty_list_help(self, cr, uid, help, context=None): | 491 | def get_empty_list_help(self, cr, uid, help, context=None): |
538 | 508 | context['empty_list_help_model'] = 'hr.job' | 492 | context['empty_list_help_model'] = 'hr.job' |
539 | 509 | context['empty_list_help_id'] = context.get('default_job_id', None) | 493 | context['empty_list_help_id'] = context.get('default_job_id', None) |
540 | 510 | 494 | ||
541 | === modified file 'hr_recruitment/hr_recruitment_demo.xml' | |||
542 | --- hr_recruitment/hr_recruitment_demo.xml 2014-02-12 09:56:06 +0000 | |||
543 | +++ hr_recruitment/hr_recruitment_demo.xml 2014-05-08 15:35:32 +0000 | |||
544 | @@ -75,7 +75,7 @@ | |||
545 | 75 | <field name="type_id" ref="degree_licenced"/> | 75 | <field name="type_id" ref="degree_licenced"/> |
546 | 76 | <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_reserve')])]"/> | 76 | <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_reserve')])]"/> |
547 | 77 | <field name="user_id" ref="base.user_root"/> | 77 | <field name="user_id" ref="base.user_root"/> |
549 | 78 | <field name="priority">4</field> | 78 | <field name="priority">2</field> |
550 | 79 | <field name="partner_name">David Armstrong</field> | 79 | <field name="partner_name">David Armstrong</field> |
551 | 80 | <field name="stage_id" ref="stage_job2"/> | 80 | <field name="stage_id" ref="stage_job2"/> |
552 | 81 | <field name="partner_phone">33968745</field> | 81 | <field name="partner_phone">33968745</field> |
553 | 82 | 82 | ||
554 | === modified file 'hr_recruitment/hr_recruitment_view.xml' | |||
555 | --- hr_recruitment/hr_recruitment_view.xml 2014-04-15 15:01:46 +0000 | |||
556 | +++ hr_recruitment/hr_recruitment_view.xml 2014-05-08 15:35:32 +0000 | |||
557 | @@ -130,7 +130,7 @@ | |||
558 | 130 | <field name="date_action"/> | 130 | <field name="date_action"/> |
559 | 131 | <field name="title_action" class="oe_inline" placeholder="e.g. Call for interview"/> | 131 | <field name="title_action" class="oe_inline" placeholder="e.g. Call for interview"/> |
560 | 132 | </div> | 132 | </div> |
562 | 133 | <field name="priority"/> | 133 | <field name="priority" widget="priority"/> |
563 | 134 | <field name="source_id"/> | 134 | <field name="source_id"/> |
564 | 135 | <field name="reference"/> | 135 | <field name="reference"/> |
565 | 136 | </group> | 136 | </group> |
566 | @@ -293,22 +293,11 @@ | |||
567 | 293 | <field name="title_action"/> | 293 | <field name="title_action"/> |
568 | 294 | </div> | 294 | </div> |
569 | 295 | <div style="width:240px"><field name="categ_ids"/></div> | 295 | <div style="width:240px"><field name="categ_ids"/></div> |
586 | 296 | <div class="oe_kanban_right"> | 296 | <div class="oe_kanban_bottom_right"> |
587 | 297 | <t t-set="priority" t-value="record.priority.raw_value || 5"/> | 297 | <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar pull-right"/> |
588 | 298 | <a type="object" name="set_priority" args="['3']" t-if="priority gt 3"> | 298 | <div class="pull-left" groups="base.group_user"> |
589 | 299 | <img src="/web/static/src/img/icons/star-off.png" width="16" height="16" title="Good"/> | 299 | <field name="priority" widget="priority"/> |
590 | 300 | </a> | 300 | </div> |
575 | 301 | <a type="object" name="set_priority" args="['5']" t-if="priority lte 3"> | ||
576 | 302 | <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 3 ? 'on' : 'off'}.png" width="16" height="16" title="Good"/> | ||
577 | 303 | </a> | ||
578 | 304 | <a type="object" name="set_priority" args="['2']"> | ||
579 | 305 | <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 2 ? 'on' : 'off'}.png" width="16" height="16" title="Very Good"/> | ||
580 | 306 | </a> | ||
581 | 307 | <a type="object" name="set_priority" args="['1']"> | ||
582 | 308 | <img t-attf-src="/web/static/src/img/icons/star-#{priority == 1 ? 'on' : 'off'}.png" width="16" height="16" title="Excellent"/> | ||
583 | 309 | </a> | ||
584 | 310 | <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/> | ||
585 | 311 | |||
591 | 312 | </div> | 301 | </div> |
592 | 313 | <div class="oe_kanban_footer_left" style="margin-top:5px;"> | 302 | <div class="oe_kanban_footer_left" style="margin-top:5px;"> |
593 | 314 | <t t-raw="record.message_summary.raw_value"/> | 303 | <t t-raw="record.message_summary.raw_value"/> |
594 | 315 | 304 | ||
595 | === modified file 'portal_project_issue/portal_project_issue_view.xml' | |||
596 | --- portal_project_issue/portal_project_issue_view.xml 2013-10-27 12:31:04 +0000 | |||
597 | +++ portal_project_issue/portal_project_issue_view.xml 2014-05-08 15:35:32 +0000 | |||
598 | @@ -38,21 +38,7 @@ | |||
599 | 38 | <field name="categ_ids"/> | 38 | <field name="categ_ids"/> |
600 | 39 | <div class="oe_right"> | 39 | <div class="oe_right"> |
601 | 40 | Creation: <field name="create_date"/> | 40 | Creation: <field name="create_date"/> |
617 | 41 | <span class="oe_kanban_highlight"> | 41 | <field name="priority" widget="priority"/> |
603 | 42 | <t t-set="priority" t-value="record.priority.raw_value || 5"/> | ||
604 | 43 | <a type="object" name="set_priority" args="['3']" t-if="priority gt 3" title="Normal Priority"> | ||
605 | 44 | <img src="/web/static/src/img/icons/star-off.png" width="16" height="16"/> | ||
606 | 45 | </a> | ||
607 | 46 | <a type="object" name="set_priority" args="['5']" t-if="priority lte 3" title="Normal Priority"> | ||
608 | 47 | <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 3 ? 'on' : 'off'}.png" width="16" height="16"/> | ||
609 | 48 | </a> | ||
610 | 49 | <a type="object" name="set_priority" args="['2']" title="High Priority"> | ||
611 | 50 | <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 2 ? 'on' : 'off'}.png" width="16" height="16"/> | ||
612 | 51 | </a> | ||
613 | 52 | <a type="object" name="set_priority" args="['1']" title="Highest Priority"> | ||
614 | 53 | <img t-attf-src="/web/static/src/img/icons/star-#{priority == 1 ? 'on' : 'off'}.png" width="16" height="16"/> | ||
615 | 54 | </a> | ||
616 | 55 | </span> | ||
618 | 56 | <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())"> | 42 | <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())"> |
619 | 57 | <span t-attf-class="oe_kanban_status oe_kaban_status_red"> </span> | 43 | <span t-attf-class="oe_kanban_status oe_kaban_status_red"> </span> |
620 | 58 | </t> | 44 | </t> |
621 | 59 | 45 | ||
622 | === modified file 'project/project.py' | |||
623 | --- project/project.py 2014-04-10 14:51:31 +0000 | |||
624 | +++ project/project.py 2014-05-08 15:35:32 +0000 | |||
625 | @@ -565,6 +565,7 @@ | |||
626 | 565 | }, | 565 | }, |
627 | 566 | 'kanban_state': { | 566 | 'kanban_state': { |
628 | 567 | 'project.mt_task_blocked': lambda self, cr, uid, obj, ctx=None: obj.kanban_state == 'blocked', | 567 | 'project.mt_task_blocked': lambda self, cr, uid, obj, ctx=None: obj.kanban_state == 'blocked', |
629 | 568 | 'project.mt_task_ready': lambda self, cr, uid, obj, ctx=None: obj.kanban_state == 'done', | ||
630 | 568 | }, | 569 | }, |
631 | 569 | } | 570 | } |
632 | 570 | 571 | ||
633 | @@ -740,18 +741,18 @@ | |||
634 | 740 | 'active': fields.function(_is_template, store=True, string='Not a Template Task', type='boolean', help="This field is computed automatically and have the same behavior than the boolean 'active' field: if the task is linked to a template or unactivated project, it will be hidden unless specifically asked."), | 741 | 'active': fields.function(_is_template, store=True, string='Not a Template Task', type='boolean', help="This field is computed automatically and have the same behavior than the boolean 'active' field: if the task is linked to a template or unactivated project, it will be hidden unless specifically asked."), |
635 | 741 | 'name': fields.char('Task Summary', track_visibility='onchange', size=128, required=True, select=True), | 742 | 'name': fields.char('Task Summary', track_visibility='onchange', size=128, required=True, select=True), |
636 | 742 | 'description': fields.text('Description'), | 743 | 'description': fields.text('Description'), |
638 | 743 | 'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Important'), ('0','Very important')], 'Priority', select=True), | 744 | 'priority': fields.selection([('0','Low'), ('1','Normal'), ('2','High')], 'Priority', select=True), |
639 | 744 | 'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of tasks."), | 745 | 'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of tasks."), |
640 | 745 | 'stage_id': fields.many2one('project.task.type', 'Stage', track_visibility='onchange', select=True, | 746 | 'stage_id': fields.many2one('project.task.type', 'Stage', track_visibility='onchange', select=True, |
641 | 746 | domain="[('project_ids', '=', project_id)]"), | 747 | domain="[('project_ids', '=', project_id)]"), |
642 | 747 | 'categ_ids': fields.many2many('project.category', string='Tags'), | 748 | 'categ_ids': fields.many2many('project.category', string='Tags'), |
644 | 748 | 'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready for next stage')], 'Kanban State', | 749 | 'kanban_state': fields.selection([('normal', 'In Progress'),('blocked', 'Blocked'),('done', 'Ready for next stage')], 'Kanban State', |
645 | 749 | track_visibility='onchange', | 750 | track_visibility='onchange', |
646 | 750 | help="A task's kanban state indicates special situations affecting it:\n" | 751 | help="A task's kanban state indicates special situations affecting it:\n" |
647 | 751 | " * Normal is the default situation\n" | 752 | " * Normal is the default situation\n" |
648 | 752 | " * Blocked indicates something is preventing the progress of this task\n" | 753 | " * Blocked indicates something is preventing the progress of this task\n" |
649 | 753 | " * Ready for next stage indicates the task is ready to be pulled to the next stage", | 754 | " * Ready for next stage indicates the task is ready to be pulled to the next stage", |
651 | 754 | readonly=True, required=False), | 755 | required=False), |
652 | 755 | 'create_date': fields.datetime('Create Date', readonly=True, select=True), | 756 | 'create_date': fields.datetime('Create Date', readonly=True, select=True), |
653 | 756 | 'write_date': fields.datetime('Last Modification Date', readonly=True, select=True), #not displayed in the view but it might be useful with base_action_rule module (and it needs to be defined first for that) | 757 | 'write_date': fields.datetime('Last Modification Date', readonly=True, select=True), #not displayed in the view but it might be useful with base_action_rule module (and it needs to be defined first for that) |
654 | 757 | 'date_start': fields.datetime('Starting Date',select=True), | 758 | 'date_start': fields.datetime('Starting Date',select=True), |
655 | @@ -799,7 +800,7 @@ | |||
656 | 799 | 'project_id': _get_default_project_id, | 800 | 'project_id': _get_default_project_id, |
657 | 800 | 'date_last_stage_update': fields.datetime.now, | 801 | 'date_last_stage_update': fields.datetime.now, |
658 | 801 | 'kanban_state': 'normal', | 802 | 'kanban_state': 'normal', |
660 | 802 | 'priority': '2', | 803 | 'priority': '1', |
661 | 803 | 'progress': 0, | 804 | 'progress': 0, |
662 | 804 | 'sequence': 10, | 805 | 'sequence': 10, |
663 | 805 | 'active': True, | 806 | 'active': True, |
664 | @@ -808,17 +809,7 @@ | |||
665 | 808 | 'partner_id': lambda self, cr, uid, ctx=None: self._get_default_partner(cr, uid, context=ctx), | 809 | 'partner_id': lambda self, cr, uid, ctx=None: self._get_default_partner(cr, uid, context=ctx), |
666 | 809 | } | 810 | } |
667 | 810 | _order = "priority, sequence, date_start, name, id" | 811 | _order = "priority, sequence, date_start, name, id" |
679 | 811 | 812 | ||
669 | 812 | def set_high_priority(self, cr, uid, ids, *args): | ||
670 | 813 | """Set task priority to high | ||
671 | 814 | """ | ||
672 | 815 | return self.write(cr, uid, ids, {'priority' : '0'}) | ||
673 | 816 | |||
674 | 817 | def set_normal_priority(self, cr, uid, ids, *args): | ||
675 | 818 | """Set task priority to normal | ||
676 | 819 | """ | ||
677 | 820 | return self.write(cr, uid, ids, {'priority' : '2'}) | ||
678 | 821 | |||
680 | 822 | def _check_recursion(self, cr, uid, ids, context=None): | 813 | def _check_recursion(self, cr, uid, ids, context=None): |
681 | 823 | for id in ids: | 814 | for id in ids: |
682 | 824 | visited_branch = set() | 815 | visited_branch = set() |
683 | @@ -1003,16 +994,6 @@ | |||
684 | 1003 | def set_remaining_time_10(self, cr, uid, ids, context=None): | 994 | def set_remaining_time_10(self, cr, uid, ids, context=None): |
685 | 1004 | return self.set_remaining_time(cr, uid, ids, 10.0, context) | 995 | return self.set_remaining_time(cr, uid, ids, 10.0, context) |
686 | 1005 | 996 | ||
687 | 1006 | def set_kanban_state_blocked(self, cr, uid, ids, context=None): | ||
688 | 1007 | return self.write(cr, uid, ids, {'kanban_state': 'blocked'}, context=context) | ||
689 | 1008 | |||
690 | 1009 | def set_kanban_state_normal(self, cr, uid, ids, context=None): | ||
691 | 1010 | return self.write(cr, uid, ids, {'kanban_state': 'normal'}, context=context) | ||
692 | 1011 | |||
693 | 1012 | def set_kanban_state_done(self, cr, uid, ids, context=None): | ||
694 | 1013 | self.write(cr, uid, ids, {'kanban_state': 'done'}, context=context) | ||
695 | 1014 | return False | ||
696 | 1015 | |||
697 | 1016 | def _store_history(self, cr, uid, ids, context=None): | 997 | def _store_history(self, cr, uid, ids, context=None): |
698 | 1017 | for task in self.browse(cr, uid, ids, context=context): | 998 | for task in self.browse(cr, uid, ids, context=context): |
699 | 1018 | self.pool.get('project.task.history').create(cr, uid, { | 999 | self.pool.get('project.task.history').create(cr, uid, { |
700 | 1019 | 1000 | ||
701 | === modified file 'project/project_data.xml' | |||
702 | --- project/project_data.xml 2014-02-21 11:27:04 +0000 | |||
703 | +++ project/project_data.xml 2014-05-08 15:35:32 +0000 | |||
704 | @@ -93,6 +93,12 @@ | |||
705 | 93 | <field name="default" eval="False"/> | 93 | <field name="default" eval="False"/> |
706 | 94 | <field name="description">Task blocked</field> | 94 | <field name="description">Task blocked</field> |
707 | 95 | </record> | 95 | </record> |
708 | 96 | <record id="mt_task_ready" model="mail.message.subtype"> | ||
709 | 97 | <field name="name">Task Ready for Next Stage</field> | ||
710 | 98 | <field name="res_model">project.task</field> | ||
711 | 99 | <field name="default" eval="False"/> | ||
712 | 100 | <field name="description">Task Ready for Next Stage</field> | ||
713 | 101 | </record> | ||
714 | 96 | <record id="mt_task_stage" model="mail.message.subtype"> | 102 | <record id="mt_task_stage" model="mail.message.subtype"> |
715 | 97 | <field name="name">Stage Changed</field> | 103 | <field name="name">Stage Changed</field> |
716 | 98 | <field name="res_model">project.task</field> | 104 | <field name="res_model">project.task</field> |
717 | 99 | 105 | ||
718 | === modified file 'project/project_demo.xml' | |||
719 | --- project/project_demo.xml 2013-11-27 15:32:57 +0000 | |||
720 | +++ project/project_demo.xml 2014-05-08 15:35:32 +0000 | |||
721 | @@ -110,7 +110,7 @@ | |||
722 | 110 | <field name="planned_hours" eval="40.0"/> | 110 | <field name="planned_hours" eval="40.0"/> |
723 | 111 | <field name="remaining_hours" eval="40.0"/> | 111 | <field name="remaining_hours" eval="40.0"/> |
724 | 112 | <field name="user_id" ref="base.user_demo"/> | 112 | <field name="user_id" ref="base.user_demo"/> |
726 | 113 | <field name="priority">4</field> | 113 | <field name="priority">0</field> |
727 | 114 | <field name="project_id" ref="project.project_project_1"/> | 114 | <field name="project_id" ref="project.project_project_1"/> |
728 | 115 | <field name="name">Prepare Requirements Document</field> | 115 | <field name="name">Prepare Requirements Document</field> |
729 | 116 | <field name="stage_id" ref="project_tt_analysis"/> | 116 | <field name="stage_id" ref="project_tt_analysis"/> |
730 | @@ -120,7 +120,7 @@ | |||
731 | 120 | <field name="planned_hours" eval="32.0"/> | 120 | <field name="planned_hours" eval="32.0"/> |
732 | 121 | <field name="remaining_hours" eval="32.0"/> | 121 | <field name="remaining_hours" eval="32.0"/> |
733 | 122 | <field name="user_id" ref="base.user_demo"/> | 122 | <field name="user_id" ref="base.user_demo"/> |
735 | 123 | <field name="priority">4</field> | 123 | <field name="priority">0</field> |
736 | 124 | <field name="project_id" ref="project.project_project_1"/> | 124 | <field name="project_id" ref="project.project_project_1"/> |
737 | 125 | <field name="name">Make SRS</field> | 125 | <field name="name">Make SRS</field> |
738 | 126 | <field name="stage_id" ref="project_tt_specification"/> | 126 | <field name="stage_id" ref="project_tt_specification"/> |
739 | @@ -129,7 +129,7 @@ | |||
740 | 129 | <field name="planned_hours" eval="10.0"/> | 129 | <field name="planned_hours" eval="10.0"/> |
741 | 130 | <field name="remaining_hours" eval="10.0"/> | 130 | <field name="remaining_hours" eval="10.0"/> |
742 | 131 | <field name="user_id" ref="base.user_root"/> | 131 | <field name="user_id" ref="base.user_root"/> |
744 | 132 | <field name="priority">4</field> | 132 | <field name="priority">0</field> |
745 | 133 | <field name="project_id" ref="project.project_project_1"/> | 133 | <field name="project_id" ref="project.project_project_1"/> |
746 | 134 | <field name="name">Budget Planning</field> | 134 | <field name="name">Budget Planning</field> |
747 | 135 | <field name="date_deadline" eval="time.strftime('%Y-%m-24')"/> | 135 | <field name="date_deadline" eval="time.strftime('%Y-%m-24')"/> |
748 | @@ -140,7 +140,7 @@ | |||
749 | 140 | <field name="planned_hours" eval="60.0"/> | 140 | <field name="planned_hours" eval="60.0"/> |
750 | 141 | <field name="remaining_hours" eval="60.0"/> | 141 | <field name="remaining_hours" eval="60.0"/> |
751 | 142 | <field name="user_id" ref="base.user_demo"/> | 142 | <field name="user_id" ref="base.user_demo"/> |
753 | 143 | <field name="priority">4</field> | 143 | <field name="priority">0</field> |
754 | 144 | <field name="project_id" ref="project.project_project_1"/> | 144 | <field name="project_id" ref="project.project_project_1"/> |
755 | 145 | <field name="name">Develop module for Sale Management</field> | 145 | <field name="name">Develop module for Sale Management</field> |
756 | 146 | <field name="description">Use the account_budget module</field> | 146 | <field name="description">Use the account_budget module</field> |
757 | 147 | 147 | ||
758 | === modified file 'project/project_view.xml' | |||
759 | --- project/project_view.xml 2014-04-15 12:14:04 +0000 | |||
760 | +++ project/project_view.xml 2014-05-08 15:35:32 +0000 | |||
761 | @@ -377,12 +377,11 @@ | |||
762 | 377 | options="{'fold_field': 'fold'}"/> | 377 | options="{'fold_field': 'fold'}"/> |
763 | 378 | </header> | 378 | </header> |
764 | 379 | <sheet string="Task"> | 379 | <sheet string="Task"> |
765 | 380 | <div class="oe_right"> | ||
766 | 381 | <field name="kanban_state" class="oe_inline" widget="kanban_state_selection"/> | ||
767 | 382 | </div> | ||
768 | 380 | <h1> | 383 | <h1> |
769 | 381 | <field name="name" placeholder="Task summary..." class="oe_inline"/> | 384 | <field name="name" placeholder="Task summary..." class="oe_inline"/> |
770 | 382 | <field name="kanban_state" invisible='1'/> | ||
771 | 383 | <button name="set_kanban_state_done" help="In Progress" attrs="{'invisible': [('kanban_state', 'in', ['done','blocked'])]}" type="object" icon="gtk-normal" class="oe_link oe_right"/> | ||
772 | 384 | <button name="set_kanban_state_blocked" help="Ready for Next Stage" attrs="{'invisible': [('kanban_state', 'in', ['normal','blocked'])]}" type="object" icon="gtk-yes" class="oe_link oe_right"/> | ||
773 | 385 | <button name="set_kanban_state_normal" help="Blocked" attrs="{'invisible': [('kanban_state', 'in', ['done','normal'])]}" type="object" icon="gtk-no" class="oe_link oe_right"/> | ||
774 | 386 | </h1> | 385 | </h1> |
775 | 387 | <group> | 386 | <group> |
776 | 388 | <group> | 387 | <group> |
777 | @@ -444,7 +443,7 @@ | |||
778 | 444 | </page> | 443 | </page> |
779 | 445 | <page string="Extra Info"> | 444 | <page string="Extra Info"> |
780 | 446 | <group col="4"> | 445 | <group col="4"> |
782 | 447 | <field name="priority" groups="base.group_user"/> | 446 | <field name="priority" groups="base.group_user" widget="priority"/> |
783 | 448 | <field name="sequence"/> | 447 | <field name="sequence"/> |
784 | 449 | <field name="partner_id"/> | 448 | <field name="partner_id"/> |
785 | 450 | <field name="company_id" groups="base.group_multi_company" widget="selection"/> | 449 | <field name="company_id" groups="base.group_multi_company" widget="selection"/> |
786 | @@ -515,16 +514,6 @@ | |||
787 | 515 | <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kanban_text_red</t> | 514 | <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kanban_text_red</t> |
788 | 516 | <span t-attf-class="#{red || ''}"><i><field name="date_deadline"/></i></span> | 515 | <span t-attf-class="#{red || ''}"><i><field name="date_deadline"/></i></span> |
789 | 517 | </div> | 516 | </div> |
790 | 518 | <div class="oe_kanban_bottom_right"> | ||
791 | 519 | <t groups="base.group_user"> | ||
792 | 520 | <a t-if="record.kanban_state.raw_value === 'normal'" type="object" string="In Progress" name="set_kanban_state_done" class="oe_kanban_status"> </a> | ||
793 | 521 | <a t-if="record.kanban_state.raw_value === 'done'" type="object" string="Ready for next stage" name="set_kanban_state_blocked" class="oe_kanban_status oe_kanban_status_green"> </a> | ||
794 | 522 | <a t-if="record.kanban_state.raw_value === 'blocked'" type="object" string="Blocked" name="set_kanban_state_normal" class="oe_kanban_status oe_kanban_status_red"> </a> | ||
795 | 523 | <a t-if="record.priority.raw_value > 0" type="object" string="Normal" name="set_high_priority" class="oe_e oe_star_off">7</a> | ||
796 | 524 | <a t-if="record.priority.raw_value == 0" type="object" string="Very Important" name="set_normal_priority" class="oe_e oe_star_on">7</a> | ||
797 | 525 | </t> | ||
798 | 526 | <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/> | ||
799 | 527 | </div> | ||
800 | 528 | <div class="oe_kanban_footer_left"> | 517 | <div class="oe_kanban_footer_left"> |
801 | 529 | <span groups="project.group_time_work_estimation_tasks" title="Remaining hours"> | 518 | <span groups="project.group_time_work_estimation_tasks" title="Remaining hours"> |
802 | 530 | <span class="oe_e">N</span> | 519 | <span class="oe_e">N</span> |
803 | @@ -535,6 +524,13 @@ | |||
804 | 535 | <t t-raw="record.message_summary.raw_value"/> | 524 | <t t-raw="record.message_summary.raw_value"/> |
805 | 536 | <field name="categ_ids"/> | 525 | <field name="categ_ids"/> |
806 | 537 | </div> | 526 | </div> |
807 | 527 | <div class="oe_kanban_bottom_right"> | ||
808 | 528 | <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar pull-right"/> | ||
809 | 529 | <div class="pull-left" groups="base.group_user"> | ||
810 | 530 | <field name="kanban_state" widget="kanban_state_selection"/> | ||
811 | 531 | <field name="priority" widget="priority"/> | ||
812 | 532 | </div> | ||
813 | 533 | </div> | ||
814 | 538 | </div> | 534 | </div> |
815 | 539 | <div class="oe_clear"></div> | 535 | <div class="oe_clear"></div> |
816 | 540 | </div> | 536 | </div> |
817 | 541 | 537 | ||
818 | === modified file 'project/report/project_report.py' | |||
819 | --- project/report/project_report.py 2014-01-29 15:24:40 +0000 | |||
820 | +++ project/report/project_report.py 2014-05-08 15:35:32 +0000 | |||
821 | @@ -48,7 +48,7 @@ | |||
822 | 48 | help="Number of Days to Open the task"), | 48 | help="Number of Days to Open the task"), |
823 | 49 | 'delay_endings_days': fields.float('Overpassed Deadline', digits=(16,2), readonly=True), | 49 | 'delay_endings_days': fields.float('Overpassed Deadline', digits=(16,2), readonly=True), |
824 | 50 | 'nbr': fields.integer('# of tasks', readonly=True), | 50 | 'nbr': fields.integer('# of tasks', readonly=True), |
826 | 51 | 'priority': fields.selection([('4', 'Very Low'), ('3', 'Low'), ('2', 'Medium'), ('1', 'Urgent'), ('0', 'Very urgent')], | 51 | 'priority': fields.selection([('0','Low'), ('1','Normal'), ('2','High')], |
827 | 52 | string='Priority', readonly=True), | 52 | string='Priority', readonly=True), |
828 | 53 | 'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')],'Status', readonly=True), | 53 | 'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')],'Status', readonly=True), |
829 | 54 | 'company_id': fields.many2one('res.company', 'Company', readonly=True), | 54 | 'company_id': fields.many2one('res.company', 'Company', readonly=True), |
830 | 55 | 55 | ||
831 | === modified file 'project_issue/project_issue.py' | |||
832 | --- project_issue/project_issue.py 2014-05-07 13:29:49 +0000 | |||
833 | +++ project_issue/project_issue.py 2014-05-08 15:35:32 +0000 | |||
834 | @@ -57,6 +57,7 @@ | |||
835 | 57 | }, | 57 | }, |
836 | 58 | 'kanban_state': { | 58 | 'kanban_state': { |
837 | 59 | 'project_issue.mt_issue_blocked': lambda self, cr, uid, obj, ctx=None: obj.kanban_state == 'blocked', | 59 | 'project_issue.mt_issue_blocked': lambda self, cr, uid, obj, ctx=None: obj.kanban_state == 'blocked', |
838 | 60 | 'project_issue.mt_issue_ready': lambda self, cr, uid, obj, ctx=None: obj.kanban_state == 'done', | ||
839 | 60 | }, | 61 | }, |
840 | 61 | } | 62 | } |
841 | 62 | 63 | ||
842 | @@ -250,7 +251,7 @@ | |||
843 | 250 | " * Normal is the default situation\n" | 251 | " * Normal is the default situation\n" |
844 | 251 | " * Blocked indicates something is preventing the progress of this issue\n" | 252 | " * Blocked indicates something is preventing the progress of this issue\n" |
845 | 252 | " * Ready for next stage indicates the issue is ready to be pulled to the next stage", | 253 | " * Ready for next stage indicates the issue is ready to be pulled to the next stage", |
847 | 253 | readonly=True, required=False), | 254 | required=False), |
848 | 254 | 'email_from': fields.char('Email', size=128, help="These people will receive email.", select=1), | 255 | 'email_from': fields.char('Email', size=128, help="These people will receive email.", select=1), |
849 | 255 | 'email_cc': fields.char('Watchers Emails', size=256, help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"), | 256 | 'email_cc': fields.char('Watchers Emails', size=256, help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"), |
850 | 256 | 'date_open': fields.datetime('Opened', readonly=True,select=True), | 257 | 'date_open': fields.datetime('Opened', readonly=True,select=True), |
851 | @@ -260,7 +261,7 @@ | |||
852 | 260 | 'date_last_stage_update': fields.datetime('Last Stage Update', select=True), | 261 | 'date_last_stage_update': fields.datetime('Last Stage Update', select=True), |
853 | 261 | 'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel."), | 262 | 'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel."), |
854 | 262 | 'categ_ids': fields.many2many('project.category', string='Tags'), | 263 | 'categ_ids': fields.many2many('project.category', string='Tags'), |
856 | 263 | 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True), | 264 | 'priority': fields.selection([('0','Low'), ('1','Normal'), ('2','High')], 'Priority', select=True), |
857 | 264 | 'version_id': fields.many2one('project.issue.version', 'Version'), | 265 | 'version_id': fields.many2one('project.issue.version', 'Version'), |
858 | 265 | 'stage_id': fields.many2one ('project.task.type', 'Stage', | 266 | 'stage_id': fields.many2one ('project.task.type', 'Stage', |
859 | 266 | track_visibility='onchange', select=True, | 267 | track_visibility='onchange', select=True, |
860 | @@ -295,7 +296,7 @@ | |||
861 | 295 | 'active': 1, | 296 | 'active': 1, |
862 | 296 | 'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c), | 297 | 'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c), |
863 | 297 | 'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c), | 298 | 'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c), |
865 | 298 | 'priority': crm.AVAILABLE_PRIORITIES[2][0], | 299 | 'priority': '1', |
866 | 299 | 'kanban_state': 'normal', | 300 | 'kanban_state': 'normal', |
867 | 300 | 'date_last_stage_update': fields.datetime.now, | 301 | 'date_last_stage_update': fields.datetime.now, |
868 | 301 | 'user_id': lambda obj, cr, uid, context: uid, | 302 | 'user_id': lambda obj, cr, uid, context: uid, |
869 | @@ -305,19 +306,6 @@ | |||
870 | 305 | 'stage_id': _read_group_stage_ids | 306 | 'stage_id': _read_group_stage_ids |
871 | 306 | } | 307 | } |
872 | 307 | 308 | ||
873 | 308 | def set_priority(self, cr, uid, ids, priority, *args): | ||
874 | 309 | return self.write(cr, uid, ids, {'priority' : priority}) | ||
875 | 310 | |||
876 | 311 | def set_high_priority(self, cr, uid, ids, *args): | ||
877 | 312 | """Set lead priority to high | ||
878 | 313 | """ | ||
879 | 314 | return self.set_priority(cr, uid, ids, '1') | ||
880 | 315 | |||
881 | 316 | def set_normal_priority(self, cr, uid, ids, *args): | ||
882 | 317 | """Set lead priority to normal | ||
883 | 318 | """ | ||
884 | 319 | return self.set_priority(cr, uid, ids, '3') | ||
885 | 320 | |||
886 | 321 | def copy(self, cr, uid, id, default=None, context=None): | 309 | def copy(self, cr, uid, id, default=None, context=None): |
887 | 322 | issue = self.read(cr, uid, id, ['name'], context=context) | 310 | issue = self.read(cr, uid, id, ['name'], context=context) |
888 | 323 | if not default: | 311 | if not default: |
889 | @@ -375,15 +363,6 @@ | |||
890 | 375 | # Stage management | 363 | # Stage management |
891 | 376 | # ------------------------------------------------------- | 364 | # ------------------------------------------------------- |
892 | 377 | 365 | ||
893 | 378 | def set_kanban_state_blocked(self, cr, uid, ids, context=None): | ||
894 | 379 | return self.write(cr, uid, ids, {'kanban_state': 'blocked'}, context=context) | ||
895 | 380 | |||
896 | 381 | def set_kanban_state_normal(self, cr, uid, ids, context=None): | ||
897 | 382 | return self.write(cr, uid, ids, {'kanban_state': 'normal'}, context=context) | ||
898 | 383 | |||
899 | 384 | def set_kanban_state_done(self, cr, uid, ids, context=None): | ||
900 | 385 | return self.write(cr, uid, ids, {'kanban_state': 'done'}, context=context) | ||
901 | 386 | |||
902 | 387 | def stage_find(self, cr, uid, cases, section_id, domain=[], order='sequence', context=None): | 366 | def stage_find(self, cr, uid, cases, section_id, domain=[], order='sequence', context=None): |
903 | 388 | """ Override of the base.stage method | 367 | """ Override of the base.stage method |
904 | 389 | Parameter of the stage search taken from the issue: | 368 | Parameter of the stage search taken from the issue: |
905 | 390 | 369 | ||
906 | === modified file 'project_issue/project_issue_data.xml' | |||
907 | --- project_issue/project_issue_data.xml 2014-02-21 11:27:04 +0000 | |||
908 | +++ project_issue/project_issue_data.xml 2014-05-08 15:35:32 +0000 | |||
909 | @@ -48,6 +48,12 @@ | |||
910 | 48 | <field name="default" eval="False"/> | 48 | <field name="default" eval="False"/> |
911 | 49 | <field name="description">Issue blocked</field> | 49 | <field name="description">Issue blocked</field> |
912 | 50 | </record> | 50 | </record> |
913 | 51 | <record id="mt_issue_ready" model="mail.message.subtype"> | ||
914 | 52 | <field name="name">Issue Ready for Next Stage</field> | ||
915 | 53 | <field name="res_model">project.issue</field> | ||
916 | 54 | <field name="default" eval="False"/> | ||
917 | 55 | <field name="description">Issue Ready for Next Stage</field> | ||
918 | 56 | </record> | ||
919 | 51 | <record id="mt_issue_stage" model="mail.message.subtype"> | 57 | <record id="mt_issue_stage" model="mail.message.subtype"> |
920 | 52 | <field name="name">Stage Changed</field> | 58 | <field name="name">Stage Changed</field> |
921 | 53 | <field name="res_model">project.issue</field> | 59 | <field name="res_model">project.issue</field> |
922 | 54 | 60 | ||
923 | === modified file 'project_issue/project_issue_demo.xml' | |||
924 | --- project_issue/project_issue_demo.xml 2012-11-29 22:26:45 +0000 | |||
925 | +++ project_issue/project_issue_demo.xml 2014-05-08 15:35:32 +0000 | |||
926 | @@ -35,7 +35,7 @@ | |||
927 | 35 | <!-- Issues --> | 35 | <!-- Issues --> |
928 | 36 | <record id="crm_case_buginaccountsmodule0" model="project.issue"> | 36 | <record id="crm_case_buginaccountsmodule0" model="project.issue"> |
929 | 37 | <field eval="time.strftime('%Y-%m-08 10:15:00')" name="date"/> | 37 | <field eval="time.strftime('%Y-%m-08 10:15:00')" name="date"/> |
931 | 38 | <field name="priority">5</field> | 38 | <field name="priority">0</field> |
932 | 39 | <field name="user_id" ref="base.user_root"/> | 39 | <field name="user_id" ref="base.user_root"/> |
933 | 40 | <field name="partner_id" ref="base.res_partner_2"/> | 40 | <field name="partner_id" ref="base.res_partner_2"/> |
934 | 41 | <field name="section_id" ref="crm.section_sales_department"/> | 41 | <field name="section_id" ref="crm.section_sales_department"/> |
935 | @@ -51,7 +51,7 @@ | |||
936 | 51 | 51 | ||
937 | 52 | <record id="crm_case_programnotgivingproperoutput0" model="project.issue"> | 52 | <record id="crm_case_programnotgivingproperoutput0" model="project.issue"> |
938 | 53 | <field eval="time.strftime('%Y-%m-15 12:50:00')" name="date"/> | 53 | <field eval="time.strftime('%Y-%m-15 12:50:00')" name="date"/> |
940 | 54 | <field name="priority">3</field> | 54 | <field name="priority">1</field> |
941 | 55 | <field name="user_id" ref="base.user_root"/> | 55 | <field name="user_id" ref="base.user_root"/> |
942 | 56 | <field name="partner_id" ref="base.res_partner_1"/> | 56 | <field name="partner_id" ref="base.res_partner_1"/> |
943 | 57 | <field name="section_id" ref="crm.section_sales_department"/> | 57 | <field name="section_id" ref="crm.section_sales_department"/> |
944 | @@ -64,7 +64,7 @@ | |||
945 | 64 | 64 | ||
946 | 65 | <record id="crm_case_outputincorrect0" model="project.issue"> | 65 | <record id="crm_case_outputincorrect0" model="project.issue"> |
947 | 66 | <field eval="time.strftime('%Y-%m-18 14:30:00')" name="date"/> | 66 | <field eval="time.strftime('%Y-%m-18 14:30:00')" name="date"/> |
949 | 67 | <field name="priority">4</field> | 67 | <field name="priority">0</field> |
950 | 68 | <field name="user_id" ref="base.user_demo"/> | 68 | <field name="user_id" ref="base.user_demo"/> |
951 | 69 | <field name="section_id" ref="crm.section_sales_department"/> | 69 | <field name="section_id" ref="crm.section_sales_department"/> |
952 | 70 | <field eval="1" name="active"/> | 70 | <field eval="1" name="active"/> |
953 | @@ -79,7 +79,7 @@ | |||
954 | 79 | 79 | ||
955 | 80 | <record id="crm_case_problemloadingpage0" model="project.issue"> | 80 | <record id="crm_case_problemloadingpage0" model="project.issue"> |
956 | 81 | <field eval="time.strftime('%Y-%m-20 15:25:05')" name="date"/> | 81 | <field eval="time.strftime('%Y-%m-20 15:25:05')" name="date"/> |
958 | 82 | <field name="priority">3</field> | 82 | <field name="priority">1</field> |
959 | 83 | <field name="user_id" ref="base.user_root"/> | 83 | <field name="user_id" ref="base.user_root"/> |
960 | 84 | <field name="partner_id" ref="base.res_partner_14"/> | 84 | <field name="partner_id" ref="base.res_partner_14"/> |
961 | 85 | <field name="section_id" ref="crm.section_sales_department"/> | 85 | <field name="section_id" ref="crm.section_sales_department"/> |
962 | @@ -92,7 +92,7 @@ | |||
963 | 92 | 92 | ||
964 | 93 | <record id="crm_case_pagenotfound0" model="project.issue"> | 93 | <record id="crm_case_pagenotfound0" model="project.issue"> |
965 | 94 | <field eval="time.strftime('%Y-%m-22 18:15:00')" name="date"/> | 94 | <field eval="time.strftime('%Y-%m-22 18:15:00')" name="date"/> |
967 | 95 | <field name="priority">3</field> | 95 | <field name="priority">1</field> |
968 | 96 | <field name="user_id" ref="base.user_root"/> | 96 | <field name="user_id" ref="base.user_root"/> |
969 | 97 | <field name="partner_id" ref="base.res_partner_13"/> | 97 | <field name="partner_id" ref="base.res_partner_13"/> |
970 | 98 | <field name="section_id" ref="crm.section_sales_department"/> | 98 | <field name="section_id" ref="crm.section_sales_department"/> |
971 | @@ -105,7 +105,7 @@ | |||
972 | 105 | 105 | ||
973 | 106 | <record id="crm_case_programmingerror0" model="project.issue"> | 106 | <record id="crm_case_programmingerror0" model="project.issue"> |
974 | 107 | <field eval="time.strftime('%Y-%m-24 09:45:00')" name="date"/> | 107 | <field eval="time.strftime('%Y-%m-24 09:45:00')" name="date"/> |
976 | 108 | <field name="priority">3</field> | 108 | <field name="priority">1</field> |
977 | 109 | <field name="user_id" ref="base.user_root"/> | 109 | <field name="user_id" ref="base.user_root"/> |
978 | 110 | <field name="partner_id" ref="base.res_partner_5"/> | 110 | <field name="partner_id" ref="base.res_partner_5"/> |
979 | 111 | <field name="section_id" ref="crm.section_sales_department"/> | 111 | <field name="section_id" ref="crm.section_sales_department"/> |
980 | @@ -172,7 +172,7 @@ | |||
981 | 172 | 172 | ||
982 | 173 | <record id="crm_case_newfeaturestobeadded0" model="project.issue"> | 173 | <record id="crm_case_newfeaturestobeadded0" model="project.issue"> |
983 | 174 | <field eval="time.strftime('%Y-%m-01 12:15:10')" name="date"/> | 174 | <field eval="time.strftime('%Y-%m-01 12:15:10')" name="date"/> |
985 | 175 | <field name="priority">4</field> | 175 | <field name="priority">0</field> |
986 | 176 | <field name="user_id" ref="base.user_root"/> | 176 | <field name="user_id" ref="base.user_root"/> |
987 | 177 | <field name="partner_id" ref="base.res_partner_8"/> | 177 | <field name="partner_id" ref="base.res_partner_8"/> |
988 | 178 | <field name="section_id" ref="crm.section_sales_department"/> | 178 | <field name="section_id" ref="crm.section_sales_department"/> |
989 | @@ -199,7 +199,7 @@ | |||
990 | 199 | 199 | ||
991 | 200 | <record id="crm_case_includeattendancesheetinproject0" model="project.issue"> | 200 | <record id="crm_case_includeattendancesheetinproject0" model="project.issue"> |
992 | 201 | <field eval="time.strftime('%Y-%m-10 17:05:30')" name="date"/> | 201 | <field eval="time.strftime('%Y-%m-10 17:05:30')" name="date"/> |
994 | 202 | <field name="priority">3</field> | 202 | <field name="priority">1</field> |
995 | 203 | <field name="user_id" ref="base.user_root"/> | 203 | <field name="user_id" ref="base.user_root"/> |
996 | 204 | <field name="partner_id" ref="base.res_partner_10"/> | 204 | <field name="partner_id" ref="base.res_partner_10"/> |
997 | 205 | <field name="section_id" ref="crm.section_sales_department"/> | 205 | <field name="section_id" ref="crm.section_sales_department"/> |
998 | @@ -213,7 +213,7 @@ | |||
999 | 213 | 213 | ||
1000 | 214 | <record id="crm_case_createnewobject0" model="project.issue"> | 214 | <record id="crm_case_createnewobject0" model="project.issue"> |
1001 | 215 | <field eval="time.strftime('%Y-%m-15 10:35:15')" name="date"/> | 215 | <field eval="time.strftime('%Y-%m-15 10:35:15')" name="date"/> |
1003 | 216 | <field name="priority">3</field> | 216 | <field name="priority">1</field> |
1004 | 217 | <field name="user_id" ref="base.user_root"/> | 217 | <field name="user_id" ref="base.user_root"/> |
1005 | 218 | <field name="partner_id" ref="base.res_partner_6"/> | 218 | <field name="partner_id" ref="base.res_partner_6"/> |
1006 | 219 | <field name="section_id" ref="crm.section_sales_department"/> | 219 | <field name="section_id" ref="crm.section_sales_department"/> |
1007 | @@ -226,7 +226,7 @@ | |||
1008 | 226 | 226 | ||
1009 | 227 | <record id="crm_case_improvereportsinhrms0" model="project.issue"> | 227 | <record id="crm_case_improvereportsinhrms0" model="project.issue"> |
1010 | 228 | <field eval="time.strftime('%Y-%m-19 12:15:00')" name="date"/> | 228 | <field eval="time.strftime('%Y-%m-19 12:15:00')" name="date"/> |
1012 | 229 | <field name="priority">4</field> | 229 | <field name="priority">0</field> |
1013 | 230 | <field name="user_id" ref="base.user_root"/> | 230 | <field name="user_id" ref="base.user_root"/> |
1014 | 231 | <field name="partner_id" ref="base.res_partner_11"/> | 231 | <field name="partner_id" ref="base.res_partner_11"/> |
1015 | 232 | <field name="section_id" ref="crm.section_sales_department"/> | 232 | <field name="section_id" ref="crm.section_sales_department"/> |
1016 | 233 | 233 | ||
1017 | === modified file 'project_issue/project_issue_view.xml' | |||
1018 | --- project_issue/project_issue_view.xml 2014-05-02 13:07:53 +0000 | |||
1019 | +++ project_issue/project_issue_view.xml 2014-05-08 15:35:32 +0000 | |||
1020 | @@ -52,13 +52,12 @@ | |||
1021 | 52 | options="{'fold_field': 'fold'}"/> | 52 | options="{'fold_field': 'fold'}"/> |
1022 | 53 | </header> | 53 | </header> |
1023 | 54 | <sheet string="Issue"> | 54 | <sheet string="Issue"> |
1024 | 55 | <div class="oe_right"> | ||
1025 | 56 | <field name="kanban_state" class="oe_inline" widget="kanban_state_selection"/> | ||
1026 | 57 | </div> | ||
1027 | 55 | <label for="name" class="oe_edit_only"/> | 58 | <label for="name" class="oe_edit_only"/> |
1028 | 56 | <h1> | 59 | <h1> |
1029 | 57 | <field name="name" class="oe_inline"/> | 60 | <field name="name" class="oe_inline"/> |
1030 | 58 | <field name="kanban_state" invisible='1'/> | ||
1031 | 59 | <button name="set_kanban_state_done" help="In Progress" attrs="{'invisible': [('kanban_state', 'in', ['done','blocked'])]}" type="object" icon="gtk-normal" class="oe_link oe_right"/> | ||
1032 | 60 | <button name="set_kanban_state_blocked" help="Ready for Next Stage" attrs="{'invisible': [('kanban_state', 'in', ['normal','blocked'])]}" type="object" icon="gtk-yes" class="oe_link oe_right"/> | ||
1033 | 61 | <button name="set_kanban_state_normal" help="Blocked" attrs="{'invisible': [('kanban_state', 'in', ['done','normal'])]}" type="object" icon="gtk-no" class="oe_link oe_right"/> | ||
1034 | 62 | </h1> | 61 | </h1> |
1035 | 63 | <label for="categ_ids" class="oe_edit_only"/> | 62 | <label for="categ_ids" class="oe_edit_only"/> |
1036 | 64 | <field name="categ_ids" widget="many2many_tags"/> | 63 | <field name="categ_ids" widget="many2many_tags"/> |
1037 | @@ -78,7 +77,7 @@ | |||
1038 | 78 | <group> | 77 | <group> |
1039 | 79 | <field name="id"/> | 78 | <field name="id"/> |
1040 | 80 | <field name="version_id" groups="base.group_user"/> | 79 | <field name="version_id" groups="base.group_user"/> |
1042 | 81 | <field name="priority" groups="base.group_user"/> | 80 | <field name="priority" groups="base.group_user" widget="priority"/> |
1043 | 82 | <label for="task_id" groups="base.group_user"/> | 81 | <label for="task_id" groups="base.group_user"/> |
1044 | 83 | <div groups="base.group_user"> | 82 | <div groups="base.group_user"> |
1045 | 84 | <field name="task_id" on_change="onchange_task_id(task_id)" class="oe_inline" context="{'default_project_id':project_id}"/> | 83 | <field name="task_id" on_change="onchange_task_id(task_id)" class="oe_inline" context="{'default_project_id':project_id}"/> |
1046 | @@ -217,34 +216,15 @@ | |||
1047 | 217 | <field name="partner_id"/> <br/> | 216 | <field name="partner_id"/> <br/> |
1048 | 218 | <field name="version_id"/> | 217 | <field name="version_id"/> |
1049 | 219 | </div> | 218 | </div> |
1050 | 219 | <div class="oe_kanban_bottom_right"> | ||
1051 | 220 | <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar pull-right"/> | ||
1052 | 221 | <div class="pull-left" groups="base.group_user"> | ||
1053 | 222 | <field name="kanban_state" widget="kanban_state_selection"/> | ||
1054 | 223 | <field name="priority" widget="priority"/> | ||
1055 | 224 | </div> | ||
1056 | 225 | </div> | ||
1057 | 220 | <div class="oe_kanban_footer_left"> | 226 | <div class="oe_kanban_footer_left"> |
1058 | 221 | <field name="categ_ids"/> | 227 | <field name="categ_ids"/> |
1059 | 222 | <div class="oe_right"> | ||
1060 | 223 | <span class="oe_kanban_highlight" groups="base.group_user"> | ||
1061 | 224 | <a t-if="record.kanban_state.raw_value === 'normal'" type="object" string="In Progress" name="set_kanban_state_done" class="oe_kanban_status"> </a> | ||
1062 | 225 | <a t-if="record.kanban_state.raw_value === 'done'" type="object" string="Ready for next stage" name="set_kanban_state_blocked" class="oe_kanban_status oe_kanban_status_green"> </a> | ||
1063 | 226 | <a t-if="record.kanban_state.raw_value === 'blocked'" type="object" string="Blocked" name="set_kanban_state_normal" class="oe_kanban_status oe_kanban_status_red"> </a> | ||
1064 | 227 | <t t-set="priority" t-value="record.priority.raw_value || 5"/> | ||
1065 | 228 | <a type="object" name="set_priority" args="['3']" t-if="priority gt 3" title="Normal Priority"> | ||
1066 | 229 | <img src="/web/static/src/img/icons/star-off.png" width="16" height="16"/> | ||
1067 | 230 | </a> | ||
1068 | 231 | <a type="object" name="set_priority" args="['5']" t-if="priority lte 3" title="Normal Priority"> | ||
1069 | 232 | <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 3 ? 'on' : 'off'}.png" width="16" height="16"/> | ||
1070 | 233 | </a> | ||
1071 | 234 | <a type="object" name="set_priority" args="['2']" title="High Priority"> | ||
1072 | 235 | <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 2 ? 'on' : 'off'}.png" width="16" height="16"/> | ||
1073 | 236 | </a> | ||
1074 | 237 | <a type="object" name="set_priority" args="['1']" title="Highest Priority"> | ||
1075 | 238 | <img t-attf-src="/web/static/src/img/icons/star-#{priority == 1 ? 'on' : 'off'}.png" width="16" height="16"/> | ||
1076 | 239 | </a> | ||
1077 | 240 | </span> | ||
1078 | 241 | <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())"> | ||
1079 | 242 | <span t-attf-class="oe_kanban_status oe_kaban_status_red"> </span> | ||
1080 | 243 | </t> | ||
1081 | 244 | <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/> | ||
1082 | 245 | </div> | ||
1083 | 246 | </div> | ||
1084 | 247 | <div class="oe_kanban_footer_left"> | ||
1085 | 248 | <t t-raw="record.message_summary.raw_value"/> | 228 | <t t-raw="record.message_summary.raw_value"/> |
1086 | 249 | </div> | 229 | </div> |
1087 | 250 | </div> | 230 | </div> |
1088 | 251 | 231 | ||
1089 | === modified file 'project_issue/report/project_issue_report.py' | |||
1090 | --- project_issue/report/project_issue_report.py 2013-10-27 12:31:04 +0000 | |||
1091 | +++ project_issue/report/project_issue_report.py 2014-05-08 15:35:32 +0000 | |||
1092 | @@ -47,7 +47,7 @@ | |||
1093 | 47 | 'delay_close': fields.float('Avg. Delay to Close', digits=(16,2), readonly=True, group_operator="avg", | 47 | 'delay_close': fields.float('Avg. Delay to Close', digits=(16,2), readonly=True, group_operator="avg", |
1094 | 48 | help="Number of Days to close the project issue"), | 48 | help="Number of Days to close the project issue"), |
1095 | 49 | 'company_id' : fields.many2one('res.company', 'Company'), | 49 | 'company_id' : fields.many2one('res.company', 'Company'), |
1097 | 50 | 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), | 50 | 'priority': fields.selection([('0','Low'), ('1','Normal'), ('2','High')], 'Priority'), |
1098 | 51 | 'project_id':fields.many2one('project.project', 'Project',readonly=True), | 51 | 'project_id':fields.many2one('project.project', 'Project',readonly=True), |
1099 | 52 | 'version_id': fields.many2one('project.issue.version', 'Version'), | 52 | 'version_id': fields.many2one('project.issue.version', 'Version'), |
1100 | 53 | 'user_id' : fields.many2one('res.users', 'Assigned to',readonly=True), | 53 | 'user_id' : fields.many2one('res.users', 'Assigned to',readonly=True), |