← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~openerp-dev/openobject-addons/training_useablity into lp:~openobject-training/openobject-addons/training

 

gpa(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/training_useablity 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/training_useablity/+merge/60021

Improvement in the return type of the degree validate wizard and exam summery view
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/training_useablity/+merge/60021
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/training_useablity.
=== modified file 'training_degree/wizard/training_validate_degree.py'
--- training_degree/wizard/training_validate_degree.py	2011-04-07 13:04:11 +0000
+++ training_degree/wizard/training_validate_degree.py	2011-05-05 06:43:30 +0000
@@ -31,7 +31,7 @@
         for obj in proxy.browse(cr, uid, context.get('active_ids',[]), context=context):
             if obj.state == 'desired' and obj.is_eligible == 'yes':
                 obj.action_acquire()
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 validate_degree()
 

=== modified file 'training_exam/training_exam_view.xml'
--- training_exam/training_exam_view.xml	2011-04-26 06:36:47 +0000
+++ training_exam/training_exam_view.xml	2011-05-05 06:43:30 +0000
@@ -697,23 +697,25 @@
                     </field>
                     <notebook position="inside">
 						<page string="Exam Summary" attrs="{'invisible':[('kind', '!=', 'exam')]}" groups="base.group_user">
-                            <field name="course_questionnaire_id" colspan="4" link="0" on_change="on_change_course_questionnaire(course_questionnaire_id, questionnaire_id)"/>
+						    <group colspan="4" col="4">
+                                <field name="course_questionnaire_id" colspan="4" link="0" on_change="on_change_course_questionnaire(course_questionnaire_id, questionnaire_id)"/>
+                            </group>
 						    <group colspan="2" col="2">
-							<separator string='Result' colspan="2"/>
-							<field name="result"/>
-							<field name="total_points"/>
-							<field name="result_pourcentage"/>
-							<separator string='' colspan="2"/>
-							<field name="passing_score" groups="training_exam.group_exam_user"/>
-							<field name="forced_result" on_change="on_change_forced_result(forced_result)" groups="training_exam.group_exam_user"/>
+    							<separator string='Result' colspan="2"/>
+    							<field name="result"/>
+    							<field name="total_points"/>
+    							<field name="result_pourcentage"/>
+    							<separator string='' colspan="2"/>
+    							<field name="passing_score" groups="training_exam.group_exam_user"/>
+    							<field name="forced_result" on_change="on_change_forced_result(forced_result)" groups="training_exam.group_exam_user"/>
 						    </group>
 						    <group colspan="2" col="2">
-							<separator string='Status' colspan="2"/>
-							<field name="result_received" groups="training_exam.group_exam_user"/>
-							<field name="certif_printed" groups="training_exam.group_exam_user"/>
-							<field name="succeeded" />
-							<separator string="Configuration" colspan="2"/>
-							<field name="forced_noresult" groups="training_exam.group_exam_user"/>
+    							<separator string='Status' colspan="2"/>
+    							<field name="result_received" groups="training_exam.group_exam_user"/>
+    							<field name="certif_printed" groups="training_exam.group_exam_user"/>
+    							<field name="succeeded" />
+    							<separator string="Configuration" colspan="2"/>
+    							<field name="forced_noresult" groups="training_exam.group_exam_user"/>
 						    </group>
 						</page>
                         <page string="Exam Participation" attrs="{'invisible':[('kind', '!=', 'exam')]}" groups="base.group_user">


Follow ups