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-exam-remove-harcode-2199-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-exam-remove-harcode-2199-ysa/+merge/58638

[FIX] training_exam :- remove hard-code of lang fr_FR in report. task id:-2199
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/addons-training-exam-remove-harcode-2199-ysa/+merge/58638
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/addons-training-exam-remove-harcode-2199-ysa.

=== modified file 'training_exam/report/training_seance_exam_followup_list.rml'
--- training_exam/report/training_seance_exam_followup_list.rml	2011-04-05 11:22:51 +0000
+++ training_exam/report/training_seance_exam_followup_list.rml	2011-04-21 08:37:36 +0000
@@ -79,7 +79,7 @@
   <story>
     <para style="Standard">[[ repeatIn(objects,'seance') ]]</para>
     <section>
-    <para style="Standard"><font color="white">[[ setLang(seance.course_id and (seance.course_id.lang_id and seance.course_id.lang_id.code or '') or 'fr_FR') ]]</font></para>
+    <para style="Standard"><font color="white">[[ setLang(seance.course_id and (seance.course_id.lang_id and seance.course_id.lang_id.code or '') or 'en_US') ]]</font></para>
     <para style="Standard"><font color="white">[[ seance.kind == 'exam' or removeParentNode('story') ]]</font></para>
     <para style="terp_header_Centre">Exam Followup List</para>
     <blockTable colWidths="120.0,100.0,330.0,100.0,130.0" style="Table1">

=== modified file 'training_exam/report/training_seance_exam_labels.rml'
--- training_exam/report/training_seance_exam_labels.rml	2009-11-16 13:21:52 +0000
+++ training_exam/report/training_seance_exam_labels.rml	2011-04-21 08:37:36 +0000
@@ -52,7 +52,7 @@
   </stylesheet>
   <images/>
   <story>
-    [[ repeatIn(objects,'seance') ]] [[ setLang(seance.course_id and (seance.course_id.lang_id and seance.course_id.lang_id.code or '') or 'fr_FR') ]]
+    [[ repeatIn(objects,'seance') ]] [[ setLang(seance.course_id and (seance.course_id.lang_id and seance.course_id.lang_id.code or '') or 'en_US') ]]
     [[ seance.kind == 'exam' or removeParentNode('story') ]]
     <blockTable colWidths="19.2cm" style="Standard_Outline" rowHeights="6.0cm">
       <tr>

=== modified file 'training_exam/training_exam.py'
--- training_exam/training_exam.py	2011-04-11 08:57:50 +0000
+++ training_exam/training_exam.py	2011-04-21 08:37:36 +0000
@@ -1730,7 +1730,7 @@
     _inherit = 'training.email'
 
     def _get_lang(self, session, seance, **objects):
-        DEFAULT_LANG = 'fr_FR'
+        DEFAULT_LANG = 'en_US'
         lng = None
         subline = objects.get('subline', None)
         if (session and session.kind == 'exam') or (seance and seance.kind == 'exam'):