Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/addons-training-usability-ysa into lp:~openobject-training/openobject-addons/training

  1. addons-training-usability-ysa
  2. Merge into training
Proposed by Yogesh (SerpentCS)
Status: Merged
Merged at revision: 2133
Proposed branch: lp:~openerp-dev/openobject-addons/addons-training-usability-ysa
Merge into: lp:~openobject-training/openobject-addons/training
Diff against target: 875 lines (+163/-173)
7 files modified
training/purchase_view.xml (+8/-7)
training/training_content_review_view.xml (+8/-16)
training/training_email_view.xml (+5/-4)
training/training_holiday_view.xml (+3/-4)
training/training_view.xml (+129/-132)
training_exam/training_exam_view.xml (+3/-3)
training_intra/training_intra_view.xml (+7/-7)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/addons-training-usability-ysa
Reviewer Review Type Date Requested Status
OpenObject Training Pending
Review via email: mp+53961@code.launchpad.net

Description of the change

Improve usability issue in training module.

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 'training/purchase_view.xml'
2--- training/purchase_view.xml 2010-09-12 18:40:00 +0000
3+++ training/purchase_view.xml 2011-03-18 09:43:28 +0000
4@@ -8,13 +8,14 @@
5 <field name="inherit_id" ref="purchase.purchase_order_form" />
6 <field name="arch" type="xml">
7 <data>
8- <field name="invoice_id" position="replace">
9- <group colspan="2" col="3">
10- <field name="invoice_id" readonly="1" />
11- <group attrs="{'invisible' : [('invoice_id', '!=', False)]}" col="1" colspan="1">
12- <button states="approved" name="action_invoice_create" string="Create Invoice" type="object" />
13- </group>
14- </group>
15+ <field name="invoice_ids" position="replace">
16+<!-- <group colspan="2" col="3">-->
17+ <!-- Need to be Fixed -->
18+ <field name="invoice_ids" groups="base.group_extended" nolabel="1" colspan="4" context="{'type':'in_invoice', 'journal_type': 'purchase'}"/>
19+<!-- <group attrs="{'invisible' : [('invoice_ids', '!=', False)]}" col="1" colspan="1">-->
20+ <button states="approved" name="action_invoice_create" colspan="4" string="Create Invoice" type="object" icon='gtk-new'/>
21+<!-- </group>-->
22+<!-- </group>-->
23 </field>
24 <field name="pricelist_id" position="before">
25 <field name="seance_id"/>
26
27=== modified file 'training/training_content_review_view.xml'
28--- training/training_content_review_view.xml 2011-03-14 10:48:46 +0000
29+++ training/training_content_review_view.xml 2011-03-18 09:43:28 +0000
30@@ -296,9 +296,9 @@
31 <field name="state"/>
32 <button name="signal_draft" string="Draft" states="done,cancelled" icon="terp-document-new"/>
33 <button name="signal_cancel" string="Cancel" states="draft,validated,inprogress" icon="gtk-cancel"/>
34- <button name="signal_validate" string="Validate" states="draft" icon="gtk-ok"/>
35+ <button name="signal_validate" string="Validate" states="draft" icon="gtk-go-forward"/>
36 <button name="signal_inprogress" string="In Progress" states="validated" icon="terp-tools" />
37- <button name="signal_done" string="Done" states="inprogress" icon="terp-go-home"/>
38+ <button name="signal_done" string="Done" states="inprogress" icon="gtk-jump-to"/>
39 </group>
40 </form>
41 </field>
42@@ -312,10 +312,9 @@
43 <search string="Search Training Email">
44 <group colspan='4'>
45 <filter icon="terp-document-new" string="Draft" domain="[('state','=', 'draft')]"/>
46- <filter icon="gtk-ok" string="Validated" domain="[('state','=', 'validated')]"/>
47+ <filter icon="gtk-go-forward" string="Validated" domain="[('state','=', 'validated')]"/>
48 <filter icon="terp-tools" string="Inprogress" domain="[('state','=', 'inprogress')]"/>
49- <filter icon="terp-go-home" string="Done" domain="[('state','=', 'done')]"/>
50- <filter icon="gtk-cancel" string="Cancel" domain="[('state','=', 'cancelled')]"/>
51+ <filter icon="gtk-jump-to" string="Done" domain="[('state','=', 'done')]"/>
52 <separator orientation="vertical"/>
53 <field name="reason_id"/>
54 <field name="type"/>
55@@ -324,19 +323,12 @@
56 </group>
57 <newline/>
58 <group expand="0" string="Group By..." colspan="4">
59- <filter string="Reason" icon="terp-personal" domain="[]" context="{'group_by':'reason_id'}"/>
60- <filter string="Type" icon="terp-report" domain="[]" context="{'group_by':'type'}"/>
61+ <filter string="Reason" icon="terp-tools" domain="[]" context="{'group_by':'reason_id'}"/>
62 <filter string="Course" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'course_id'}"/>
63+ <separator orientation="vertical"/>
64+ <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
65+ <separator orientation="vertical"/>
66 <filter string="Follow By" icon="terp-stage" domain="[]" context="{'group_by':'followup_by'}"/>
67- <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
68- </group>
69- <newline/>
70- <group expand="0" string="Extended..." colspan="4">
71- <field name="ref"/>
72- <field name="seance_next_date"/>
73- <field name="create_date"/>
74- <field name="delivery_date"/>
75- <field name="followup_by"/>
76 </group>
77 </search>
78 </field>
79
80=== modified file 'training/training_email_view.xml'
81--- training/training_email_view.xml 2011-03-14 10:48:46 +0000
82+++ training/training_email_view.xml 2011-03-18 09:43:28 +0000
83@@ -43,7 +43,7 @@
84 <group col="5" colspan="4">
85 <field name="state" />
86 <button name="draft_cb" string="_Draft" type="object" icon="terp-document-new" states="deprecated" />
87- <button name="validate_cb" string="_Validate" type="object" icon="terp-accessories-archiver" states="draft" />
88+ <button name="validate_cb" string="_Validate" type="object" icon="gtk-go-forward" states="draft" />
89 <button name="deprecate_cb" string="Deprecate" type="object" icon="terp-dialog-close" states="validated,draft" />
90 </group>
91 </form>
92@@ -76,7 +76,7 @@
93 <search string="Search Training Email">
94 <group col='10' colspan='4'>
95 <filter icon="terp-document-new" string="Draft" domain="[('state','=', 'draft')]"/>
96- <filter icon="terp-accessories-archiver" string="Validated" domain="[('state','=', 'validated')]"/>
97+ <filter icon="gtk-go-forward" string="Validated" domain="[('state','=', 'validated')]"/>
98 <filter icon="terp-dialog-close" string="Deprecated" domain="[('state','=', 'deprecated')]"/>
99 <separator orientation="vertical"/>
100 <field name="subject"/>
101@@ -89,8 +89,9 @@
102 <filter string="Smtp Client" icon="terp-personal" domain="[]" context="{'group_by':'smtp_client_id'}"/>
103 <filter string="Layout" icon="terp-report" domain="[]" context="{'group_by':'layout_id'}"/>
104 <separator orientation="vertical"/>
105+ <filter string="Target" icon="terp-stage" domain="[]" context="{'group_by':'target'}"/>
106+ <separator orientation="vertical"/>
107 <filter string="Trigger" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'trigger'}"/>
108- <filter string="Target" icon="terp-stage" domain="[]" context="{'group_by':'target'}"/>
109 <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
110 </group>
111 </search>
112@@ -234,7 +235,7 @@
113 <field name="search_view_id" ref="training_email_layout_search"/>
114 </record>
115
116- <menuitem parent="training_config_mi" id="training_email_all_emails_mi" name="Emails" sequence='50'/>
117+ <menuitem parent="training_config_mi" id="training_email_all_emails_mi" name="Emails" sequence='1'/>
118 <menuitem parent="training_email_all_emails_mi" id="training_email_all_mi"
119 action="training_email_all_act" sequence='1'/>
120 <menuitem parent="training_email_all_emails_mi" id="training_email_stylegroup_mi"
121
122=== modified file 'training/training_holiday_view.xml'
123--- training/training_holiday_view.xml 2011-03-14 10:48:46 +0000
124+++ training/training_holiday_view.xml 2011-03-18 09:43:28 +0000
125@@ -56,14 +56,13 @@
126 <separator orientation="vertical"/>
127 <field name="name"/>
128 <field name="year_id"/>
129- <field name="date_start"/>
130- <field name="date_stop"/>
131 <field name="contact_id"/>
132 </group>
133 <newline/>
134 <group expand="0" string="Group By..." colspan="4" col="20">
135+ <filter string="Contact" icon="terp-personal" domain="[]" context="{'group_by':'contact_id'}"/>
136+ <separator orientation="vertical"/>
137 <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year_id'}"/>
138- <filter string="Contact" icon="terp-personal" domain="[]" context="{'group_by':'contact_id'}"/>
139 </group>
140 </search>
141 </field>
142@@ -77,7 +76,7 @@
143 <field name="search_view_id" ref="holiday_period_search"/>
144 </record>
145
146- <menuitem id="holiday_mi" name="Non-Working Days" parent="training_config_mi" sequence='60'/>
147+ <menuitem id="holiday_mi" name="Non-Working Days" parent="training_config_mi" sequence='2'/>
148 <menuitem id="holiday_period_all_mi" action="holiday_period_all_act" parent="holiday_mi" />
149
150 <record model="ir.ui.view" id="holiday_year_tree">
151
152=== modified file 'training/training_view.xml'
153--- training/training_view.xml 2011-03-14 10:48:46 +0000
154+++ training/training_view.xml 2011-03-18 09:43:28 +0000
155@@ -43,8 +43,6 @@
156 <search string="Search Training Course Theme">
157 <field name="name"/>
158 <field name="parent_id"/>
159- <field name="priority"/>
160- <field name="active"/>
161 <field name="nr"/>
162 </search>
163 </field>
164@@ -113,10 +111,14 @@
165 <field name="arch" type="xml">
166 <search string="Search Training Course Category">
167 <field name="complete_name" string="Code"/>
168- <field name="price_list_id"/>
169 <field name="parent_id" string="Parent" widget="selection"/>
170 <field name="price_list_id" widget="selection"/>
171- <field name="description"/>
172+ <newline/>
173+ <group expand="0" string="Group By...">
174+ <filter string="Parent" icon="terp-personal" domain="[]" context="{'group_by' : 'parent_id'}" />
175+ <separator orientation="vertical"/>
176+ <filter string="Pricelist" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by' : 'price_list_id'}" />
177+ </group>
178 </search>
179 </field>
180 </record>
181@@ -321,7 +323,7 @@
182 <field name="state_course" />
183 <button string="Deprecate" icon="terp-dialog-close" type="workflow" name="signal_deprecate" attrs="{'invisible' : [('state_course', '!=', 'validated')]}"
184 confirm="Do you want to deprecate this course ?" />
185- <button string="Validate" icon="terp-accessories-archiver" type="workflow" name="signal_validate" attrs="{'invisible' : [('state_course', '!=', 'pending'),('state_course', '!=', 'draft')]}"
186+ <button string="Validate" icon="gtk-go-forward" type="workflow" name="signal_validate" attrs="{'invisible' : [('state_course', '!=', 'pending'),('state_course', '!=', 'draft')]}"
187 confirm="Do you want to validate this course ?" />
188 <button string="Reset to Draft" icon="terp-document-new" type="object" name="reset_to_draft" attrs="{'invisible' : [('state_course', '!=', 'deprecated')]}" />
189 </group>
190@@ -338,7 +340,7 @@
191 <search string="Search Training Email">
192 <group colspan='4'>
193 <filter icon="terp-document-new" string="Draft" domain="[('state','=', 'draft')]"/>
194- <filter icon="terp-accessories-archiver" string="Validated" domain="[('state','=', 'validated')]"/>
195+ <filter icon="gtk-go-forward" string="Validated" domain="[('state','=', 'validated')]"/>
196 <filter icon="terp-dialog-close" string="Deprecated" domain="[('state','=', 'deprecated')]"/>
197 <separator orientation="vertical"/>
198 <field name="name"/>
199@@ -348,12 +350,13 @@
200 </group>
201 <newline/>
202 <group expand="0" string="Group By..." colspan="4">
203- <filter string="Splitted By" icon="terp-personal" domain="[]" context="{'group_by':'splitted_by'}"/>
204- <filter string="MAster Course" icon="terp-report" domain="[]" context="{'group_by':'reference_id'}"/>
205+ <filter string="Master Course" icon="terp-report" domain="[]" context="{'group_by':'reference_id'}"/>
206+ <separator orientation="vertical"/>
207+ <filter string="Lang" icon="terp-stage" domain="[]" context="{'group_by':'lang_id'}"/>
208+ <separator orientation="vertical"/>
209+ <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
210+ <separator orientation="vertical"/>
211 <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'course_type_id'}"/>
212- <filter string="Kind" icon="terp-stage" domain="[]" context="{'group_by':'kind'}"/>
213- <filter string="lang_id" icon="terp-stage" domain="[]" context="{'group_by':'lang_id'}"/>
214- <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
215 </group>
216 </search>
217 </field>
218@@ -410,7 +413,7 @@
219 <field name="name" string="Short Name" />
220 <field name="category_id" string="Product Line" />
221 <field name="duration" widget="float_time" />
222- <field name="state_course" />
223+ <field name="state" />
224 <field name="has_support" />
225 <field name="reference_id" />
226 <field name="lang_id"/>
227@@ -428,6 +431,7 @@
228 <field name="view_type">form</field>
229 <field name="view_mode">tree,form</field>
230 <field name="domain">[('p_id', '=', False)]</field>
231+ <field name="search_view_id" ref="course_subcourse_search"/>
232 </record>
233
234 <record model="ir.ui.view" id="course_subcourse_tree">
235@@ -483,12 +487,12 @@
236 <group colspan="4" col="6">
237 <field name="state" />
238 <button name="signal_validate" string="Validate" type="workflow" states="draft"
239- confirm="Do you want to validate this catalog ?" />
240+ confirm="Do you want to validate this catalog ?" icon="gtk-go-forward"/>
241 <button name="signal_cancel" string="Cancel" type="workflow" states="validated,inprogress"
242- confirm="Do you want to cancel this catalog ?"/>
243- <button name="signal_inprogress" string="In Progress" type="workflow" states="validated" />
244+ confirm="Do you want to cancel this catalog ?" icon="gtk-cancel"/>
245+ <button name="signal_inprogress" string="In Progress" type="workflow" states="validated" icon="gtk-go-forward" />
246 <button name="signal_deprecate" string="Deprecate" type="workflow" states="inprogress"
247- confirm="Do you want to deprecate this catalog ?"/>
248+ confirm="Do you want to deprecate this catalog ?" icon="gtk-apply" />
249 </group>
250 </form>
251 </field>
252@@ -518,7 +522,7 @@
253 <filter icon="terp-go-year" string="Current" domain="[('year', '=', time.strftime('%%Y'))]" />
254 <filter icon="terp-document-new" string="Draft" domain="[('state','=', 'draft')]"/>
255 <filter icon="terp-check" string="In Progress" domain="[('state','=', 'inprogress')]"/>
256- <filter icon="terp-accessories-archiver" string="Validated" domain="[('state','=', 'validated')]"/>
257+ <filter icon="gtk-go-forward" string="Validated" domain="[('state','=', 'validated')]"/>
258 <filter icon="terp-dialog-close" string="Deprecated" domain="[('state','=', 'deprecated')]"/>
259 <filter icon="gtk-cancel" string="Cancel" domain="[('state','=', 'cancelled')]"/>
260 <separator orientation="vertical"/>
261@@ -527,9 +531,9 @@
262 <field name="state"/>
263 <newline/>
264 <group expand="0" string="Group By..." >
265+ <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
266+ <separator orientation="vertical"/>
267 <filter string="Year" icon="terp-go-month" domain="[]" context="{'group_by':'year'}"/>
268- <filter string="Name" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'name'}"/>
269- <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
270 </group>
271 </search>
272 </field>
273@@ -540,6 +544,7 @@
274 <field name="res_model">training.catalog</field>
275 <field name="view_type">form</field>
276 <field name="view_mode">tree,form</field>
277+ <field name="search_view_id" ref="training_catalog_filter"/>
278 </record>
279
280 <record model="ir.ui.view" id="training_session_form">
281@@ -633,12 +638,12 @@
282 <group colspan="4" col="3">
283 <field name="state" />
284 <group col="6" groups="training.group_session_manager">
285- <button name="signal_open" string="Open" type="workflow" states="draft" confirm="Do you want to open this session ?"/>
286- <button name="signal_open_confirm" string="Confirm" type="workflow" states="opened" confirm="Do you want to confirm this session ?" />
287- <button name="signal_close_confirm" string="Close Subscriptions" type="workflow" states="opened_confirmed" confirm="Do you want to close the subscription for this session ?" />
288- <button name="signal_inprogress" string="Start" type="workflow" states="closed_confirmed" confirm="Do you want to close this session for the subscription ?" />
289- <button name="signal_close" string="Close" type="workflow" states="inprogress" confirm="Do you want to close this session ?" />
290- <button name="signal_cancel" string="Cancel" type="workflow" states="draft,opened,opened_confirmed,closed_confirmed" confirm="Do you want to cancel this session ?"/>
291+ <button name="signal_open" string="Open" type="workflow" states="draft" confirm="Do you want to open this session ?" icon="gtk-apply"/>
292+ <button name="signal_open_confirm" string="Confirm" type="workflow" states="opened" confirm="Do you want to confirm this session ?" icon="gtk-convert"/>
293+ <button name="signal_close_confirm" string="Close Subscriptions" type="workflow" states="opened_confirmed" confirm="Do you want to close the subscription for this session ?" icon="terp-dialog-close"/>
294+ <button name="signal_inprogress" string="Start" type="workflow" states="closed_confirmed" confirm="Do you want to close this session for the subscription ?" icon="gtk-convert"/>
295+ <button name="signal_close" string="Close" type="workflow" states="inprogress" confirm="Do you want to close this session ?" icon="terp-dialog-close"/>
296+ <button name="signal_cancel" string="Cancel" type="workflow" states="draft,opened,opened_confirmed,closed_confirmed" confirm="Do you want to cancel this session ?" icon="gtk-cancel"/>
297 </group>
298 </group>
299 </form>
300@@ -722,20 +727,21 @@
301 <field name="arch" type="xml">
302 <search string="Search Session">
303 <filter icon="terp-document-new" string="Draft" domain="[('state', '=', 'draft')]" />
304- <filter icon="terp-gtk-media-pause" string="Open" domain="[('state', '=', 'opened')]" />
305+ <filter icon="gtk-open" string="Open" domain="[('state', '=', 'opened')]" />
306 <filter icon="terp-camera_test" string="Confirm" domain="[('state', 'in', ('opened_confirmed', 'closed_confirmed', 'inprogress'))]" />
307 <filter icon="terp-check" string="Futur" domain="[('date', '>=', current_date),('state', '!=', 'closed'),('state', '!=', 'cancelled')]" />
308- <filter icon="gtk-cancel" string="Cancel" domain="[('state','=', 'cancelled')]"/>
309+ <filter icon="gtk-cancel" string="Cancel" domain="[('state','=', 'cancelled')]" />
310 <separator orientation="vertical"/>
311 <field name="name"/>
312- <field name="state" />
313 <field name="kind"/>
314 <field name="offer_id" />
315 <newline/>
316 <group expand="0" string="Group By...">
317- <filter string="Name" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'name'}"/>
318 <filter string="Offer" icon="terp-check" domain="[]" context="{'group_by':'offer_id'}"/>
319+ <separator orientation="vertical"/>
320 <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
321+ <separator orientation="vertical"/>
322+ <filter string="Catalog" icon="gtk-jump-to" domain="[]" context="{'group_by':'catalog_id'}"/>
323 </group>
324 </search>
325 </field>
326@@ -777,9 +783,9 @@
327 <separator string="" colspan="4" />
328 <group colspan="4" col="5">
329 <field name="state" invisible="1" />
330- <button string="Cancel" type="object" special="cancel" name="action_close" states="selection"/>
331- <button string="Close" type="object" special="cancel" name="action_close" states="result" />
332- <button string="Generate Reports" type="object" name="action_generate_zip" states="selection"/>
333+ <button string="Cancel" type="object" special="cancel" name="action_close" states="selection" icon="gtk-cancel"/>
334+ <button string="Close" type="object" special="cancel" name="action_close" states="result" icon="terp-dialog-close"/>
335+ <button string="Generate Reports" type="object" name="action_generate_zip" states="selection" icon="gtk-execute"/>
336 </group>
337 </form>
338 </field>
339@@ -909,15 +915,15 @@
340 <group colspan="4" col="3">
341 <field name="state" />
342 <group col="5" groups="training.group_seance_manager">
343- <button name="seance_confirm" string="Confirm" type="workflow" states="opened" confirm="Do you want to confirm this seance (procurements, ...) ?" />
344- <button name="action_do_confirm" string="Re-generate Purchase" type="object" states="confirmed,inprogress" confirm="Are you sure you want to regenerate all purchases for this seance?" groups="training.group_seance_manager"/>
345- <button name="signal_inprogress" string="Start" type="workflow" states="confirmed" confirm="Do you want to start this seance ?" />
346- <button name="signal_close" string="Close" type="workflow" states="inprogress" confirm="Do you want to close this seance ?" />
347- <button name="signal_cancel" string="Cancel" type="workflow" states="opened,confirmed" confirm="Do you want to cancel this seance ?" />
348- <button name="signal_seance_done" string="Done" type="workflow" states="closed" />
349+ <button name="seance_confirm" string="Confirm" type="workflow" states="opened" confirm="Do you want to confirm this seance (procurements, ...) ?" icon="gtk-apply"/>
350+ <button name="action_do_confirm" string="Re-generate Purchase" type="object" states="confirmed,inprogress" confirm="Are you sure you want to regenerate all purchases for this seance?" groups="training.group_seance_manager" icon="gtk-convert"/>
351+ <button name="signal_inprogress" string="Start" type="workflow" states="confirmed" confirm="Do you want to start this seance ?" icon="terp-camera_test"/>
352+ <button name="signal_close" string="Close" type="workflow" states="inprogress" confirm="Do you want to close this seance ?" icon="terp-dialog-close"/>
353+ <button name="signal_cancel" string="Cancel" type="workflow" states="opened,confirmed" confirm="Do you want to cancel this seance ?" icon="gtk-cancel"/>
354+ <button name="signal_seance_done" string="Done" type="workflow" states="closed" icon="gtk-jump-to"/>
355 </group>
356 </group>
357- <button name="%(seance_generate_zip_wizard_act)d" type="action" string="Generate Reports" colspan="4" groups="training.group_training"/>
358+ <button name="%(seance_generate_zip_wizard_act)d" icon="gtk-execute" type="action" string="Generate Reports" colspan="4" groups="training.group_training"/>
359 </form>
360 </field>
361 </record>
362@@ -1019,14 +1025,13 @@
363 <field name="name"/>
364 <field name="group_id" />
365 <field name="date"/>
366- <field name="duration" />
367- <field name="state" />
368 <newline/>
369 <group expand="0" string="Group By...">
370- <filter string="Name" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'name'}"/>
371 <filter string="Group" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'group_id'}"/>
372+ <separator orientation="vertical"/>
373+ <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
374+ <separator orientation="vertical"/>
375 <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
376- <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
377 </group>
378 </search>
379 </field>
380@@ -1131,7 +1136,7 @@
381 <field name="paid" />
382 </group>
383 <group states="confirmed,done">
384- <button name="action_create_invoice" string="Create Invoice" type="object" attrs="{'invisible': [('invoice_line_id', '!=', False)]}"/>
385+ <button name="action_create_invoice" icon="gtk-new" string="Create Invoice" type="object" attrs="{'invisible': [('invoice_line_id', '!=', False)]}"/>
386 </group>
387 </group>
388 </group>
389@@ -1159,10 +1164,10 @@
390 </notebook>
391 <group colspan="4" col="6">
392 <field name="state" />
393- <button string="Confirm Request" type="workflow" name="signal_confirm" states="draft"
394- confirm="Do you want to confirm the request for this subscription ?" />
395+ <button string="Confirm Request" type="workflow" name="signalsubscription_confirm" states="draft"
396+ confirm="Do you want to confirm the request for this subscription ?" icon="gtk-convert"/>
397 <button string="Cancel" type="workflow" name="signal_cancel" states="draft"
398- confirm="Do you want to cancel this subscription ?" />
399+ confirm="Do you want to cancel this subscription ?" icon="gtk-cancel"/>
400 </group>
401 </form>
402 </field>
403@@ -1192,22 +1197,20 @@
404 <field name="priority">1</field>
405 <field name="arch" type="xml">
406 <search string="Search Subscription">
407- <filter icon="terp-document-new" string="Validate" domain="[('state', '=', 'draft')]" />
408+ <filter icon="gtk-go-forward" string="Validate" domain="[('state', '=', 'draft')]" />
409 <filter icon="terp-check" string="Invoice" domain="[('state', '=', 'confirmed')]" />
410 <separator orientation="vertical"/>
411 <field name="name"/>
412- <field name="create_date" />
413 <field name="partner_id"/>
414 <field name="responsible_id" />
415- <field name="partner_rh_email" />
416- <field name="state" />
417 <newline/>
418 <group expand="0" string="Group By...">
419- <filter string="Name" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'name'}"/>
420- <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
421+ <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
422 <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'responsible_id'}"/>
423+ <separator orientation="vertical"/>
424+ <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
425+ <separator orientation="vertical"/>
426 <filter string="Create Date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}"/>
427- <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
428 </group>
429 </search>
430 </field>
431@@ -1295,7 +1298,7 @@
432 <group states="end" colspan="4">
433 <label string="The operation has been done with success !" colspan="4" />
434 <separator string="" colspan="4" />
435- <button name="action_done" string="Done" type="object" states="end" />
436+ <button name="action_done" string="Done" type="object" states="end" icon="gtk-jump-to"/>
437 </group>
438
439 <group col="7" colspan="4" attrs="{'invisible' : [('state', '=', 'end')]}">
440@@ -1303,9 +1306,9 @@
441 <field name="state" invisible="1" />
442 <button name="action_cancel" string="Cancel" type="object" special="cancel" icon="gtk-cancel" states="init,replacement,postponement,cancellation"/>
443 <label string="" />
444- <button name="action_cancellation" string="Cancellation" type="object" states="init" />
445- <button name="action_replacement" string="Replacement" type="object" states="init" />
446- <button name="action_postponement" string="Postponement" type="object" states="init" />
447+ <button name="action_cancellation" string="Cancellation" type="object" states="init" icon="gtk-cancel"/>
448+ <button name="action_replacement" string="Replacement" type="object" states="init" icon="terp-gtk-jump-to-rtl"/>
449+ <button name="action_postponement" string="Postponement" type="object" states="init" icon='gtk-go-up'/>
450 <label string="" />
451 <button name="action_apply" string="Apply" type="object" states="cancellation,replacement,postponement" icon="gtk-apply"/>
452 </group>
453@@ -1356,7 +1359,7 @@
454 </group>
455 <group states="confirmed,done" groups="training.group_training">
456 <button name="action_create_invoice" string="Create Invoice" type="object"
457- attrs="{'invisible': [('invoice_line_id', '!=', False)]}" />
458+ attrs="{'invisible': [('invoice_line_id', '!=', False)]}" icon='gtk-new'/>
459 </group>
460 </group>
461 </group>
462@@ -1388,14 +1391,15 @@
463 <group col="9" colspan="4">
464 <field name="state" />
465 <button name="signal_confirm" string="Confirm" type="workflow" states="draft"
466- confirm="Do you want to confirm this subscription line ?"/>
467+ confirm="Do you want to confirm this subscription line ?" icon="gtk-apply"/>
468 <button name="signal_cancel" string="Cancel" type="workflow" states="draft"
469- confirm="Do you want to cancel this subscription line ?" />
470+ confirm="Do you want to cancel this subscription line ?" icon="gtk-cancel"/>
471 <button name="signal_invoice_and_send_emails" string="Cancel (Penalities)" type="workflow" states="confirmed"
472- confirm="Do you want to cancel this subscription line ?" />
473+ confirm="Do you want to cancel this subscription line ?" icon="gtk-cancel"/>
474 <button name="%(training.subscription_cancellation_wizard_act)d"
475 string="Cancel (Free)"
476 type="action"
477+ icon='gtk-execute'
478 groups="training.group_subscription_manager"
479 states="confirmed"
480 context="{'default_state':'cancellation'}"
481@@ -1403,18 +1407,20 @@
482 <button name="%(training.subscription_cancellation_wizard_act)d"
483 string="Replacement"
484 type="action"
485+ icon='gtk-refresh'
486 states="confirmed"
487 groups="training.group_subscription_manager"
488 context="{'default_state':'replacement'}"
489- confirm="Do you want to do a replacement for this subscription line ?" />
490+ confirm="Do you want to do a replacement for this subscription line ?"/>
491 <button name="%(training.subscription_cancellation_wizard_act)d"
492 string="Postponement"
493 type="action"
494 states="confirmed"
495+ icon='gtk-go-up'
496 groups="training.group_subscription_manager"
497 context="{'default_state':'postponement'}"
498 confirm="Do you want to postpone this subscription line ?" />
499- <button name="signal_done" string="Done" type="workflow" states="confirmed" />
500+ <button name="signal_done" string="Done" type="workflow" states="confirmed" icon="gtk-jump-to"/>
501 </group>
502 </form>
503 </field>
504@@ -1495,22 +1501,20 @@
505 <field name="priority">1</field>
506 <field name="arch" type="xml">
507 <search string="Search Subscription">
508- <filter icon="terp-document-new" string="Validate" domain="[('state', '=', 'draft'), ('subscription_id.state', '=', 'confirmed')]" />
509+ <filter icon="gtk-go-forward" string="Validate" domain="[('state', '=', 'draft'), ('subscription_id.state', '=', 'confirmed')]" />
510 <filter icon="terp-check" string="Invoice" domain="[('invoice_line_id', '=', False),('state', 'in', ('done','confirmed')),('subscription_id.state', 'in', ('confirmed', 'done')), ('session_id.state', 'not in', ['cancelled', 'draft']),('price','!=',0)]" />
511 <filter icon="terp-emblem-important" string="To Fix" domain="[('invoice_line_id', '=', False),('state', 'in', ('done','confirmed')),('subscription_id.state', 'in', ('confirmed', 'done')), ('session_id.date', '&lt;', (datetime.datetime.today()+datetime.timedelta(days=1)).strftime('%%Y-%%m-%%d 23:59:59')),('session_id.state','in',['inprogress','closed']),('price','!=',0)]" />
512 <separator orientation="vertical"/>
513- <field name="state" />
514 <field name="name" />
515 <field name="session_id" />
516 <field name="session_state" />
517- <field name="session_date"/>
518- <field name="kind" />
519 <newline/>
520 <group expand="0" string="Group By...">
521- <filter string="Name" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'name'}"/>
522- <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'session_id'}"/>
523+ <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'session_id'}"/>
524+ <separator orientation="vertical"/>
525+ <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
526+ <separator orientation="vertical"/>
527 <filter string="Create Date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}"/>
528- <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
529 </group>
530 </search>
531 </field>
532@@ -1566,8 +1570,8 @@
533 <form string="Procurements Update">
534 <group colspan="4" col="2" states="confirm">
535 <label string="Are you sure you want to update procurements all opened seance in all future session?" colspan="2"/>
536- <button string="Cancel" special="cancel" name="action_close"/>
537- <button string="Confirm" type="object" name="action_confirm"/>
538+ <button string="Cancel" special="cancel" name="action_close" icon='gtk-cancel'/>
539+ <button string="Confirm" type="object" name="action_confirm" icon='gtk-ok'/>
540 </group>
541 <group colspan="4" col="4" states="update" expand="1">
542 <field name="name"/>
543@@ -1687,10 +1691,12 @@
544 </field>
545 <button name="action_load_procurements"
546 type="object"
547+ icon='gtk-execute'
548 string="Load Procurements From Courses" colspan="4"
549 attrs="{'invisible' : [('state', '=', 'validated')]}"/>
550 <button name="%(training_offer_purchase_line_wizard_act)d"
551 type="action"
552+ icon='gtk-execute'
553 string="Update Seance Procurments" colspan="4"/>
554 </page>
555 <page string="Pedagogical Suggestion">
556@@ -1717,12 +1723,12 @@
557 <group col="5" colspan="4">
558 <field name="state" />
559 <button name="signal_validate" string="Validate" type="workflow" states="draft"
560- confirm="Do you want to validate this offer ?"/>
561+ confirm="Do you want to validate this offer ?" icon="gtk-go-forward"/>
562 <button name="signal_deprecate" string="Deprecate" type="workflow" states="validated,draft"
563- confirm="Do you want to deprecate this offer ?" />
564+ confirm="Do you want to deprecate this offer ?" icon="terp-dialog-close"/>
565 <button name="draft_cb" string="Draft" type="object" states="validated,deprecated"
566 confirm="Are you sure to reset to Draft (Check the sessions for this offer) ?"
567- groups="training.group_offer_manager" />
568+ groups="training.group_offer_manager" icon="terp-camera_test"/>
569 </group>
570 </form>
571 </field>
572@@ -1755,24 +1761,22 @@
573 <search string="Search Training Offer">
574 <group col='10' colspan='4'>
575 <filter icon="terp-document-new" string="Draft" domain="[('state','=', 'draft')]"/>
576- <filter icon="terp-accessories-archiver" string="Validated" domain="[('state','=', 'validated')]"/>
577+ <filter icon="gtk-go-forward" string="Validated" domain="[('state','=', 'validated')]"/>
578 <filter icon="terp-dialog-close" string="Deprecated" domain="[('state','=', 'deprecated')]"/>
579 <separator orientation="vertical"/>
580 <field name="name"/>
581 <field name="categorie_id"/>
582 <field name="type_id"/>
583- <field name="kind"/>
584 <field name="product_id"/>
585- <field name="create_date"/>
586- <field name="is_standalone"/>
587 </group>
588 <newline/>
589 <group expand="0" string="Group By..." colspan="4" col="20">
590- <filter string="Category" icon="terp-personal" domain="[]" context="{'group_by':'categorie_id'}"/>
591- <filter string="kind" icon="terp-report" domain="[]" context="{'group_by':'kind'}"/>
592- <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
593- <filter string="Product" icon="terp-stage" domain="[]" context="{'group_by':'product_id'}"/>
594- <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
595+ <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
596+ <filter string="Category" icon="terp-personal" domain="[]" context="{'group_by':'categorie_id'}"/>
597+ <separator orientation="vertical"/>
598+ <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
599+ <separator orientation="vertical"/>
600+ <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
601 </group>
602 </search>
603 </field>
604@@ -1821,9 +1825,9 @@
605 <data>
606 <menuitem id="training_mi" name="Training Management" sequence="2" />
607
608- <menuitem id="training_config_mi" parent="training_mi" name="Configuration" sequence="1"/>
609+ <menuitem id="training_config_mi" parent="training_mi" name="Configuration" sequence="60"/>
610
611- <menuitem id="training_config_library_mi" parent="training_config_mi" name="Library" />
612+ <menuitem id="training_config_library_mi" parent="training_config_mi" name="Library" sequence="1"/>
613 <menuitem id="training_config_library_categ_mi" parent="training_config_library_mi" name="Categorisation" sequence='10'/>
614
615 <menuitem id="course_theme_all_mi" parent="training_config_library_categ_mi" action="course_theme_all_act" sequence='10'/>
616@@ -1930,6 +1934,7 @@
617 <field name="function_id"/>
618 <field name="partner_id" groups="base.group_user" />
619 <field name="present" />
620+ <field name="subscription_id"/>
621 <field name="subscription_line_id" groups="base.group_user" />
622 </tree>
623 </field>
624@@ -1945,21 +1950,16 @@
625 <filter icon="terp-check" string="Present" domain="[('present', '=', 1)]" />
626 <filter icon="terp-emblem-important" string="Absent" domain="[('present', '=', 0)]" />
627 <separator orientation="vertical"/>
628- <field name="date" />
629+ <field name="partner_id" />
630 <field name="seance_id" />
631 <field name="course_id" />
632- <field name="duration" />
633- <field name="contact_firstname" />
634- <field name="contact_lastname" />
635 <field name="function_id"/>
636- <field name="partner_id" />
637- <field name="present" />
638 <field name="subscription_line_id" />
639 <newline/>
640 <group expand="0" string="Group By...">
641+ <filter string="Subscription" icon="gtk-convert" domain="[]" context="{'group_by':'subscription_id'}"/>
642+ <separator orientation="vertical"/>
643 <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
644- <filter string="Seance" icon="terp-check" domain="[]" context="{'group_by':'seance_id'}"/>
645- <filter string="Duration" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'duration'}"/>
646 </group>
647 </search>
648 </field>
649@@ -1972,6 +1972,7 @@
650 <field name="search_view_id" ref="training_participation_lines_filter"/>
651 <field name="view_mode">tree,form</field>
652 <field name="context">{'job_search_context': 'show_past'}</field>
653+ <field name="search_view_id" ref="training_participation_lines_filter"/>
654 </record>
655
656 <menuitem name="Participations" id="training_participation_mi" parent="training_mi" sequence="50" />
657@@ -2027,10 +2028,10 @@
658 </notebook>
659 <group colspan="4" col="10">
660 <field name="state"/>
661- <button type="workflow" name="pshr_validate" string="Validate" states="draft" icon="gtk-ok"
662+ <button type="workflow" name="pshr_validate" string="Validate" states="draft" icon="gtk-go-forward"
663 confirm="Do you want to validate this request ?" />
664- <button type="workflow" name="pshr_request" string="Send Request" states="valid" icon="gtk-new"/>
665- <button type="workflow" name="pshr_resend_email" string="Resend Request Email" states="requested" groups="training.group_training" />
666+ <button type="workflow" name="pshr_request" string="Send Request" states="valid" icon="gtk-convert"/>
667+ <button type="workflow" name="pshr_resend_email" icon="gtk-convert" string="Resend Request Email" states="requested" groups="training.group_training" />
668 <button type="workflow" name="pshr_accept" string="Accept" states="requested,valid" icon="terp-idea"
669 confirm="Do you want to confirm this request ?" />
670 <button type="workflow" name="pshr_refuse" string="Refuse" states="requested" icon="terp-tools"
671@@ -2039,7 +2040,7 @@
672 states="draft,valid,requested,accepted"
673 groups="training.group_request_manager"
674 confirm="Do you want to cancel this request ?" />
675- <button type="workflow" name="pshr_done" string="Done" states="accepted" groups="training.group_request_manager"/>
676+ <button type="workflow" name="pshr_done" string="Done" states="accepted" groups="training.group_request_manager" icon="gtk-jump-to" />
677 </group>
678 </form>
679 </field>
680@@ -2081,30 +2082,24 @@
681 <search string="Search Training Email">
682 <group col='10' colspan='4'>
683 <filter icon="terp-document-new" string="Draft" domain="[('state','=', 'draft')]"/>
684- <filter icon="gtk-ok" string="Valid" domain="[('state','=', 'valid')]"/>
685- <filter icon="gtk-new" string="Requested" domain="[('state','=', 'requested')]"/>
686- <filter icon="terp-tools" string="Refused" domain="[('state','=', 'refused')]"/>
687- <filter icon="gtk-cancel" string="Cancelled" domain="[('state','=', 'cancelled')]"/>
688- <filter icon="terp-go-home" string="Done" domain="[('state','=', 'done')]"/>
689+ <filter icon="gtk-go-forward" string="Valid" domain="[('state','=', 'valid')]"/>
690+ <filter icon="gtk-convert" string="Requested" domain="[('state','=', 'requested')]"/>
691+ <filter icon="gtk-cancel" string="Refused" domain="[('state','=', 'refused')]"/>
692+ <filter icon="gtk-jump-to" string="Done" domain="[('state','=', 'done')]"/>
693 <separator orientation="vertical"/>
694 <field name="reference"/>
695 <field name="session_id"/>
696- <field name="date"/>
697- <field name="kind"/>
698 <field name="job_id"/>
699- <field name="price"/>
700 <field name="amount_to_pay"/>
701- <field name="purchase_paid"/>
702- <field name="payment_mode"/>
703- <field name="state" />
704 </group>
705 <newline/>
706 <group expand="0" string="Group By..." colspan="4" col="20">
707- <filter string="Kind" icon="terp-personal" domain="[]" context="{'group_by':'kind'}"/>
708 <filter string="Job" icon="terp-report" domain="[]" context="{'group_by':'job_id'}"/>
709 <filter string="Session" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'session_id'}"/>
710+ <separator orientation="vertical"/>
711+ <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
712+ <separator orientation="vertical"/>
713 <filter string="Payment" icon="terp-stage" domain="[]" context="{'group_by':'payment_mode'}"/>
714- <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
715 </group>
716 </search>
717 </field>
718@@ -2197,23 +2192,24 @@
719 <field name="priority">1</field>
720 <field name="arch" type="xml">
721 <search string="Search All Participation">
722- <field name="job_id" />
723- <field name="partner_id" />
724- <field name="date" />
725- <field name="seance_id" />
726- <field name="group_id" />
727- <field name="course_id" />
728- <field name="duration" />
729- <field name="paid" />
730- <field name="product_id" />
731- <field name="state" />
732+ <filter icon="terp-document-new" string="Draft" domain="[('state','=', 'draft')]"/>
733+ <filter icon="gtk-ok" string="Accepted" domain="[('state','=', 'accepted')]"/>
734+ <filter icon="gtk-cancel" string="Refused" domain="[('state','=', 'refused')]"/>
735+ <filter icon="gtk-jump-to" string="Done" domain="[('state','=', 'done')]"/>
736+ <field name="job_id"/>
737+ <field name="partner_id"/>
738+ <field name="seance_id"/>
739+ <field name="group_id"/>
740+ <field name="course_id"/>
741+ <field name="product_id"/>
742 <newline/>
743 <group expand="0" string="Group By...">
744+ <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'seance_id'}"/>
745+ <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
746+ <separator orientation="vertical"/>
747+ <filter string="Seance" icon="terp-check" domain="[]" context="{'group_by':'seance_id'}"/>
748+ <separator orientation="vertical"/>
749 <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
750- <filter string="Seance" icon="terp-check" domain="[]" context="{'group_by':'seance_id'}"/>
751- <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'seance_id'}"/>
752- <filter string="Duration" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'duration'}"/>
753- <filter string="Product" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'product_id'}"/>
754 </group>
755 </search>
756 </field>
757@@ -2290,15 +2286,16 @@
758 <field name="type">search</field>
759 <field name="priority">1</field>
760 <field name="arch" type="xml">
761- <search string="ubscription Lines">
762+ <search string="Subscription Lines">
763 <field name="job_id" />
764 <field name="partner_id" />
765 <field name="session_id" />
766 <newline/>
767 <group expand="0" string="Group By...">
768+ <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'session_id'}"/>
769+ <filter string="Seance" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
770+ <separator orientation="vertical"/>
771 <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'job_id'}"/>
772- <filter string="Seance" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
773- <filter string="Partner" icon="terp-check" domain="[]" context="{'group_by':'session_id'}"/>
774 </group>
775 </search>
776 </field>
777@@ -2358,7 +2355,7 @@
778
779 <menuitem id="training_subscription_mass_mi"
780 parent="subscription_treat_mi"
781- action="training_subscription_mass_act" icon="STOCK_EXECUTE"/>
782+ action="training_subscription_mass_act" icon="STOCK_EXECUTE" sequence="50"/>
783
784 <record model="ir.actions.act_window" id="training_subscription_mass_from_subscription_act">
785 <field name="name">Mass Subscription</field>
786@@ -2420,11 +2417,11 @@
787 </record>
788
789 <record model="ir.actions.act_window" id="training_config_contact_function_act">
790- <field name="name">Stakeholder functions</field>
791+ <field name="name">Stakeholder Functions</field>
792 <field name="res_model">training.config.contact.function</field>
793 <field name="view_type">form</field>
794 <field name="view_mode">tree,form</field>
795- <field name="search_view_id" ref="training_config_contact_function_search"/>
796+ <field name="search_view_id" ref="training_config_contact_function_search"/>
797 </record>
798
799 <menuitem id="training_config_contact_function_mi" action="training_config_contact_function_act" parent="training_config_library_mi" sequence='30'/>
800
801=== modified file 'training_exam/training_exam_view.xml'
802--- training_exam/training_exam_view.xml 2011-03-17 13:14:40 +0000
803+++ training_exam/training_exam_view.xml 2011-03-18 09:43:28 +0000
804@@ -107,9 +107,9 @@
805 </notebook>
806 <group colspan="4" col="9">
807 <field name="state"/>
808- <button type="action" name="%(training_exam.exam_question_new_version_action)d" icon="terp-document-new" string="Create New Version" states="validated,deprecated"/>
809- <button type="action" name="%(training_exam_question_validate_wizard_action)d" icon="gtk-go-up" string="Validate" states="draft"/>
810- <button type="action" name="%(wizard_question_deprecate_action)d" string="Deprecate" icon="terp-dialog-close" states="validated"/>
811+ <button type="action" name="%(training_exam.exam_question_new_version_action)d" string="Create New Version" iocn="gtk-new" states="validated,deprecated"/>
812+ <button type="action" name="%(training_exam_question_validate_wizard_action)d" string="Validate" icon="gtk-execute" states="draft"/>
813+ <button type="action" name="%(wizard_question_deprecate_action)d" string="Deprecate" icon="gtk-go-forward" states="validated"/>
814 </group>
815 </form>
816 </field>
817
818=== modified file 'training_intra/training_intra_view.xml'
819--- training_intra/training_intra_view.xml 2011-02-23 12:44:45 +0000
820+++ training_intra/training_intra_view.xml 2011-03-18 09:43:28 +0000
821@@ -169,15 +169,15 @@
822 <button name="draft_cb" position="before">
823 <button name="signal_draft" string="Draft" states="validated" type="workflow" confirm="Are you sure to reset to Draft (Check the sessions for this offer) ?"/>
824 <group col="2" colspan="2" attrs="{'invisible': [('kind','!=','intra')]}">
825- <button name="signal_refused" string="Refused" states="draft" type="workflow" confirm="Are you sure you want to mark this offer as refused ?"/>
826- <button name="signal_done" string="Done" states="validated" type="workflow" confirm="Are you sure you want to mark this offer as done ?"/>
827+ <button name="signal_refused" string="Refused" icon='gtk-cancel' states="draft" type="workflow" confirm="Are you sure you want to mark this offer as refused ?"/>
828+ <button name="signal_done" string="Done" states="validated" icon='gtk-jump-to' type="workflow" confirm="Are you sure you want to mark this offer as done ?"/>
829 </group>
830 </button>
831 </data>
832 </field>
833 </record>
834
835- <act_window
836+ <act_window
837 name="Sale Order"
838 src_model="training.offer"
839 res_model="sale.order"
840@@ -215,7 +215,7 @@
841 <tree string="Budget Lines" editable="bottom">
842 <field name="offer_id" invisible="1" />
843 <field name="number_of_seances" />
844- <field name="course_id" context="{'offer_id' : offer_id}" />
845+ <field name="course_id" context="{'offer_id' : offer_id}" />
846 <field name="type" on_change="on_change_product(type, product_id)" />
847 <field name="product_id" on_change="on_change_product(type, product_id)" />
848 <field name="description" />
849@@ -242,7 +242,7 @@
850 <field name="type" on_change="on_change_product(type, product_id)" />
851 <field name="unit_price" />
852 <field name="number_of_seances" />
853- <field name="course_id" context="{'offer_id' : offer_id}" />
854+ <field name="course_id" context="{'offer_id' : offer_id}" />
855 <field name="offer_id" invisible="1" />
856 </form>
857 </field>
858@@ -393,7 +393,7 @@
859 <field name="view_mode">tree,form</field>
860 <field name="domain">[('kind', '=', 'intra')]</field>
861 </record>
862-
863+
864 <menuitem id="intra_session_all_mi" parent="training.training_planning_session_future_all_mi" action="intra_session_all_act" />
865
866 <record model="ir.actions.act_window" id="intra_seance_all_act">
867@@ -403,7 +403,7 @@
868 <field name="view_mode">tree,form</field>
869 <field name="domain">[('is_intra', '=', 1)]</field>
870 </record>
871-
872+
873 <menuitem id="intra_seance_all_mi" parent="training.training_planning_future_seances_mi" action="intra_seance_all_act"/>
874
875 <record model='ir.ui.view' id="training_seance_form_inherit">

Subscribers

People subscribed via source and target branches