← Back to team overview

openerp-dev-web team mailing list archive

  1. openerp-dev-web team
  2. Mailing list archive
  3. Message #05053

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

  Thread Previous • Date Previous • • Thread Next 
gpa(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/fixed_some_report_error 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/fixed_some_report_error/+merge/56332

Fixed reports error 
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/fixed_some_report_error/+merge/56332
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/fixed_some_report_error.

=== modified file 'training_evaluation/report/empty_evaluation.rml'
--- training_evaluation/report/empty_evaluation.rml	2010-08-30 15:17:27 +0000
+++ training_evaluation/report/empty_evaluation.rml	2011-04-05 11:19:29 +0000
@@ -11,7 +11,7 @@
             <frame id="first" x1="0.9cm" y1="1.7cm" height="25.30cm" width="20cm"/>
             <pageGraphics>
                 <!-- You Logo - Change X,Y,Width and Height -->
-                <image x="1.15cm" y="27.3cm" height="60.0" >[[company.logo]]</image>
+                <image x="1.15cm" y="27.3cm" height="60.0" >[[company.logo or '']]</image>
                 <setFont name="Helvetica" size="8"/>
                 <fill color="black"/>
                 <stroke color="#d16701"/>
@@ -189,7 +189,7 @@
             </tr>
         </blockTable>
         <para style="Standard"><font color="white"> </font></para>
-        
+
         <section>
             [[ repeatIn(get_question_by_main_category(evg.questionnaire_id.question_ids), 'main_categ') ]]
             <blockTable colWidths="380.0,155.0,15.0" style="Table1">
@@ -264,7 +264,7 @@
 	    <blockTable colWidths="550.0,15.0" style="Table2" rowHeights="25.0">
 		    <tr>[[ repeatIn(xrange(7), 'lineno') ]]
 		        <td><para style="terp_default_10">..................................................................................................................................................................................................</para></td>
-                <td></td>		
+                <td></td>
 		    </tr>
 	    </blockTable>
     </story>

=== modified file 'training_evaluation/report/report_top_lecturer.rml'
--- training_evaluation/report/report_top_lecturer.rml	2010-03-11 06:51:35 +0000
+++ training_evaluation/report/report_top_lecturer.rml	2011-04-05 11:19:29 +0000
@@ -142,7 +142,7 @@
             <blockTable colWidths="160.0,50.0" style="Table2">
                 <tr>
                     <td>
-                        <para style="terp_default_8">[[ line[0].title ]] [[ line[0].name ]] [[ line[0].first_name ]]</para>
+                        <para style="terp_default_8">[[ line[0].title.name ]] [[ line[0].name ]] [[ line[0].first_name ]]</para>
                     </td>
                     <td>
                         <para style="terp_default_Right_8">[[ formatLang(line[1]) ]]</para>

=== modified file 'training_exam/report/exam_sheet.rml'
--- training_exam/report/exam_sheet.rml	2011-02-17 12:17:23 +0000
+++ training_exam/report/exam_sheet.rml	2011-04-05 11:19:29 +0000
@@ -5,7 +5,7 @@
             <frame id="first" x1="0.9cm" y1="1.7cm" height="25.30cm" width="20cm"/>
             <pageGraphics>
                 <!-- You Logo - Change X,Y,Width and Height -->
-                <image x="1.15cm" y="27.3cm" height="60.0" >[[company.logo]]</image>
+                <image x="1.15cm" y="27.3cm" height="60.0" >[[company.logo or '']]</image>
                 <setFont name="Helvetica" size="8"/>
                 <fill color="black"/>
                 <stroke color="#d16701"/>
@@ -289,7 +289,7 @@
             <para style="terp_default_10_indented">[[ preformat(question.question_id.question) ]]</para>
             <para style="terp_italic_8_indented">([[ get_question_point(question.question_id) ]][[ get_question_type_tips(question.question_id) and ', '+get_question_type_tips(question.question_id) or '' ]])[[ show_extended_question_infos and get_extended_question_infos(question.question_id) or '']]</para>
             <blockTable colWidths="20.0,525.0" style="Table2">
-                <tr style="Table2_Image">[[ get_image(question, 'after_text') or removeParentNode('blockTable') ]] 
+                <tr style="Table2_Image">[[ get_image(question, 'after_text') or removeParentNode('blockTable') ]]
             <td></td>
                     <td><imageinline>[[ get_image(question, 'after_text') ]]</imageinline></td>
                 </tr>

=== modified file 'training_exam/report/training_seance_exam_followup_list.rml'
--- training_exam/report/training_seance_exam_followup_list.rml	2009-11-16 09:00:44 +0000
+++ training_exam/report/training_seance_exam_followup_list.rml	2011-04-05 11:19:29 +0000
@@ -5,7 +5,7 @@
       <frame id="first" x1="1.15" y1="1.9cm" width="29.6cm" height="16.3cm"/>
       <pageGraphics>
         <!-- You Logo - Change X,Y,Width and Height -->
-        <image x="1.15cm" y="18.6cm" height="60.0" >[[company.logo]]</image>
+        <image x="1.15cm" y="18.6cm" height="60.0" >[[company.logo or '']]</image>
         <setFont name="Helvetica" size="8"/>
         <fill color="black"/>
         <stroke color="#d16701"/>
@@ -91,9 +91,9 @@
         <td><para style="seanceInfo">[[ _('Number Of Participant: ') ]][[ seance.participant_count ]]</para></td>
     </tr>
     </blockTable>
-    
+
     <para style="Standard"><font color="white"><br/></font></para>
-    
+
     <blockTable colWidths="3.5cm,3cm,2cm,4.5cm,4.5cm,2.5cm,2.5cm,2.5cm,2.5cm" style="Table1" repeatRows="1">
       <tr>
         <td><para style="terp_tblheader_General_Centre">CORRECTOR</para></td>
@@ -119,9 +119,9 @@
         <td></td>
       </tr>
     </blockTable>
-    
+
     <para style="Standard"><font color="white"><br/></font></para>
-    <para style="terp_tblheader_Details_Centre">Extra Participants</para> 
+    <para style="terp_tblheader_Details_Centre">Extra Participants</para>
     <blockTable colWidths="3.5cm,3cm,2cm,4.5cm,4.5cm,2.5cm,2.5cm,2.5cm,2.5cm" style="Table1" repeatRows="1">
       <tr>
         <td><para style="terp_tblheader_General_Centre">CORRECTOR</para></td>

=== modified file 'training_exam/training_exam_report.xml'
--- training_exam/training_exam_report.xml	2011-02-17 08:21:08 +0000
+++ training_exam/training_exam_report.xml	2011-04-05 11:19:29 +0000
@@ -40,14 +40,14 @@
             auto="False"
             groups="training_exam.group_exam_user"/>
 
-	<report
-	    id="training_participation_preview"
-	    model="training.exam.questionnaire"
-	    name="training.participation.report.preview"
-	    string="Preview Exam Sheet"
-	    rml="training_exam/report/exam_sheet.rml"
-	    header="False"
-	    groups="training_exam.group_exam_user"/>
+		<report
+		    id="training_participation_preview"
+		    model="training.exam.questionnaire"
+		    name="training.participation.report.preview"
+		    string="Preview Exam Sheet"
+		    rml="training_exam/report/exam_sheet.rml"
+		    header="False"
+		    groups="training_exam.group_exam_user"/>
 
         <report
             auto="False"
@@ -79,7 +79,7 @@
             rml="training_exam/report/training_seance_exam_followup_list.rml"
             groups="training_exam.group_exam_user"
             header="False" />
- 
+
         <report
             id="training_seance_exam_labels_report"
             model="training.seance"
@@ -88,6 +88,6 @@
             groups="training_exam.group_exam_user"
             rml="training_exam/report/training_seance_exam_labels.rml"
             header="False" />
-           
+
     </data>
 </openerp>

=== modified file 'training_report/report/count_subscriptions_offer.rml'
--- training_report/report/count_subscriptions_offer.rml	2011-04-01 13:23:47 +0000
+++ training_report/report/count_subscriptions_offer.rml	2011-04-05 11:19:29 +0000
@@ -159,7 +159,7 @@
         </para>
 	<section>
         <blockTable colWidths="100.0,100.0,100.0" style="Table5">
-            <tr>[[ data['form']['year'] == 0 and setTag('blockTable','blockTable', {'style': 'Table6'}) ]]
+            <tr><font>[[ data['form']['year'] == 0 and setTag('blockTable','blockTable', {'style': 'Table6'})  or removeParentNode('font')   ]]</font>
                 <td><para style="terp_tblheader_Details">State</para></td>
                 <td><para style="terp_tblheader_Details_Centre">Current Period</para></td>
                 <td><para style="terp_tblheader_Details_Centre">Relative Period (Y[[ data['form']['year'] ]])</para></td>

=== modified file 'training_report/report/session_report.rml'
--- training_report/report/session_report.rml	2011-04-01 13:23:47 +0000
+++ training_report/report/session_report.rml	2011-04-05 11:19:29 +0000
@@ -160,7 +160,7 @@
         </para>
 	<section>
         <blockTable colWidths="100.0,100.0,100.0" style="Table5">
-            <tr>[[ data['form']['year'] == 0 and setTag('blockTable', 'blockTable', {'style': 'Table6'}) ]]
+            <tr><font>[[ data['form']['year'] == 0 and setTag('blockTable', 'blockTable', {'style': 'Table6'})  or removeParentNode('font') ]]</font>
                 <td><para style="terp_tblheader_Details">State</para></td>
                 <td><para style="terp_tblheader_Details_Centre">Current Period</para></td>
                 <td><para style="terp_tblheader_Details_Centre">Relative Period (Y[[ data['form']['year'] ]])</para></td>

Follow ups

  Thread Previous • Date Previous • • Thread Next