openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #04384
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/53976
training :- improve view and add some menu.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/addons-training-usability-ysa/+merge/53976
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-18 09:07:00 +0000
+++ training/training_content_review_view.xml 2011-03-18 11:51:32 +0000
@@ -51,8 +51,8 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Content Review Reason">
+ <field name="name"/>
<field name="code"/>
- <field name="name"/>
<field name="type"/>
<field name="to_invoice"/>
</form>
@@ -296,8 +296,8 @@
<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-go-forward"/>
- <button name="signal_inprogress" string="In Progress" states="validated" icon="terp-tools" />
+ <button name="signal_validate" string="Validate" states="draft" icon="terp-camera_test"/>
+ <button name="signal_inprogress" string="In Progress" states="validated" icon="gtk-apply" />
<button name="signal_done" string="Done" states="inprogress" icon="gtk-jump-to"/>
</group>
</form>
@@ -312,9 +312,8 @@
<search string="Search Training Email">
<group colspan='4'>
<filter icon="terp-document-new" string="Draft" domain="[('state','=', 'draft')]"/>
- <filter icon="gtk-go-forward" string="Validated" domain="[('state','=', 'validated')]"/>
- <filter icon="terp-tools" string="Inprogress" domain="[('state','=', 'inprogress')]"/>
- <filter icon="gtk-jump-to" string="Done" domain="[('state','=', 'done')]"/>
+ <filter icon="terp-camera_test" string="Validated" domain="[('state','=', 'validated')]"/>
+ <filter icon="gtk-apply" string="Inprogress" domain="[('state','=', 'inprogress')]"/>
<separator orientation="vertical"/>
<field name="reason_id"/>
<field name="type"/>
=== modified file 'training/training_email_view.xml'
--- training/training_email_view.xml 2011-03-18 10:16:47 +0000
+++ training/training_email_view.xml 2011-03-18 11:51:32 +0000
@@ -18,15 +18,17 @@
<field name="stylegroup_id"/>
<field name="layout_id"/>
<field name="sign_id"/>
- <newline />
- <field name="body" colspan="4" />
+ <separator string="Message" colspan="4"/>
+ <field name="body" colspan="4" nolabel="1"/>
</page>
<page string="Addresses">
- <field name="from" colspan="4"/>
- <field name="reply_to" colspan="4"/>
- <field name="bcc" colspan="4"/>
- <separator colspan="4"/>
- <field name="fail_email" colspan="4"/>
+ <group colspan="4" col="2">
+ <field name="from"/>
+ <field name="reply_to"/>
+ <field name="bcc"/>
+ <separator colspan="4"/>
+ <field name="fail_email"/>
+ </group>
</page>
<page string="Internal Notes">
<field name="notes" nolabel="1" colspan="4"/>
@@ -43,8 +45,8 @@
<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="gtk-go-forward" states="draft" />
- <button name="deprecate_cb" string="Deprecate" type="object" icon="terp-dialog-close" states="validated,draft" />
+ <button name="validate_cb" string="_Validate" type="object" icon="terp-camera_test" states="draft" />
+ <button name="deprecate_cb" string="Deprecate" type="object" icon="gtk-cancel" states="validated,draft" />
</group>
</form>
</field>
@@ -76,8 +78,7 @@
<search string="Search Training Email">
<group col='10' colspan='4'>
<filter icon="terp-document-new" string="Draft" domain="[('state','=', 'draft')]"/>
- <filter icon="gtk-go-forward" string="Validated" domain="[('state','=', 'validated')]"/>
- <filter icon="terp-dialog-close" string="Deprecated" domain="[('state','=', 'deprecated')]"/>
+ <filter icon="terp-camera_test" string="Validated" domain="[('state','=', 'validated')]"/>
<separator orientation="vertical"/>
<field name="subject"/>
<field name="trigger"/>
@@ -86,13 +87,9 @@
</group>
<newline/>
<group expand="0" string="Group By..." colspan="4" col="20">
- <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'}"/>
+ <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
<filter string="Trigger" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'trigger'}"/>
- <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
</group>
</search>
</field>
@@ -139,9 +136,10 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Email Sign">
- <field name="name" colspan="4"/>
+ <field name="name"/>
<label colspan="4" string="The following objects are availables: ${ctx}, ${time}, ${user}"/>
- <field name="sign" colspan="4"/>
+ <separator string="Signature" colspan="4"/>
+ <field name="sign" colspan="4" nolabel="1"/>
</form>
</field>
</record>
@@ -174,9 +172,10 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Email Layout">
- <field name="name" colspan="4"/>
+ <field name="name"/>
<label colspan="4" string="The following objects are availables: ${ctx}, ${time}, ${user}, ${sign}, ${body}"/>
- <field name="layout" colspan="4"/>
+ <separator string="Layout" colspan="4"/>
+ <field name="layout" colspan="4" nolabel="1"/>
</form>
</field>
</record>
@@ -235,9 +234,15 @@
<field name="search_view_id" ref="training_email_layout_search"/>
</record>
+<<<<<<< TREE
<menuitem parent="training_config_mi" id="training_email_all_emails_mi" name="Emails" sequence='2'/>
<menuitem parent="training_email_all_emails_mi" id="training_email_all_mi"
+=======
+ <menuitem parent="training_config_mi" id="training_email_all_emails_mi" name="Emails" sequence='1'/>
+
+ <menuitem parent="training_email_menu" id="training_email_all_mi"
+>>>>>>> MERGE-SOURCE
action="training_email_all_act" sequence='1'/>
<menuitem parent="training_email_all_emails_mi" id="training_email_stylegroup_mi"
action="training_email_stylegroup_act" />
@@ -260,7 +265,11 @@
<separator string="Message" colspan="4" />
<field name="message" colspan="4" nolabel="1" />
<separator colspan="4" />
+<<<<<<< TREE
<button name="action_send" string="Send Email" type="object" colspan="4" icon="gtk-execute"/>
+=======
+ <button name="action_send" string="Send Email" type="object" colspan="4" icon='gtk-execute'/>
+>>>>>>> MERGE-SOURCE
</form>
</field>
</record>
=== modified file 'training/training_holiday_view.xml'
--- training/training_holiday_view.xml 2011-03-18 10:16:47 +0000
+++ training/training_holiday_view.xml 2011-03-18 11:51:32 +0000
@@ -23,8 +23,8 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Holiday Period">
+ <field name="name"/>
<field name="year_id"/>
- <field name="name"/>
<field name="date_start"/>
<field name="date_stop"/>
<field name="contact_id" context="{'function':'standard'}"/>
@@ -52,7 +52,7 @@
<field name="arch" type="xml">
<search string="Search Holiday Period Email">
<group colspan='4'>
- <filter icon="terp-accessories-archiver" string="Futures Periods" domain="[('date_start', '>=', time.strftime('%%Y-%%m-%%d'))]"/>
+ <filter icon="terp-stock" string="Futures Periods" domain="[('date_start', '>=', time.strftime('%%Y-%%m-%%d'))]"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="year_id"/>
@@ -60,8 +60,6 @@
</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'}"/>
</group>
</search>
=== modified file 'training/training_view.xml'
--- training/training_view.xml 2011-03-18 11:19:49 +0000
+++ training/training_view.xml 2011-03-18 11:51:32 +0000
@@ -8,9 +8,9 @@
<field name="arch" type="xml">
<form string="Theme">
<separator string="Theme" colspan="4"/>
+ <field name="name"/>
+ <field name="parent_id"/>
<field name="nr"/>
- <field name="parent_id"/>
- <field name="name"/>
<field name="priority"/>
<field name="active"/>
<separator string="Partners" colspan="4"/>
@@ -74,15 +74,15 @@
<field name="name" string="Code" select="1"/>
<field name="parent_id" string="Parent"/>
<notebook colspan="4">
- <page string="Description">
- <field name="description" nolabel="1" colspan="4"/>
- </page>
<page string="Partners & Pricelist">
<separator string="Pricelist" colspan="4"/>
<field name="price_list_id"/>
<separator string="Partners" colspan="4"/>
<field name="partner_ids" colspan="4" nolabel="1"/>
</page>
+ <page string="Description">
+ <field name="description" nolabel="1" colspan="4"/>
+ </page>
</notebook>
</form>
</field>
@@ -113,12 +113,6 @@
<field name="complete_name" string="Code"/>
<field name="parent_id" string="Parent" widget="selection"/>
<field name="price_list_id" widget="selection"/>
- <newline/>
- <group expand="0" string="Group By...">
- <filter string="Parent" icon="terp-personal" domain="[]" context="{'group_by' : 'parent_id'}" />
- <separator orientation="vertical"/>
- <filter string="Pricelist" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by' : 'price_list_id'}" />
- </group>
</search>
</field>
</record>
@@ -192,7 +186,6 @@
<field name="product_id"/>
<field name="min_limit"/>
<field name="max_limit"/>
- <field name="description"/>
</tree>
</field>
</record>
@@ -321,9 +314,13 @@
</notebook>
<group colspan="4" col="6">
<field name="state_course" />
- <button string="Deprecate" icon="terp-dialog-close" type="workflow" name="signal_deprecate" attrs="{'invisible' : [('state_course', '!=', 'validated')]}"
+ <button string="Deprecate" icon="gtk-cancel" type="workflow" name="signal_deprecate" attrs="{'invisible' : [('state_course', '!=', 'validated')]}"
confirm="Do you want to deprecate this course ?" />
+<<<<<<< TREE
<button string="Validate" icon="gtk-apply" type="workflow" name="signal_validate" attrs="{'invisible' : [('state_course', '!=', 'pending'),('state_course', '!=', 'draft')]}"
+=======
+ <button string="Validate" icon="terp-camera_test" type="workflow" name="signal_validate" attrs="{'invisible' : [('state_course', '!=', 'pending'),('state_course', '!=', 'draft')]}"
+>>>>>>> MERGE-SOURCE
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>
@@ -340,8 +337,7 @@
<search string="Search Training Email">
<group colspan='4'>
<filter icon="terp-document-new" string="Draft" domain="[('state','=', 'draft')]"/>
- <filter icon="gtk-go-forward" string="Validated" domain="[('state','=', 'validated')]"/>
- <filter icon="terp-dialog-close" string="Deprecated" domain="[('state','=', 'deprecated')]"/>
+ <filter icon="terp-camera_test" string="Validated" domain="[('state','=', 'validated')]"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="duration"/>
@@ -487,12 +483,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 ?" icon="gtk-go-forward"/>
+ confirm="Do you want to validate this catalog ?" icon="terp-camera_test"/>
<button name="signal_cancel" string="Cancel" type="workflow" states="validated,inprogress"
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_inprogress" string="In Progress" type="workflow" states="validated" icon="gtk-apply" />
<button name="signal_deprecate" string="Deprecate" type="workflow" states="inprogress"
- confirm="Do you want to deprecate this catalog ?" icon="gtk-apply" />
+ confirm="Do you want to deprecate this catalog ?" icon="gtk-cancel" />
</group>
</form>
</field>
@@ -520,11 +516,10 @@
<search string="Search Catalogs">
<filter icon="terp-go-year" string="Old" domain="[('year', '<', time.strftime('%%Y'))]" />
<filter icon="terp-go-year" string="Current" domain="[('year', '=', time.strftime('%%Y'))]" />
+ <separator orientation="vertical"/>
<filter icon="terp-document-new" string="Draft" domain="[('state','=', 'draft')]"/>
- <filter icon="terp-check" string="In Progress" domain="[('state','=', 'inprogress')]"/>
- <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')]"/>
+ <filter icon="gtk-apply" string="In Progress" domain="[('state','=', 'inprogress')]"/>
+ <filter icon="terp-camera_test" string="Validated" domain="[('state','=', 'validated')]"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="year" />
@@ -638,8 +633,8 @@
<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 ?" 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_open" string="Open" type="workflow" states="draft" confirm="Do you want to open this session ?" icon="gtk-open"/>
+ <button name="signal_open_confirm" string="Confirm" type="workflow" states="opened" confirm="Do you want to confirm this session ?" icon="terp-camera_test"/>
<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"/>
@@ -730,7 +725,6 @@
<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')]" />
<separator orientation="vertical"/>
<field name="name"/>
<field name="kind"/>
@@ -915,9 +909,9 @@
<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, ...) ?" icon="gtk-apply"/>
+ <button name="seance_confirm" string="Confirm" type="workflow" states="opened" confirm="Do you want to confirm this seance (procurements, ...) ?" icon="terp-camera_test"/>
<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_inprogress" string="Start" type="workflow" states="confirmed" confirm="Do you want to start this seance ?" icon="gtk-convert"/>
<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"/>
@@ -1020,7 +1014,7 @@
<search string="Search Seance">
<filter icon="terp-document-new" string="Draft" domain="[('state', '=', 'draft')]" />
<filter icon="terp-camera_test" string="Confirm" domain="[('state', '=', 'opened')]" />
- <filter icon="terp-check" string="Futur" domain="[('date', '>=', current_date),('state', '!=', 'closed'),('state', '!=', 'cancelled')]" />
+ <filter icon="terp-stock" string="Future" domain="[('date', '>=', current_date),('state', '!=', 'closed'),('state', '!=', 'cancelled')]" />
<separator orientation="vertical"/>
<field name="name"/>
<field name="group_id" />
@@ -1165,7 +1159,7 @@
<group colspan="4" col="6">
<field name="state" />
<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"/>
+ confirm="Do you want to confirm the request for this subscription ?" icon="terp-camera_test"/>
<button string="Cancel" type="workflow" name="signal_cancel" states="draft"
confirm="Do you want to cancel this subscription ?" icon="gtk-cancel"/>
</group>
@@ -1197,7 +1191,7 @@
<field name="priority">1</field>
<field name="arch" type="xml">
<search string="Search Subscription">
- <filter icon="gtk-go-forward" string="Validate" domain="[('state', '=', 'draft')]" />
+ <filter icon="terp-camera_test" string="Validate" domain="[('state', '=', 'draft')]" />
<filter icon="terp-check" string="Invoice" domain="[('state', '=', 'confirmed')]" />
<separator orientation="vertical"/>
<field name="name"/>
@@ -1391,7 +1385,7 @@
<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 ?" icon="gtk-apply"/>
+ confirm="Do you want to confirm this subscription line ?" icon="terp-camera_test"/>
<button name="signal_cancel" string="Cancel" type="workflow" states="draft"
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"
@@ -1501,7 +1495,7 @@
<field name="priority">1</field>
<field name="arch" type="xml">
<search string="Search Subscription">
- <filter icon="gtk-go-forward" string="Validate" domain="[('state', '=', 'draft'), ('subscription_id.state', '=', 'confirmed')]" />
+ <filter icon="terp-camera_test" 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"/>
@@ -1571,7 +1565,7 @@
<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" icon='gtk-cancel'/>
- <button string="Confirm" type="object" name="action_confirm" icon='gtk-ok'/>
+ <button string="Confirm" type="object" name="action_confirm" icon='terp-camera_test'/>
</group>
<group colspan="4" col="4" states="update" expand="1">
<field name="name"/>
@@ -1723,12 +1717,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 ?" icon="gtk-go-forward"/>
+ confirm="Do you want to validate this offer ?" icon="terp-camera_test"/>
<button name="signal_deprecate" string="Deprecate" type="workflow" states="validated,draft"
- confirm="Do you want to deprecate this offer ?" icon="terp-dialog-close"/>
+ confirm="Do you want to deprecate this offer ?" icon="gtk-cancel"/>
<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" icon="terp-camera_test"/>
+ groups="training.group_offer_manager" icon="terp-document-new"/>
</group>
</form>
</field>
@@ -1761,8 +1755,7 @@
<search string="Search Training Offer">
<group col='10' colspan='4'>
<filter icon="terp-document-new" string="Draft" domain="[('state','=', 'draft')]"/>
- <filter icon="gtk-go-forward" string="Validated" domain="[('state','=', 'validated')]"/>
- <filter icon="terp-dialog-close" string="Deprecated" domain="[('state','=', 'deprecated')]"/>
+ <filter icon="terp-camera_test" string="Validated" domain="[('state','=', 'validated')]"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="categorie_id"/>
@@ -1825,7 +1818,9 @@
<data>
<menuitem id="training_mi" name="Training Management" sequence="2" />
- <menuitem id="training_config_mi" parent="training_mi" name="Configuration" sequence="60"/>
+ <menuitem parent="training_mi" id="training_email_menu" name="Emails" sequence='65'/>
+
+ <menuitem id="training_config_mi" parent="training_mi" name="Configuration" sequence="70"/>
<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'/>
@@ -1836,7 +1831,7 @@
<menuitem id="training_library_mi" parent="training_mi" name="Library" sequence="2" />
- <menuitem id="training_library_course_mi" parent="training_library_mi" name="Courses" />
+ <menuitem id="training_library_course_mi" parent="training_library_mi" name="Courses" sequence="1"/>
<menuitem id="training_library_course_course_mi" parent="training_library_course_mi" action="training_course_all_act" sequence="1"/>
@@ -1850,7 +1845,9 @@
<menuitem id="training_library_course_by_reference_id" parent="training_library_course_course_mi" action="training_course_by_reference_all_act" sequence="6" />
-->
- <menuitem id="training_offer_mi" parent="training_library_mi" name="Offers" action="training_offer_all_act" />
+ <menuitem id="training_library_offers_menu" parent="training_library_mi" name="Offers" sequence="2"/>
+
+ <menuitem id="training_offer_mi" parent="training_library_offers_menu" name="Offers" action="training_offer_all_act" />
<menuitem id="training_request_mi"
name="Requests"
@@ -1863,15 +1860,17 @@
<menuitem id="training_planning_mi" parent="training_mi" name="Plannings" sequence="30" />
- <menuitem id="training_planning_session_all_mi" parent="training_planning_mi" action="training_session_all_act" />
-
- <menuitem id="training_planning_session_all_mi" parent="training_planning_mi" action="training_session_all_act" />
-
- <menuitem id="training_planning_session_calendar_mi" parent="training_planning_mi" action="training_session_planning_act"/>
-
- <menuitem id="training_planning_seances_mi" parent="training_planning_mi" action="training_seance_all_act" />
-
- <menuitem id="training_planning_seances_planning_mi" parent="training_planning_mi" action="training_seance_planning_act" />
+ <menuitem id="training_planning_sessions_menu" parent="training_planning_mi" name="Session" sequence="10"/>
+
+ <menuitem id="training_planning_seance_menu" parent="training_planning_mi" name="Seance" sequence="20"/>
+
+ <menuitem id="training_planning_session_all_mi" parent="training_planning_sessions_menu" action="training_session_all_act" />
+
+ <menuitem id="training_planning_session_calendar_mi" parent="training_planning_sessions_menu" action="training_session_planning_act"/>
+
+ <menuitem id="training_planning_seances_mi" parent="training_planning_seance_menu" action="training_seance_all_act" />
+
+ <menuitem id="training_planning_seances_planning_mi" parent="training_planning_seance_menu" action="training_seance_planning_act" />
<menuitem id="training_subscription_management_mi" parent="training_mi" name="Subscriptions" sequence="50" />
@@ -2028,13 +2027,13 @@
</notebook>
<group colspan="4" col="10">
<field name="state"/>
- <button type="workflow" name="pshr_validate" string="Validate" states="draft" icon="gtk-go-forward"
+ <button type="workflow" name="pshr_validate" string="Validate" states="draft" icon="terp-camera_test"
confirm="Do you want to validate this request ?" />
- <button type="workflow" name="pshr_request" string="Send Request" states="valid" icon="gtk-convert"/>
+ <button type="workflow" name="pshr_request" string="Send Request" states="valid" icon="gtk-execute"/>
<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"
+ <button type="workflow" name="pshr_refuse" string="Refuse" states="requested" icon="gtk-refresh"
confirm="Do you want to refuse this request ?" />
<button type="workflow" name="pshr_cancel" string="Cancel" icon="gtk-cancel"
states="draft,valid,requested,accepted"
@@ -2084,8 +2083,6 @@
<filter icon="terp-document-new" string="Draft" domain="[('state','=', 'draft')]"/>
<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"/>
@@ -2095,11 +2092,10 @@
<newline/>
<group expand="0" string="Group By..." colspan="4" col="20">
<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="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
- <separator orientation="vertical"/>
<filter string="Payment" icon="terp-stage" domain="[]" context="{'group_by':'payment_mode'}"/>
+ <separator orientation="vertical"/>
+ <filter string="Session" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'session_id'}"/>
+ <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
</group>
</search>
</field>
@@ -2194,8 +2190,6 @@
<search string="Search All Participation">
<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"/>
@@ -2207,8 +2201,6 @@
<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'}"/>
</group>
</search>
@@ -2290,13 +2282,6 @@
<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'}"/>
- </group>
</search>
</field>
</record>
@@ -2433,7 +2418,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Target Audience">
- <field name="name" colspan="4" required="1"/>
+ <field name="name" required="1"/>
<separator string="Target Audience (Internet)" colspan="4"/>
<field name="note" nolabel="1" colspan="4"/>
</form>
@@ -2540,7 +2525,7 @@
<separator string="" colspan="2" />
<group col="2" colspan="2">
<button name="action_cancel" type="object" special="cancel" string="Cancel" icon="gtk-cancel" />
- <button name="action_apply" type="object" string="Duplicate" icon="gtk-apply" />
+ <button name="action_apply" type="object" string="Duplicate" icon="gtk-execute" />
</group>
</form>
</field>
@@ -2639,18 +2624,18 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Reassign Participation to Seance">
- <separator string="Participation Information" colspan="4" />
- <field name="participation_id" on_change="on_change_participation(participation_id)" colspan="4" />
- <separator string="Seance Information" colspan="4" />
- <field name="participation_sl" />
- <field name="participation_session_id" />
- <field name="participation_seance_id" />
- <field name="participation_seance_date" />
- <separator string="Seance Destination" colspan="4" />
- <field name="seance_id" colspan="4" on_change="on_change_seance(seance_id)" />
-
+ <separator string="Participation Information" colspan="4"/>
+ <field name="participation_id" on_change="on_change_participation(participation_id)" colspan="4"/>
+ <separator string="Seance Information" colspan="4"/>
+ <field name="participation_sl"/>
+ <field name="participation_session_id"/>
+ <field name="participation_seance_id"/>
+ <field name="participation_seance_date"/>
+ <separator string="Seance Destination" colspan="4"/>
+ <field name="seance_id" colspan="4" on_change="on_change_seance(seance_id)"/>
+ <separator string="" colspan="4"/>
<group col="2" colspan="4">
- <button name="close_cb" string="Cancel" type="object" special="cancel" icon="gtk-cancel" />
+ <button name="close_cb" string="Cancel" type="object" special="cancel" icon="gtk-cancel"/>
<button name="apply_cb" string="Apply" type="object" icon="gtk-apply"
confirm="Are you sure to want to move this participation to this seance ?"/>
</group>
=== modified file 'training_exam/training_exam_view.xml'
--- training_exam/training_exam_view.xml 2011-03-18 10:37:25 +0000
+++ training_exam/training_exam_view.xml 2011-03-18 11:51:32 +0000
@@ -159,7 +159,7 @@
<field name="arch" type="xml">
<search string="Search Exam Question">
<filter icon="terp-document-new" string="Draft" domain="[('state','=', 'draft')]"/>
- <filter icon="gtk-go-up" string="Validate" domain="[('state','=', 'validated')]"/>
+ <filter icon="terp-camera_test" string="Validate" domain="[('state','=', 'validated')]"/>
<filter icon="terp-dialog-close" string="Deprecate" domain="[('state','=', 'deprecated')]"/>
<separator orientation="vertical"/>
<field name="type"/>
@@ -377,7 +377,7 @@
<field name="arch" type="xml">
<search string="Search Session">
<filter icon="terp-document-new" string="Draft" domain="[('state', '=', 'draft')]"/>
- <filter icon="gtk-go-up" string="Validate" domain="[('state','=', 'validated')]"/>
+ <filter icon="terp-camera_test" string="Validate" domain="[('state','=', 'validated')]"/>
<filter icon="terp-dialog-close" string="Deprecate" domain="[('state','=', 'deprecated')]"/>
<separator orientation="vertical"/>
<field name="kind"/>
=== modified file 'training_exam/wizard/training_exam_question_validate_view.xml'
--- training_exam/wizard/training_exam_question_validate_view.xml 2011-03-15 10:34:06 +0000
+++ training_exam/wizard/training_exam_question_validate_view.xml 2011-03-18 11:51:32 +0000
@@ -12,7 +12,7 @@
<group colspan="2" col="6">
<field name="state" invisible="1"/>
<button type="special" special="cancel" string="Cancel" icon="gtk-cancel"/>
- <button type="object" icon="gtk-go-up" name="action_validate_wo_qz" string="Validate (without Quizz)"/>
+ <button type="object" icon="gtk-go-foward" name="action_validate_wo_qz" string="Validate (without Quizz)"/>
<button type="object" icon="gtk-ok" name="action_validate_w_qz" string="Validate (with Quizz)"/>
</group>
</form>
Follow ups
