openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #04354
lp:~openerp-dev/openobject-addons/addons-training-usability-ysa into lp:~openobject-training/openobject-addons/training_with_history
Yogesh(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/addons-training-usability-ysa into lp:~openobject-training/openobject-addons/training_with_history.
Requested reviews:
OpenObject Training (openobject-training)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/addons-training-usability-ysa/+merge/53961
Improve usability issue in training module.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/addons-training-usability-ysa/+merge/53961
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/addons-training-usability-ysa.
=== modified file 'training/training_content_review_view.xml'
--- training/training_content_review_view.xml 2011-03-14 10:48:46 +0000
+++ training/training_content_review_view.xml 2011-03-18 09:11:05 +0000
@@ -296,9 +296,9 @@
<field name="state"/>
<button name="signal_draft" string="Draft" states="done,cancelled" icon="terp-document-new"/>
<button name="signal_cancel" string="Cancel" states="draft,validated,inprogress" icon="gtk-cancel"/>
- <button name="signal_validate" string="Validate" states="draft" icon="gtk-ok"/>
+ <button name="signal_validate" string="Validate" states="draft" icon="gtk-go-forward"/>
<button name="signal_inprogress" string="In Progress" states="validated" icon="terp-tools" />
- <button name="signal_done" string="Done" states="inprogress" icon="terp-go-home"/>
+ <button name="signal_done" string="Done" states="inprogress" icon="gtk-jump-to"/>
</group>
</form>
</field>
@@ -312,10 +312,9 @@
<search string="Search Training Email">
<group colspan='4'>
<filter icon="terp-document-new" string="Draft" domain="[('state','=', 'draft')]"/>
- <filter icon="gtk-ok" string="Validated" domain="[('state','=', 'validated')]"/>
+ <filter icon="gtk-go-forward" string="Validated" domain="[('state','=', 'validated')]"/>
<filter icon="terp-tools" string="Inprogress" domain="[('state','=', 'inprogress')]"/>
- <filter icon="terp-go-home" string="Done" domain="[('state','=', 'done')]"/>
- <filter icon="gtk-cancel" string="Cancel" domain="[('state','=', 'cancelled')]"/>
+ <filter icon="gtk-jump-to" string="Done" domain="[('state','=', 'done')]"/>
<separator orientation="vertical"/>
<field name="reason_id"/>
<field name="type"/>
@@ -324,19 +323,12 @@
</group>
<newline/>
<group expand="0" string="Group By..." colspan="4">
- <filter string="Reason" icon="terp-personal" domain="[]" context="{'group_by':'reason_id'}"/>
- <filter string="Type" icon="terp-report" domain="[]" context="{'group_by':'type'}"/>
+ <filter string="Reason" icon="terp-tools" domain="[]" context="{'group_by':'reason_id'}"/>
<filter string="Course" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'course_id'}"/>
+ <separator orientation="vertical"/>
+ <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+ <separator orientation="vertical"/>
<filter string="Follow By" icon="terp-stage" domain="[]" context="{'group_by':'followup_by'}"/>
- <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
- </group>
- <newline/>
- <group expand="0" string="Extended..." colspan="4">
- <field name="ref"/>
- <field name="seance_next_date"/>
- <field name="create_date"/>
- <field name="delivery_date"/>
- <field name="followup_by"/>
</group>
</search>
</field>
=== modified file 'training/training_email_view.xml'
--- training/training_email_view.xml 2011-03-14 10:48:46 +0000
+++ training/training_email_view.xml 2011-03-18 09:11:05 +0000
@@ -43,7 +43,7 @@
<group col="5" colspan="4">
<field name="state" />
<button name="draft_cb" string="_Draft" type="object" icon="terp-document-new" states="deprecated" />
- <button name="validate_cb" string="_Validate" type="object" icon="terp-accessories-archiver" states="draft" />
+ <button name="validate_cb" string="_Validate" type="object" icon="gtk-go-forward" states="draft" />
<button name="deprecate_cb" string="Deprecate" type="object" icon="terp-dialog-close" states="validated,draft" />
</group>
</form>
@@ -76,7 +76,7 @@
<search string="Search Training Email">
<group col='10' colspan='4'>
<filter icon="terp-document-new" string="Draft" domain="[('state','=', 'draft')]"/>
- <filter icon="terp-accessories-archiver" string="Validated" domain="[('state','=', 'validated')]"/>
+ <filter icon="gtk-go-forward" string="Validated" domain="[('state','=', 'validated')]"/>
<filter icon="terp-dialog-close" string="Deprecated" domain="[('state','=', 'deprecated')]"/>
<separator orientation="vertical"/>
<field name="subject"/>
@@ -89,8 +89,9 @@
<filter string="Smtp Client" icon="terp-personal" domain="[]" context="{'group_by':'smtp_client_id'}"/>
<filter string="Layout" icon="terp-report" domain="[]" context="{'group_by':'layout_id'}"/>
<separator orientation="vertical"/>
+ <filter string="Target" icon="terp-stage" domain="[]" context="{'group_by':'target'}"/>
+ <separator orientation="vertical"/>
<filter string="Trigger" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'trigger'}"/>
- <filter string="Target" icon="terp-stage" domain="[]" context="{'group_by':'target'}"/>
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
</group>
</search>
@@ -234,7 +235,7 @@
<field name="search_view_id" ref="training_email_layout_search"/>
</record>
- <menuitem parent="training_config_mi" id="training_email_all_emails_mi" name="Emails" sequence='50'/>
+ <menuitem parent="training_config_mi" id="training_email_all_emails_mi" name="Emails" sequence='1'/>
<menuitem parent="training_email_all_emails_mi" id="training_email_all_mi"
action="training_email_all_act" sequence='1'/>
<menuitem parent="training_email_all_emails_mi" id="training_email_stylegroup_mi"
=== modified file 'training/training_holiday_view.xml'
--- training/training_holiday_view.xml 2011-03-14 10:48:46 +0000
+++ training/training_holiday_view.xml 2011-03-18 09:11:05 +0000
@@ -56,14 +56,13 @@
<separator orientation="vertical"/>
<field name="name"/>
<field name="year_id"/>
- <field name="date_start"/>
- <field name="date_stop"/>
<field name="contact_id"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="4" col="20">
+ <filter string="Contact" icon="terp-personal" domain="[]" context="{'group_by':'contact_id'}"/>
+ <separator orientation="vertical"/>
<filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year_id'}"/>
- <filter string="Contact" icon="terp-personal" domain="[]" context="{'group_by':'contact_id'}"/>
</group>
</search>
</field>
@@ -77,7 +76,7 @@
<field name="search_view_id" ref="holiday_period_search"/>
</record>
- <menuitem id="holiday_mi" name="Non-Working Days" parent="training_config_mi" sequence='60'/>
+ <menuitem id="holiday_mi" name="Non-Working Days" parent="training_config_mi" sequence='2'/>
<menuitem id="holiday_period_all_mi" action="holiday_period_all_act" parent="holiday_mi" />
<record model="ir.ui.view" id="holiday_year_tree">
=== modified file 'training/training_view.xml'
--- training/training_view.xml 2011-03-14 10:48:46 +0000
+++ training/training_view.xml 2011-03-18 09:11:05 +0000
@@ -43,8 +43,6 @@
<search string="Search Training Course Theme">
<field name="name"/>
<field name="parent_id"/>
- <field name="priority"/>
- <field name="active"/>
<field name="nr"/>
</search>
</field>
@@ -113,10 +111,13 @@
<field name="arch" type="xml">
<search string="Search Training Course Category">
<field name="complete_name" string="Code"/>
- <field name="price_list_id"/>
<field name="parent_id" string="Parent" widget="selection"/>
<field name="price_list_id" widget="selection"/>
- <field name="description"/>
+ <newline/>
+ <group expand="0" string="Group By...">
+ <filter string="Parent" icon="terp-personal" domain="[]" context="{'group_by' : 'parent_id'}" />
+ <filter string="Pricelist" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by' : 'price_list_id'}" />
+ </group>
</search>
</field>
</record>
@@ -321,7 +322,7 @@
<field name="state_course" />
<button string="Deprecate" icon="terp-dialog-close" type="workflow" name="signal_deprecate" attrs="{'invisible' : [('state_course', '!=', 'validated')]}"
confirm="Do you want to deprecate this course ?" />
- <button string="Validate" icon="terp-accessories-archiver" type="workflow" name="signal_validate" attrs="{'invisible' : [('state_course', '!=', 'pending'),('state_course', '!=', 'draft')]}"
+ <button string="Validate" icon="gtk-go-forward" type="workflow" name="signal_validate" attrs="{'invisible' : [('state_course', '!=', 'pending'),('state_course', '!=', 'draft')]}"
confirm="Do you want to validate this course ?" />
<button string="Reset to Draft" icon="terp-document-new" type="object" name="reset_to_draft" attrs="{'invisible' : [('state_course', '!=', 'deprecated')]}" />
</group>
@@ -338,7 +339,7 @@
<search string="Search Training Email">
<group colspan='4'>
<filter icon="terp-document-new" string="Draft" domain="[('state','=', 'draft')]"/>
- <filter icon="terp-accessories-archiver" string="Validated" domain="[('state','=', 'validated')]"/>
+ <filter icon="gtk-go-forward" string="Validated" domain="[('state','=', 'validated')]"/>
<filter icon="terp-dialog-close" string="Deprecated" domain="[('state','=', 'deprecated')]"/>
<separator orientation="vertical"/>
<field name="name"/>
@@ -348,12 +349,13 @@
</group>
<newline/>
<group expand="0" string="Group By..." colspan="4">
- <filter string="Splitted By" icon="terp-personal" domain="[]" context="{'group_by':'splitted_by'}"/>
- <filter string="MAster Course" icon="terp-report" domain="[]" context="{'group_by':'reference_id'}"/>
+ <filter string="Master Course" icon="terp-report" domain="[]" context="{'group_by':'reference_id'}"/>
+ <separator orientation="vertical"/>
+ <filter string="Lang" icon="terp-stage" domain="[]" context="{'group_by':'lang_id'}"/>
+ <separator orientation="vertical"/>
+ <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+ <separator orientation="vertical"/>
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'course_type_id'}"/>
- <filter string="Kind" icon="terp-stage" domain="[]" context="{'group_by':'kind'}"/>
- <filter string="lang_id" icon="terp-stage" domain="[]" context="{'group_by':'lang_id'}"/>
- <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
</group>
</search>
</field>
@@ -428,6 +430,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('p_id', '=', False)]</field>
+ <field name="search_view_id" ref="course_subcourse_search"/>
</record>
<record model="ir.ui.view" id="course_subcourse_tree">
@@ -483,12 +486,12 @@
<group colspan="4" col="6">
<field name="state" />
<button name="signal_validate" string="Validate" type="workflow" states="draft"
- confirm="Do you want to validate this catalog ?" />
+ confirm="Do you want to validate this catalog ?" icon="gtk-go-forward"/>
<button name="signal_cancel" string="Cancel" type="workflow" states="validated,inprogress"
- confirm="Do you want to cancel this catalog ?"/>
- <button name="signal_inprogress" string="In Progress" type="workflow" states="validated" />
+ confirm="Do you want to cancel this catalog ?" icon="gtk-cancel"/>
+ <button name="signal_inprogress" string="In Progress" type="workflow" states="validated" icon="gtk-go-forward" />
<button name="signal_deprecate" string="Deprecate" type="workflow" states="inprogress"
- confirm="Do you want to deprecate this catalog ?"/>
+ confirm="Do you want to deprecate this catalog ?" icon="gtk-apply" />
</group>
</form>
</field>
@@ -518,7 +521,7 @@
<filter icon="terp-go-year" string="Current" domain="[('year', '=', time.strftime('%%Y'))]" />
<filter icon="terp-document-new" string="Draft" domain="[('state','=', 'draft')]"/>
<filter icon="terp-check" string="In Progress" domain="[('state','=', 'inprogress')]"/>
- <filter icon="terp-accessories-archiver" string="Validated" domain="[('state','=', 'validated')]"/>
+ <filter icon="gtk-go-forward" string="Validated" domain="[('state','=', 'validated')]"/>
<filter icon="terp-dialog-close" string="Deprecated" domain="[('state','=', 'deprecated')]"/>
<filter icon="gtk-cancel" string="Cancel" domain="[('state','=', 'cancelled')]"/>
<separator orientation="vertical"/>
@@ -528,7 +531,7 @@
<newline/>
<group expand="0" string="Group By..." >
<filter string="Year" icon="terp-go-month" domain="[]" context="{'group_by':'year'}"/>
- <filter string="Name" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'name'}"/>
+ <separator orientation="vertical"/>
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
</group>
</search>
@@ -540,6 +543,7 @@
<field name="res_model">training.catalog</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
+ <field name="search_view_id" ref="training_catalog_filter"/>
</record>
<record model="ir.ui.view" id="training_session_form">
@@ -633,12 +637,12 @@
<group colspan="4" col="3">
<field name="state" />
<group col="6" groups="training.group_session_manager">
- <button name="signal_open" string="Open" type="workflow" states="draft" confirm="Do you want to open this session ?"/>
- <button name="signal_open_confirm" string="Confirm" type="workflow" states="opened" confirm="Do you want to confirm this session ?" />
- <button name="signal_close_confirm" string="Close Subscriptions" type="workflow" states="opened_confirmed" confirm="Do you want to close the subscription for this session ?" />
- <button name="signal_inprogress" string="Start" type="workflow" states="closed_confirmed" confirm="Do you want to close this session for the subscription ?" />
- <button name="signal_close" string="Close" type="workflow" states="inprogress" confirm="Do you want to close this session ?" />
- <button name="signal_cancel" string="Cancel" type="workflow" states="draft,opened,opened_confirmed,closed_confirmed" confirm="Do you want to cancel this session ?"/>
+ <button name="signal_open" string="Open" type="workflow" states="draft" confirm="Do you want to open this session ?" icon="gtk-apply"/>
+ <button name="signal_open_confirm" string="Confirm" type="workflow" states="opened" confirm="Do you want to confirm this session ?" icon="gtk-convert"/>
+ <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"/>
+ <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"/>
+ <button name="signal_close" string="Close" type="workflow" states="inprogress" confirm="Do you want to close this session ?" icon="terp-dialog-close"/>
+ <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"/>
</group>
</group>
</form>
@@ -722,19 +726,19 @@
<field name="arch" type="xml">
<search string="Search Session">
<filter icon="terp-document-new" string="Draft" domain="[('state', '=', 'draft')]" />
- <filter icon="terp-gtk-media-pause" string="Open" domain="[('state', '=', 'opened')]" />
+ <filter icon="gtk-open" string="Open" domain="[('state', '=', 'opened')]" />
<filter icon="terp-camera_test" string="Confirm" domain="[('state', 'in', ('opened_confirmed', 'closed_confirmed', 'inprogress'))]" />
<filter icon="terp-check" string="Futur" domain="[('date', '>=', current_date),('state', '!=', 'closed'),('state', '!=', 'cancelled')]" />
- <filter icon="gtk-cancel" string="Cancel" domain="[('state','=', 'cancelled')]"/>
+ <filter icon="gtk-cancel" string="Cancel" domain="[('state','=', 'cancelled')]" />
<separator orientation="vertical"/>
<field name="name"/>
- <field name="state" />
<field name="kind"/>
<field name="offer_id" />
<newline/>
<group expand="0" string="Group By...">
- <filter string="Name" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'name'}"/>
<filter string="Offer" icon="terp-check" domain="[]" context="{'group_by':'offer_id'}"/>
+ <filter string="Catalog" icon="gtk-jump-to" domain="[]" context="{'group_by':'catalog_id'}"/>
+ <separator orientation="vertical"/>
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
</group>
</search>
@@ -777,9 +781,9 @@
<separator string="" colspan="4" />
<group colspan="4" col="5">
<field name="state" invisible="1" />
- <button string="Cancel" type="object" special="cancel" name="action_close" states="selection"/>
- <button string="Close" type="object" special="cancel" name="action_close" states="result" />
- <button string="Generate Reports" type="object" name="action_generate_zip" states="selection"/>
+ <button string="Cancel" type="object" special="cancel" name="action_close" states="selection" icon="gtk-cancel"/>
+ <button string="Close" type="object" special="cancel" name="action_close" states="result" icon="terp-dialog-close"/>
+ <button string="Generate Reports" type="object" name="action_generate_zip" states="selection" icon="gtk-execute"/>
</group>
</form>
</field>
@@ -909,15 +913,15 @@
<group colspan="4" col="3">
<field name="state" />
<group col="5" groups="training.group_seance_manager">
- <button name="seance_confirm" string="Confirm" type="workflow" states="opened" confirm="Do you want to confirm this seance (procurements, ...) ?" />
- <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"/>
- <button name="signal_inprogress" string="Start" type="workflow" states="confirmed" confirm="Do you want to start this seance ?" />
- <button name="signal_close" string="Close" type="workflow" states="inprogress" confirm="Do you want to close this seance ?" />
- <button name="signal_cancel" string="Cancel" type="workflow" states="opened,confirmed" confirm="Do you want to cancel this seance ?" />
- <button name="signal_seance_done" string="Done" type="workflow" states="closed" />
+ <button name="seance_confirm" string="Confirm" type="workflow" states="opened" confirm="Do you want to confirm this seance (procurements, ...) ?" icon="gtk-apply"/>
+ <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"/>
+ <button name="signal_inprogress" string="Start" type="workflow" states="confirmed" confirm="Do you want to start this seance ?" icon="terp-camera_test"/>
+ <button name="signal_close" string="Close" type="workflow" states="inprogress" confirm="Do you want to close this seance ?" icon="terp-dialog-close"/>
+ <button name="signal_cancel" string="Cancel" type="workflow" states="opened,confirmed" confirm="Do you want to cancel this seance ?" icon="gtk-cancel"/>
+ <button name="signal_seance_done" string="Done" type="workflow" states="closed" icon="gtk-jump-to"/>
</group>
</group>
- <button name="%(seance_generate_zip_wizard_act)d" type="action" string="Generate Reports" colspan="4" groups="training.group_training"/>
+ <button name="%(seance_generate_zip_wizard_act)d" icon="gtk-execute" type="action" string="Generate Reports" colspan="4" groups="training.group_training"/>
</form>
</field>
</record>
@@ -1019,13 +1023,12 @@
<field name="name"/>
<field name="group_id" />
<field name="date"/>
- <field name="duration" />
- <field name="state" />
<newline/>
<group expand="0" string="Group By...">
- <filter string="Name" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'name'}"/>
<filter string="Group" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'group_id'}"/>
+ <separator orientation="vertical"/>
<filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+ <separator orientation="vertical"/>
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
</group>
</search>
@@ -1131,7 +1134,7 @@
<field name="paid" />
</group>
<group states="confirmed,done">
- <button name="action_create_invoice" string="Create Invoice" type="object" attrs="{'invisible': [('invoice_line_id', '!=', False)]}"/>
+ <button name="action_create_invoice" icon="gtk-new" string="Create Invoice" type="object" attrs="{'invisible': [('invoice_line_id', '!=', False)]}"/>
</group>
</group>
</group>
@@ -1159,10 +1162,10 @@
</notebook>
<group colspan="4" col="6">
<field name="state" />
- <button string="Confirm Request" type="workflow" name="signal_confirm" states="draft"
- confirm="Do you want to confirm the request for this subscription ?" />
+ <button string="Confirm Request" type="workflow" name="signalsubscription_confirm" states="draft"
+ confirm="Do you want to confirm the request for this subscription ?" icon="gtk-convert"/>
<button string="Cancel" type="workflow" name="signal_cancel" states="draft"
- confirm="Do you want to cancel this subscription ?" />
+ confirm="Do you want to cancel this subscription ?" icon="gtk-cancel"/>
</group>
</form>
</field>
@@ -1192,21 +1195,19 @@
<field name="priority">1</field>
<field name="arch" type="xml">
<search string="Search Subscription">
- <filter icon="terp-document-new" string="Validate" domain="[('state', '=', 'draft')]" />
+ <filter icon="gtk-go-forward" string="Validate" domain="[('state', '=', 'draft')]" />
<filter icon="terp-check" string="Invoice" domain="[('state', '=', 'confirmed')]" />
<separator orientation="vertical"/>
<field name="name"/>
- <field name="create_date" />
<field name="partner_id"/>
<field name="responsible_id" />
- <field name="partner_rh_email" />
- <field name="state" />
<newline/>
<group expand="0" string="Group By...">
- <filter string="Name" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'name'}"/>
- <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+ <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'responsible_id'}"/>
+ <separator orientation="vertical"/>
<filter string="Create Date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}"/>
+ <separator orientation="vertical"/>
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
</group>
</search>
@@ -1295,7 +1296,7 @@
<group states="end" colspan="4">
<label string="The operation has been done with success !" colspan="4" />
<separator string="" colspan="4" />
- <button name="action_done" string="Done" type="object" states="end" />
+ <button name="action_done" string="Done" type="object" states="end" icon="gtk-jump-to"/>
</group>
<group col="7" colspan="4" attrs="{'invisible' : [('state', '=', 'end')]}">
@@ -1303,9 +1304,9 @@
<field name="state" invisible="1" />
<button name="action_cancel" string="Cancel" type="object" special="cancel" icon="gtk-cancel" states="init,replacement,postponement,cancellation"/>
<label string="" />
- <button name="action_cancellation" string="Cancellation" type="object" states="init" />
- <button name="action_replacement" string="Replacement" type="object" states="init" />
- <button name="action_postponement" string="Postponement" type="object" states="init" />
+ <button name="action_cancellation" string="Cancellation" type="object" states="init" icon="gtk-cancel"/>
+ <button name="action_replacement" string="Replacement" type="object" states="init" icon="terp-gtk-jump-to-rtl"/>
+ <button name="action_postponement" string="Postponement" type="object" states="init" icon='gtk-go-up'/>
<label string="" />
<button name="action_apply" string="Apply" type="object" states="cancellation,replacement,postponement" icon="gtk-apply"/>
</group>
@@ -1356,7 +1357,7 @@
</group>
<group states="confirmed,done" groups="training.group_training">
<button name="action_create_invoice" string="Create Invoice" type="object"
- attrs="{'invisible': [('invoice_line_id', '!=', False)]}" />
+ attrs="{'invisible': [('invoice_line_id', '!=', False)]}" icon='gtk-new'/>
</group>
</group>
</group>
@@ -1388,14 +1389,15 @@
<group col="9" colspan="4">
<field name="state" />
<button name="signal_confirm" string="Confirm" type="workflow" states="draft"
- confirm="Do you want to confirm this subscription line ?"/>
+ confirm="Do you want to confirm this subscription line ?" icon="gtk-apply"/>
<button name="signal_cancel" string="Cancel" type="workflow" states="draft"
- confirm="Do you want to cancel this subscription line ?" />
+ confirm="Do you want to cancel this subscription line ?" icon="gtk-cancel"/>
<button name="signal_invoice_and_send_emails" string="Cancel (Penalities)" type="workflow" states="confirmed"
- confirm="Do you want to cancel this subscription line ?" />
+ confirm="Do you want to cancel this subscription line ?" icon="gtk-cancel"/>
<button name="%(training.subscription_cancellation_wizard_act)d"
string="Cancel (Free)"
type="action"
+ icon='gtk-execute'
groups="training.group_subscription_manager"
states="confirmed"
context="{'default_state':'cancellation'}"
@@ -1403,18 +1405,20 @@
<button name="%(training.subscription_cancellation_wizard_act)d"
string="Replacement"
type="action"
+ icon='gtk-refresh'
states="confirmed"
groups="training.group_subscription_manager"
context="{'default_state':'replacement'}"
- confirm="Do you want to do a replacement for this subscription line ?" />
+ confirm="Do you want to do a replacement for this subscription line ?"/>
<button name="%(training.subscription_cancellation_wizard_act)d"
string="Postponement"
type="action"
states="confirmed"
+ icon='gtk-go-up'
groups="training.group_subscription_manager"
context="{'default_state':'postponement'}"
confirm="Do you want to postpone this subscription line ?" />
- <button name="signal_done" string="Done" type="workflow" states="confirmed" />
+ <button name="signal_done" string="Done" type="workflow" states="confirmed" icon="gtk-jump-to"/>
</group>
</form>
</field>
@@ -1495,21 +1499,19 @@
<field name="priority">1</field>
<field name="arch" type="xml">
<search string="Search Subscription">
- <filter icon="terp-document-new" string="Validate" domain="[('state', '=', 'draft'), ('subscription_id.state', '=', 'confirmed')]" />
+ <filter icon="gtk-go-forward" string="Validate" domain="[('state', '=', 'draft'), ('subscription_id.state', '=', 'confirmed')]" />
<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)]" />
<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', '<', (datetime.datetime.today()+datetime.timedelta(days=1)).strftime('%%Y-%%m-%%d 23:59:59')),('session_id.state','in',['inprogress','closed']),('price','!=',0)]" />
<separator orientation="vertical"/>
- <field name="state" />
<field name="name" />
<field name="session_id" />
<field name="session_state" />
- <field name="session_date"/>
- <field name="kind" />
<newline/>
<group expand="0" string="Group By...">
- <filter string="Name" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'name'}"/>
- <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'session_id'}"/>
+ <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'session_id'}"/>
+ <separator orientation="vertical"/>
<filter string="Create Date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}"/>
+ <separator orientation="vertical"/>
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
</group>
</search>
@@ -1566,8 +1568,8 @@
<form string="Procurements Update">
<group colspan="4" col="2" states="confirm">
<label string="Are you sure you want to update procurements all opened seance in all future session?" colspan="2"/>
- <button string="Cancel" special="cancel" name="action_close"/>
- <button string="Confirm" type="object" name="action_confirm"/>
+ <button string="Cancel" special="cancel" name="action_close" icon='gtk-cancel'/>
+ <button string="Confirm" type="object" name="action_confirm" icon='gtk-ok'/>
</group>
<group colspan="4" col="4" states="update" expand="1">
<field name="name"/>
@@ -1687,10 +1689,12 @@
</field>
<button name="action_load_procurements"
type="object"
+ icon='gtk-execute'
string="Load Procurements From Courses" colspan="4"
attrs="{'invisible' : [('state', '=', 'validated')]}"/>
<button name="%(training_offer_purchase_line_wizard_act)d"
type="action"
+ icon='gtk-execute'
string="Update Seance Procurments" colspan="4"/>
</page>
<page string="Pedagogical Suggestion">
@@ -1717,12 +1721,12 @@
<group col="5" colspan="4">
<field name="state" />
<button name="signal_validate" string="Validate" type="workflow" states="draft"
- confirm="Do you want to validate this offer ?"/>
+ confirm="Do you want to validate this offer ?" icon="gtk-go-forward"/>
<button name="signal_deprecate" string="Deprecate" type="workflow" states="validated,draft"
- confirm="Do you want to deprecate this offer ?" />
+ confirm="Do you want to deprecate this offer ?" icon="terp-dialog-close"/>
<button name="draft_cb" string="Draft" type="object" states="validated,deprecated"
confirm="Are you sure to reset to Draft (Check the sessions for this offer) ?"
- groups="training.group_offer_manager" />
+ groups="training.group_offer_manager" icon="terp-camera_test"/>
</group>
</form>
</field>
@@ -1755,24 +1759,22 @@
<search string="Search Training Offer">
<group col='10' colspan='4'>
<filter icon="terp-document-new" string="Draft" domain="[('state','=', 'draft')]"/>
- <filter icon="terp-accessories-archiver" string="Validated" domain="[('state','=', 'validated')]"/>
+ <filter icon="gtk-go-forward" string="Validated" domain="[('state','=', 'validated')]"/>
<filter icon="terp-dialog-close" string="Deprecated" domain="[('state','=', 'deprecated')]"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="categorie_id"/>
<field name="type_id"/>
- <field name="kind"/>
<field name="product_id"/>
- <field name="create_date"/>
- <field name="is_standalone"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="4" col="20">
- <filter string="Category" icon="terp-personal" domain="[]" context="{'group_by':'categorie_id'}"/>
- <filter string="kind" icon="terp-report" domain="[]" context="{'group_by':'kind'}"/>
- <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
- <filter string="Product" icon="terp-stage" domain="[]" context="{'group_by':'product_id'}"/>
- <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+ <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
+ <filter string="Category" icon="terp-personal" domain="[]" context="{'group_by':'categorie_id'}"/>
+ <separator orientation="vertical"/>
+ <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+ <separator orientation="vertical"/>
+ <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
</group>
</search>
</field>
@@ -1821,9 +1823,9 @@
<data>
<menuitem id="training_mi" name="Training Management" sequence="2" />
- <menuitem id="training_config_mi" parent="training_mi" name="Configuration" sequence="1"/>
+ <menuitem id="training_config_mi" parent="training_mi" name="Configuration" sequence="60"/>
- <menuitem id="training_config_library_mi" parent="training_config_mi" name="Library" />
+ <menuitem id="training_config_library_mi" parent="training_config_mi" name="Library" sequence="1"/>
<menuitem id="training_config_library_categ_mi" parent="training_config_library_mi" name="Categorisation" sequence='10'/>
<menuitem id="course_theme_all_mi" parent="training_config_library_categ_mi" action="course_theme_all_act" sequence='10'/>
@@ -1945,21 +1947,16 @@
<filter icon="terp-check" string="Present" domain="[('present', '=', 1)]" />
<filter icon="terp-emblem-important" string="Absent" domain="[('present', '=', 0)]" />
<separator orientation="vertical"/>
- <field name="date" />
+ <field name="partner_id" />
<field name="seance_id" />
<field name="course_id" />
- <field name="duration" />
- <field name="contact_firstname" />
- <field name="contact_lastname" />
<field name="function_id"/>
- <field name="partner_id" />
- <field name="present" />
<field name="subscription_line_id" />
<newline/>
<group expand="0" string="Group By...">
+ <filter string="Seance" icon="terp-check" domain="[]" context="{'group_by':'seance_id'}"/>
+ <separator orientation="vertical"/>
<filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
- <filter string="Seance" icon="terp-check" domain="[]" context="{'group_by':'seance_id'}"/>
- <filter string="Duration" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'duration'}"/>
</group>
</search>
</field>
@@ -1972,6 +1969,7 @@
<field name="search_view_id" ref="training_participation_lines_filter"/>
<field name="view_mode">tree,form</field>
<field name="context">{'job_search_context': 'show_past'}</field>
+ <field name="search_view_id" ref="training_participation_lines_filter"/>
</record>
<menuitem name="Participations" id="training_participation_mi" parent="training_mi" sequence="50" />
@@ -2027,10 +2025,10 @@
</notebook>
<group colspan="4" col="10">
<field name="state"/>
- <button type="workflow" name="pshr_validate" string="Validate" states="draft" icon="gtk-ok"
+ <button type="workflow" name="pshr_validate" string="Validate" states="draft" icon="gtk-go-forward"
confirm="Do you want to validate this request ?" />
- <button type="workflow" name="pshr_request" string="Send Request" states="valid" icon="gtk-new"/>
- <button type="workflow" name="pshr_resend_email" string="Resend Request Email" states="requested" groups="training.group_training" />
+ <button type="workflow" name="pshr_request" string="Send Request" states="valid" icon="gtk-convert"/>
+ <button type="workflow" name="pshr_resend_email" icon="gtk-convert" string="Resend Request Email" states="requested" groups="training.group_training" />
<button type="workflow" name="pshr_accept" string="Accept" states="requested,valid" icon="terp-idea"
confirm="Do you want to confirm this request ?" />
<button type="workflow" name="pshr_refuse" string="Refuse" states="requested" icon="terp-tools"
@@ -2039,7 +2037,7 @@
states="draft,valid,requested,accepted"
groups="training.group_request_manager"
confirm="Do you want to cancel this request ?" />
- <button type="workflow" name="pshr_done" string="Done" states="accepted" groups="training.group_request_manager"/>
+ <button type="workflow" name="pshr_done" string="Done" states="accepted" groups="training.group_request_manager" icon="gtk-jump-to" />
</group>
</form>
</field>
@@ -2081,29 +2079,23 @@
<search string="Search Training Email">
<group col='10' colspan='4'>
<filter icon="terp-document-new" string="Draft" domain="[('state','=', 'draft')]"/>
- <filter icon="gtk-ok" string="Valid" domain="[('state','=', 'valid')]"/>
- <filter icon="gtk-new" string="Requested" domain="[('state','=', 'requested')]"/>
- <filter icon="terp-tools" string="Refused" domain="[('state','=', 'refused')]"/>
- <filter icon="gtk-cancel" string="Cancelled" domain="[('state','=', 'cancelled')]"/>
- <filter icon="terp-go-home" string="Done" domain="[('state','=', 'done')]"/>
+ <filter icon="gtk-go-forward" string="Valid" domain="[('state','=', 'valid')]"/>
+ <filter icon="gtk-convert" string="Requested" domain="[('state','=', 'requested')]"/>
+ <filter icon="gtk-cancel" string="Refused" domain="[('state','=', 'refused')]"/>
+ <filter icon="gtk-jump-to" string="Done" domain="[('state','=', 'done')]"/>
<separator orientation="vertical"/>
<field name="reference"/>
<field name="session_id"/>
- <field name="date"/>
- <field name="kind"/>
<field name="job_id"/>
- <field name="price"/>
<field name="amount_to_pay"/>
- <field name="purchase_paid"/>
- <field name="payment_mode"/>
- <field name="state" />
</group>
<newline/>
<group expand="0" string="Group By..." colspan="4" col="20">
- <filter string="Kind" icon="terp-personal" domain="[]" context="{'group_by':'kind'}"/>
<filter string="Job" icon="terp-report" domain="[]" context="{'group_by':'job_id'}"/>
<filter string="Session" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'session_id'}"/>
+ <separator orientation="vertical"/>
<filter string="Payment" icon="terp-stage" domain="[]" context="{'group_by':'payment_mode'}"/>
+ <separator orientation="vertical"/>
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
</group>
</search>
@@ -2197,23 +2189,24 @@
<field name="priority">1</field>
<field name="arch" type="xml">
<search string="Search All Participation">
- <field name="job_id" />
- <field name="partner_id" />
- <field name="date" />
- <field name="seance_id" />
- <field name="group_id" />
- <field name="course_id" />
- <field name="duration" />
- <field name="paid" />
- <field name="product_id" />
- <field name="state" />
+ <filter icon="terp-document-new" string="Draft" domain="[('state','=', 'draft')]"/>
+ <filter icon="gtk-ok" string="Accepted" domain="[('state','=', 'accepted')]"/>
+ <filter icon="gtk-cancel" string="Refused" domain="[('state','=', 'refused')]"/>
+ <filter icon="gtk-jump-to" string="Done" domain="[('state','=', 'done')]"/>
+ <field name="job_id"/>
+ <field name="partner_id"/>
+ <field name="seance_id"/>
+ <field name="group_id"/>
+ <field name="course_id"/>
+ <field name="product_id"/>
<newline/>
<group expand="0" string="Group By...">
+ <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'seance_id'}"/>
+ <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
+ <separator orientation="vertical"/>
+ <filter string="Seance" icon="terp-check" domain="[]" context="{'group_by':'seance_id'}"/>
+ <separator orientation="vertical"/>
<filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
- <filter string="Seance" icon="terp-check" domain="[]" context="{'group_by':'seance_id'}"/>
- <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'seance_id'}"/>
- <filter string="Duration" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'duration'}"/>
- <filter string="Product" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'product_id'}"/>
</group>
</search>
</field>
@@ -2290,15 +2283,16 @@
<field name="type">search</field>
<field name="priority">1</field>
<field name="arch" type="xml">
- <search string="ubscription Lines">
+ <search string="Subscription Lines">
<field name="job_id" />
<field name="partner_id" />
<field name="session_id" />
<newline/>
<group expand="0" string="Group By...">
+ <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'session_id'}"/>
+ <filter string="Seance" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+ <separator orientation="vertical"/>
<filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'job_id'}"/>
- <filter string="Seance" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
- <filter string="Partner" icon="terp-check" domain="[]" context="{'group_by':'session_id'}"/>
</group>
</search>
</field>
@@ -2358,7 +2352,7 @@
<menuitem id="training_subscription_mass_mi"
parent="subscription_treat_mi"
- action="training_subscription_mass_act" icon="STOCK_EXECUTE"/>
+ action="training_subscription_mass_act" icon="STOCK_EXECUTE" sequence="50"/>
<record model="ir.actions.act_window" id="training_subscription_mass_from_subscription_act">
<field name="name">Mass Subscription</field>
@@ -2420,11 +2414,11 @@
</record>
<record model="ir.actions.act_window" id="training_config_contact_function_act">
- <field name="name">Stakeholder functions</field>
+ <field name="name">Stakeholder Functions</field>
<field name="res_model">training.config.contact.function</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
- <field name="search_view_id" ref="training_config_contact_function_search"/>
+ <field name="search_view_id" ref="training_config_contact_function_search"/>
</record>
<menuitem id="training_config_contact_function_mi" action="training_config_contact_function_act" parent="training_config_library_mi" sequence='30'/>
=== modified file 'training_exam/training_exam_view.xml'
--- training_exam/training_exam_view.xml 2011-03-17 13:14:40 +0000
+++ training_exam/training_exam_view.xml 2011-03-18 09:11:05 +0000
@@ -107,9 +107,9 @@
</notebook>
<group colspan="4" col="9">
<field name="state"/>
- <button type="action" name="%(training_exam.exam_question_new_version_action)d" icon="terp-document-new" string="Create New Version" states="validated,deprecated"/>
- <button type="action" name="%(training_exam_question_validate_wizard_action)d" icon="gtk-go-up" string="Validate" states="draft"/>
- <button type="action" name="%(wizard_question_deprecate_action)d" string="Deprecate" icon="terp-dialog-close" states="validated"/>
+ <button type="action" name="%(training_exam.exam_question_new_version_action)d" string="Create New Version" iocn="gtk-new" states="validated,deprecated"/>
+ <button type="action" name="%(training_exam_question_validate_wizard_action)d" string="Validate" icon="gtk-execute" states="draft"/>
+ <button type="action" name="%(wizard_question_deprecate_action)d" string="Deprecate" icon="gtk-go-forward" states="validated"/>
</group>
</form>
</field>
=== modified file 'training_intra/training_intra_view.xml'
--- training_intra/training_intra_view.xml 2011-02-23 12:44:45 +0000
+++ training_intra/training_intra_view.xml 2011-03-18 09:11:05 +0000
@@ -169,15 +169,15 @@
<button name="draft_cb" position="before">
<button name="signal_draft" string="Draft" states="validated" type="workflow" confirm="Are you sure to reset to Draft (Check the sessions for this offer) ?"/>
<group col="2" colspan="2" attrs="{'invisible': [('kind','!=','intra')]}">
- <button name="signal_refused" string="Refused" states="draft" type="workflow" confirm="Are you sure you want to mark this offer as refused ?"/>
- <button name="signal_done" string="Done" states="validated" type="workflow" confirm="Are you sure you want to mark this offer as done ?"/>
+ <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 ?"/>
+ <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 ?"/>
</group>
</button>
</data>
</field>
</record>
- <act_window
+ <act_window
name="Sale Order"
src_model="training.offer"
res_model="sale.order"
@@ -215,7 +215,7 @@
<tree string="Budget Lines" editable="bottom">
<field name="offer_id" invisible="1" />
<field name="number_of_seances" />
- <field name="course_id" context="{'offer_id' : offer_id}" />
+ <field name="course_id" context="{'offer_id' : offer_id}" />
<field name="type" on_change="on_change_product(type, product_id)" />
<field name="product_id" on_change="on_change_product(type, product_id)" />
<field name="description" />
@@ -242,7 +242,7 @@
<field name="type" on_change="on_change_product(type, product_id)" />
<field name="unit_price" />
<field name="number_of_seances" />
- <field name="course_id" context="{'offer_id' : offer_id}" />
+ <field name="course_id" context="{'offer_id' : offer_id}" />
<field name="offer_id" invisible="1" />
</form>
</field>
@@ -393,7 +393,7 @@
<field name="view_mode">tree,form</field>
<field name="domain">[('kind', '=', 'intra')]</field>
</record>
-
+
<menuitem id="intra_session_all_mi" parent="training.training_planning_session_future_all_mi" action="intra_session_all_act" />
<record model="ir.actions.act_window" id="intra_seance_all_act">
@@ -403,7 +403,7 @@
<field name="view_mode">tree,form</field>
<field name="domain">[('is_intra', '=', 1)]</field>
</record>
-
+
<menuitem id="intra_seance_all_mi" parent="training.training_planning_future_seances_mi" action="intra_seance_all_act"/>
<record model='ir.ui.view' id="training_seance_form_inherit">
Follow ups
