openerp-dev-web team mailing list archive

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

Yogesh(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/addons-training-fix-ysa into lp:~openobject-training/openobject-addons/training.

Requested reviews:
  OpenObject Training (openobject-training)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/addons-training-fix-ysa/+merge/56104

[FIX] training, training_degree and training_diagnostic :- fix some report problem,  add icon in button and improve view.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/addons-training-fix-ysa/+merge/56104
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/addons-training-fix-ysa.

=== modified file 'training/report/training_course.rml'
--- training/report/training_course.rml	2009-12-17 15:55:28 +0000
+++ training/report/training_course.rml	2011-04-04 06:18:26 +0000
@@ -267,7 +267,7 @@
           <para style="terp_default_8">[[ lect.name ]]</para>
         </td>
         <td>
-          <para style="terp_default_8">[[ lect.function_id.name]]</para>
+          <para style="terp_default_8">[[ lect.function]]</para>
         </td>
       </tr>
     </blockTable>

=== modified file 'training/training_content_review_view.xml'
--- training/training_content_review_view.xml	2011-03-18 11:47:06 +0000
+++ training/training_content_review_view.xml	2011-04-04 06:18:26 +0000
@@ -10,12 +10,16 @@
                 <field name="course_id" readonly="1"/>
                 <field name="type" readonly="1"/>
                 <group colspan="2" col="2" attrs="{'invisible': [('type','!=','course_material')]}">
-                    <field name="course_material_ids" domain="[('res_model','=','training.course'),('res_id','=',course_id),('type','=','course_material')]"/>
+                    <separator colspan="2" string="Course Material"/>
+                    <field name="course_material_ids" nolabel="1" domain="[('res_model','=','training.course'),('res_id','=',course_id),('type','=','course_material')]"/>
                 </group>
                 <group colspan="2" col="2" attrs="{'invisible': [('type', '!=', 'exam_material')]}">
-                    <field name="question_ids" domain="[('course_ids','in',[course_id])]"/>
+                    <separator colspan="2" string="Questions"/>
+                    <field name="question_ids" domain="[('course_ids','in',[course_id])]" nolabel="1"/>
                 </group>
-                <group colspan="2" col="2">
+                <separator colspan="4" string=""/>
+                <group colspan="4">
+                    <label colspan="2"/>
                     <button type="special" special="cancel" string="Cancel" icon="gtk-cancel"/>
                     <button type="object" name="action_add_content" string="Add Content" icon="gtk-ok"/>
                 </group>

=== modified file 'training_degree/training_degree_view.xml'
--- training_degree/training_degree_view.xml	2011-03-18 12:58:20 +0000
+++ training_degree/training_degree_view.xml	2011-04-04 06:18:26 +0000
@@ -227,8 +227,8 @@
                         <form />
                     </field>
                     <group colspan="4" col="2" states="show_degrees">
-                        <button name="select_all_cb" type="object" string="Select All" />
-                        <button name="deselect_all_cb" type="object" string="Deselect All" />
+                        <button name="select_all_cb" type="object" string="Select All" icon="gtk-execute"/>
+                        <button name="deselect_all_cb" type="object" string="Deselect All" icon="gtk-convert"/>
                     </group>
                     <separator colspan="4" />
                     <group colspan="4" col="7">

=== modified file 'training_diagnostic/report/diagnostic_utils.py'
--- training_diagnostic/report/diagnostic_utils.py	2010-06-04 13:23:49 +0000
+++ training_diagnostic/report/diagnostic_utils.py	2011-04-04 06:18:26 +0000
@@ -5,8 +5,7 @@
 
     def get_part_address(self, participation):
         for job in participation.job_id.contact_id.job_ids:
-            if job.function_id \
-                and job.function_id.code == 'privaddr' \
+            if job.function == 'privaddr' \
                 and job.state == 'current':
                 return job
         return None