openerp-dev-web team mailing list archive

["gpa\(Open ERP\)" <gpa@xxxxxxxxxxx>]

gpa(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/useablity_fix into lp:~openobject-training/openobject-addons/training.

Requested reviews:
  Bhumika (OpenERP) (sbh-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/useablity_fix/+merge/55464

Usability issue fix
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/useablity_fix/+merge/55464
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/useablity_fix.

=== renamed file 'document_type/__terp__.py' => 'document_type/__openerp__.py'
=== modified file 'document_type/security/document_type_security.xml'
--- document_type/security/document_type_security.xml	2011-03-17 11:28:58 +0000
+++ document_type/security/document_type_security.xml	2011-03-30 04:38:39 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="0">
-    <record id="group_document_manager" model="res.groups">
-        <field name="name">Document / Manager</field>
-     </record>
+	    <record id="group_document_manager" model="res.groups">
+	        <field name="name">Document / Manager</field>
+	     </record>
     </data>
 </openerp>

=== modified file 'training/training_holiday_view.xml'
--- training/training_holiday_view.xml	2011-03-18 12:08:52 +0000
+++ training/training_holiday_view.xml	2011-03-30 04:38:39 +0000
@@ -74,7 +74,7 @@
             <field name="search_view_id" ref="holiday_period_search"/>
         </record>
 
-        <menuitem id="holiday_mi" name="Non-Working Days" parent="training_config_mi" sequence='3'/>
+        <menuitem id="holiday_mi" name="Non-Working Days" parent="training_library_mi" sequence='15'/>
         <menuitem id="holiday_period_all_mi" action="holiday_period_all_act" parent="holiday_mi" />
 
         <record model="ir.ui.view" id="holiday_year_tree">
@@ -93,7 +93,7 @@
             <field name="model">training.holiday.year</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Holiday year">
+                <form string="Holiday Year">
                     <field name="year"/>
                     <separator string="Periods" colspan="4"/>
                     <field name="period_ids" colspan="4" nolabel="1">

=== modified file 'training/wizard/training_subscription_second_line.xml'
--- training/wizard/training_subscription_second_line.xml	2011-03-22 08:49:13 +0000
+++ training/wizard/training_subscription_second_line.xml	2011-03-30 04:38:39 +0000
@@ -23,6 +23,7 @@
 			    res_model="training.subscription.second.line"
 			    src_model="training.subscription.line.second"
 			    view_mode="form"
+			    multi="True"
 			    target="new"
 	            key2="client_action_multi"
 			    id="action_training_subscription_line_second"/>

=== modified file 'training_evaluation/report/report_evaluation_contact.rml'
--- training_evaluation/report/report_evaluation_contact.rml	2010-07-26 19:59:29 +0000
+++ training_evaluation/report/report_evaluation_contact.rml	2011-03-30 04:38:39 +0000
@@ -128,7 +128,7 @@
         <blockTable colWidths="100.0,380.0" style="Table2">
             <tr>
                 <td><para style="terp_tblheader_General">Lecturer</para></td>
-                <td><para style="terp_default_8">[[ ev.title ]] [[ ev.name ]] [[ ev.first_name ]]</para></td>
+                <td><para style="terp_default_8">[[ ev.title.name ]] [[ ev.name ]] [[ ev.first_name ]]</para></td>
             </tr>
             <tr>
                 <td><para style="terp_tblheader_General">Number of Evaluations</para></td>

=== modified file 'training_evaluation/training_evaluation_view.xml'
--- training_evaluation/training_evaluation_view.xml	2011-03-21 10:41:55 +0000
+++ training_evaluation/training_evaluation_view.xml	2011-03-30 04:38:39 +0000
@@ -188,7 +188,7 @@
                     <notebook colspan="4">
                         <page string="Questionnaire">
                             <field name="questionnaire_id"/>
-                            <button name="load_questions" type="object" string="Load Questions" colspan="2" />
+                            <button name="load_questions" type="object" string="Load Questions" colspan="2" icon="gtk-execute"/>
                             <field name="line_ids" colspan="4" nolabel="1" view_mode="tree" mode="tree,form" />
                         </page>
                     </notebook>
@@ -511,12 +511,12 @@
         </record>
 
         <menuitem id="training_evaluation_top_lecturer_report_mi"
-            parent="training_report.menu_training_report"
+            parent="base.menu_training_report"
             type="wizard"
             action="training_evaluation_top_lecturer_report_wizard" />
 
         <menuitem id="training_evaluation_top_course_report_mi"
-            parent="training_report.menu_training_report"
+            parent="base.menu_training_report"
             type="wizard"
             action="training_evaluation_top_course_report_wizard" />
 

=== modified file 'training_exam_processing/training_exam_processing_view.xml'
--- training_exam_processing/training_exam_processing_view.xml	2011-03-29 06:01:24 +0000
+++ training_exam_processing/training_exam_processing_view.xml	2011-03-30 04:38:39 +0000
@@ -148,7 +148,7 @@
         </record>
 
         <act_window id="show_participation_to_correct_rel"
-            name="Participations to correct"
+            name="Participations To Correct"
             src_model="training.exam.correction.request"
             res_model="training.participation"
             domain="[('correction_id.request_id', '=', active_id),('correction_id.request_id.state', 'in', ('done', 'accepted')),('correction_id.state', '=', 'to_correct')]"

=== modified file 'training_intra/training_intra_view.xml'
--- training_intra/training_intra_view.xml	2011-03-21 09:06:32 +0000
+++ training_intra/training_intra_view.xml	2011-03-30 04:38:39 +0000
@@ -74,7 +74,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Budget Template">
-                    <field name="name" colspan="4" />
+                    <field name="name" />
                     <field name="line_ids" colspan="4" nolabel="1" />
                     <group colspan="4" col="6">
                         <field name="costs" />