openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #05051
[Merge] lp:~openerp-dev/openobject-addons/training-fix-report-ysa into lp:~openobject-training/openobject-addons/training
Yogesh(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/training-fix-report-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/training-fix-report-ysa/+merge/56330
[FIX] remove attribute in tr tag and fix other problem in training related report.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/training-fix-report-ysa/+merge/56330
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/training-fix-report-ysa.
=== modified file 'training/training.py'
--- training/training.py 2011-04-01 13:04:46 +0000
+++ training/training.py 2011-04-05 11:03:30 +0000
@@ -3902,7 +3902,7 @@
], 'State', readonly=True, required=True),
'purchase_order_id': fields.many2one('purchase.order', 'Purchase Order', readonly=True),
'purchase_paid': fields.related('purchase_order_id', 'invoice_ids', 'reconciled', type='boolean', string='Invoice Paid', readonly=True,),
- 'amount_to_pay': fields.function(_amount_to_pay, string='Amount to pay', type='char', size='20', method=True),
+ 'amount_to_pay': fields.function(_amount_to_pay, string='Amount to pay', type='char', size=20, method=True),
'price' : fields.function(_price_compute, method=True, string='Remuneration', type='float', digits_compute=dp.get_precision('Account'),
store={
'training.participation.stakeholder': (_store_get_requests, None, 25),
=== modified file 'training_diagnostic/report/diagnostic.rml'
--- training_diagnostic/report/diagnostic.rml 2010-06-04 13:23:49 +0000
+++ training_diagnostic/report/diagnostic.rml 2011-04-05 11:03:30 +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"/>
@@ -142,7 +142,7 @@
</blockTable>
<para style="Standard"><font color="white"> </font></para>
<blockTable colWidths="140.0,35.0,45.0,140.0,30.0,40.0,70.0,55.0" style="Table_Domains" repeatRows="1">
- <tr rowHeight="40.0" style="Table_Domains_Header">
+ <tr>
<td><para style="white-9-center-bold">Domain</para></td>
<td><para style="white-9-center-bold">Score</para></td>
<td><para style="white-9-center-bold">Fit4Job Pass Mark</para></td>
@@ -164,7 +164,7 @@
<td>[[ not dl['course_recommended'] or removeParentNode('td') ]]<CheckBox size="7" x="0" y="0" checked="0"/></td>
<td><CheckBox size="7" x="0" y="0" checked="0"/></td>
</tr>
- <tr style="Table_Domains_Line">
+ <tr>
<td><para style="std-10-right">Total (/[[ get_max_points(p) ]])</para></td>
<td><para style="std-10-center">[[ formatLang(p.result) ]]</para></td>
<td><para style="std-10-center">[[ formatLang(get_max_domain_points(p)) ]]</para></td>
@@ -177,7 +177,7 @@
</blockTable>
<pageBreak/>
<blockTable colWidths="560.0" style="Table_PlanDevs">
- <tr style="Table_Domains_Header">
+ <tr>
<td><para style="white-9-center-bold">Development Plan [[ get_ctx() ]]</para></td>
</tr>
<tr>
=== modified file 'training_diagnostic/report/diagnostic_results.rml'
--- training_diagnostic/report/diagnostic_results.rml 2011-02-13 19:23:28 +0000
+++ training_diagnostic/report/diagnostic_results.rml 2011-04-05 11:03:30 +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"/>
@@ -142,7 +142,7 @@
</blockTable>
<para style="Standard"><font color="white"> </font></para>
<blockTable colWidths="120.0,42.0,47.0,42.0,120.0,50.0,70.0,55.0" style="Table_Domains" repeatRows="1">
- <tr rowHeight="40.0" style="Table_Domains_Header">
+ <tr>
<td><para style="white-9-center-bold">Domain</para></td>
<td><para style="white-9-center-bold">Score</para></td>
<td><para style="white-9-center-bold">Score(%)</para></td>
@@ -164,7 +164,7 @@
<td>[[ not dl['course_recommended'] or removeParentNode('td') ]]<CheckBox size="7" x="0" y="0" checked="0"/></td>
<td><CheckBox size="7" x="0" y="0" checked="0"/></td>
</tr>
- <tr style="Table_Domains_Line">
+ <tr>
<td><para style="std-10-right">Total (/[[ get_max_points(p) ]])</para></td>
<td><para style="std-10-center">[[ formatLang(p.result) ]]</para></td>
<td><para style="std-10-center">[[ formatLang(p.result * 100.0 / (get_max_points(p) or 0.0)) ]]%</para></td>
=== modified file 'training_diagnostic/report/diagnostic_synthesis.rml'
--- training_diagnostic/report/diagnostic_synthesis.rml 2010-06-04 13:23:49 +0000
+++ training_diagnostic/report/diagnostic_synthesis.rml 2011-04-05 11:03:30 +0000
@@ -144,23 +144,23 @@
<para style="std-16-center-bold">Diagnostic Synthesis Report</para>
<para style="Standard"><font color="white"> </font></para>
<blockTable colWidths="220.0,150.0,150.0,35.0" style="Table_Head">
- <tr style="Table_Head_Span3">
+ <tr>
<td><para style="white-10-left">Name: [[ p.job_id.contact_id.name ]] [[ p.job_id.contact_id.first_name ]]</para></td>
<td><para style="white-10-left">Title: [[ p.job_id.contact_id.title or '' ]]</para></td>
</tr>
- <tr style="Table_Head_Span3">
+ <tr>
<td><para style="white-10-left">Matricule: [[ p.job_id.external_matricule or '' ]]</para></td>
<td><para style="white-10-left">Phone: [[ p.job_id.phone ]]</para></td>
</tr>
- <tr style="Table_Head_Span3">
+ <tr>
<td><para style="white-10-left">Street: [[ get_part_address(p) and get_part_address(p).address_id.street ]] [[ get_part_address(p) and get_part_address(p).address_id.street2 ]]</para></td>
<td><para style="white-10-left">Zip, City: [[ get_part_address(p) and ((get_part_address(p).address_id.zip or '') + " " + (get_part_address(p).address_id.city or '')) ]]</para></td>
</tr>
- <tr style="Table_Head_Span3">
+ <tr>
<td><para style="white-10-left">Country: [[ get_part_address(p) and get_part_address(p).address_id.country_id.name ]]</para></td>
<td><para style="white-10-left">Assessor Name:</para></td>
</tr>
- <tr style="Table_Head_Span3">
+ <tr>
<td><para style="white-10-left">Interview Date:</para></td>
<td><para style="white-10-left">Function Keyword: [[ p.job_id.orientation and p.job_id.orientation or '.'*50 ]]</para></td>
</tr>
@@ -190,7 +190,7 @@
<td></td>
<td></td>
</tr>
- <tr style="Table_Head_Span4">
+ <tr>
<td>
<blockTable colWidths="270.0,20.0,40.0,20.0,40.0,20.0,60.0,20.0,65.0">
<tr>
@@ -222,7 +222,7 @@
</blockTable>
<para style="Standard"><font color="white"> </font></para>
<blockTable colWidths="140.0,35.0,45.0,140.0,30.0,40.0,70.0,55.0" style="Table_Domains" repeatRows="1">[[ assessor_filled(p) and removeParentNode('blockTable') ]]
- <tr rowHeight="40.0" style="Table_Domains_Header">
+ <tr>
<td><para style="white-9-center-bold">Domain</para></td>
<td><para style="white-9-center-bold">Score</para></td>
<td><para style="white-9-center-bold">Fit4Job Pass Mark</para></td>
@@ -245,7 +245,7 @@
<td>[[ dl['confirmed_by_assessor'] or removeParentNode('td') ]]<CheckBox size="7" x="0" y="0" checked="1"/></td>
<td>[[ not dl['confirmed_by_assessor'] or removeParentNode('td') ]]<CheckBox size="7" x="0" y="0" checked="0"/></td>
</tr>
- <tr style="Table_Domains_Line">
+ <tr>
<td><para style="std-10-right">Total (/[[ get_max_points(p) ]])</para></td>
<td><para style="std-10-center">[[ formatLang(p.result) ]]</para></td>
<td><para style="std-10-center">[[ formatLang(get_max_domain_points(p)) ]]</para></td>
@@ -257,7 +257,7 @@
</tr>
</blockTable>
<blockTable colWidths="140.0,35.0,45.0,140.0,30.0,40.0,125.0" style="Table_Domains" repeatRows="1">[[ assessor_filled(p) or removeParentNode('blockTable') ]]
- <tr rowHeight="40.0" style="Table_Domains_Header">
+ <tr>
<td><para style="white-9-center-bold">Domain</para></td>
<td><para style="white-9-center-bold">Score</para></td>
<td><para style="white-9-center-bold">Fit4Job Pass Mark</para></td>
@@ -277,7 +277,7 @@
<td>[[ dl['confirmed_by_assessor'] or removeParentNode('td') ]]<CheckBox size="7" x="0" y="0" checked="1"/></td>
<td>[[ not dl['confirmed_by_assessor'] or removeParentNode('td') ]]<CheckBox size="7" x="0" y="0" checked="0"/></td>
</tr>
- <tr style="Table_Domains_Line">
+ <tr>
<td><para style="std-10-right">Total (/[[ get_max_points(p) ]])</para></td>
<td><para style="std-10-center">[[ formatLang(p.result) ]]</para></td>
<td><para style="std-10-center">[[ formatLang(get_max_domain_points(p)) ]]</para></td>
=== modified file 'training_diagnostic/report/exam_false_responses.rml'
--- training_diagnostic/report/exam_false_responses.rml 2011-02-15 14:54:42 +0000
+++ training_diagnostic/report/exam_false_responses.rml 2011-04-05 11:03:30 +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"/>
@@ -170,7 +170,7 @@
</td>
<td>
<blockTable colWidths="525.0" style="Table2_Question_Text">
- <tr style="Table2_Image">
+ <tr>
<td><imageinline>[[ get_image(respline, 'before_text') or removeParentNode('tr') ]]</imageinline></td>
</tr>
<tr>
@@ -181,12 +181,12 @@
</blockTable>
</td>
</tr>
-
- <tr style="Table2_Image">
+
+ <tr>
<td></td>
<td><imageinline>[[ get_image(respline, 'after_text') or removeParentNode('tr') ]]</imageinline></td>
</tr>
- <tr style="Table2_NoPadding">[[ respline.question_id.type in ('qcm','qcu','yesno') or removeParentNode('tr') ]]
+ <tr>[[ respline.question_id.type in ('qcm','qcu','yesno') or removeParentNode('tr') ]]
[[ repeatIn(solution(respline.question_id, respline.question_id.type, respline), 'response') ]]
<td></td>
<td><blockTable colWidths="30.0,30.0,465.0" style="Table2_Responses">
=== 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:03:30 +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_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:03:30 +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"/>
@@ -276,7 +276,7 @@
<section>
[[ repeatIn(get_questionnaire(participation).question_ids,'question') ]]
<blockTable colWidths="20.0,525.0" style="Table2">
- <tr style="Table2">[[ get_image(question, 'before_text') or removeParentNode('blockTable') ]]
+ <tr>[[ get_image(question, 'before_text') or removeParentNode('blockTable') ]]
<td style="Table2_Question_Number">
<para style="terp_default_10_right"><seq id="L1"/>.</para>
</td>
@@ -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>[[ get_image(question, 'after_text') or removeParentNode('blockTable') ]]
<td></td>
<td><imageinline>[[ get_image(question, 'after_text') ]]</imageinline></td>
</tr>
@@ -297,7 +297,7 @@
<blockTable colWidths="560.0" style="Table2">
<tr><td>[[ question.question_id.type in ('qcm','qcu','yesno') or removeParentNode('blockTable') ]]
<blockTable colWidths="20.0,525.0" style="Table2">
- <tr style="Table2_NoPadding">
+ <tr>
[[ repeatIn(solution(question.question_id, question.question_id.type, participation=participation) or [None], 'response') ]]
<td></td>
<td>
=== 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:03:30 +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>
Follow ups
