openerp-dev-web team mailing list archive

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

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

Added missing title name in the diagnostic report 
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/title_imp_in_diagnostic_report/+merge/59895
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/title_imp_in_diagnostic_report.

=== modified file 'training_diagnostic/data/report.xml'
--- training_diagnostic/data/report.xml	2011-03-25 09:27:46 +0000
+++ training_diagnostic/data/report.xml	2011-05-04 10:15:52 +0000
@@ -41,7 +41,7 @@
                 model="training.participation"
                 name="training.participation.diagnostic.candidate.report"
                 rml="addons/training_diagnostic/report/diagnostic.rml"
-		groups="base.group_user"
+		        groups="base.group_user"
                 header="True"
                 auto="False"/>
 
@@ -50,7 +50,7 @@
                 model="training.participation"
                 name="training.participation.diagnostic.synthesis.report"
                 rml="addons/training_diagnostic/report/diagnostic_synthesis.rml"
-		groups="base.group_user"
+		        groups="base.group_user"
                 header="False"
                 auto="False"/>
 
@@ -59,7 +59,7 @@
                 model="training.participation"
                 name="training.participation.false.result.report"
                 rml="addons/training_diagnostic/report/exam_false_responses.rml"
-		groups="base.group_user"
+		        groups="base.group_user"
                 header="True"
                 auto="False"/>
     </data>

=== modified file 'training_diagnostic/report/diagnostic.rml'
--- training_diagnostic/report/diagnostic.rml	2011-04-25 06:05:34 +0000
+++ training_diagnostic/report/diagnostic.rml	2011-05-04 10:15:52 +0000
@@ -130,7 +130,7 @@
             </tr>
             <tr>
                 <td>
-                    <para style="std-10-left">[[ p.job_id.contact_id.name ]] [[ p.job_id.contact_id.first_name ]] [[ p.job_id.contact_id.title and "("+p.job_id.contact_id.title+")" or '' ]]</para>
+                    <para style="std-10-left">[[ p.job_id.contact_id.name ]] [[ p.job_id.contact_id.first_name ]] [[ p.job_id.contact_id.title and "("+p.job_id.contact_id.title.name+")" or '' ]]</para>
                     <para style="std-10-left">[[ get_ctx() == 'employer' and (p.job_id.external_matricule or '') or removeParentNode('para') ]]</para>
                     <para style="std-10-left">[[ get_ctx() == 'employer' and (p.job_id.contact_id.birthdate and formatLang(p.job_id.contact_id.birthdate, date=True) or '') or '' ]]</para>
                 </td>

=== modified file 'training_diagnostic/report/diagnostic_results.rml'
--- training_diagnostic/report/diagnostic_results.rml	2011-04-25 06:05:34 +0000
+++ training_diagnostic/report/diagnostic_results.rml	2011-05-04 10:15:52 +0000
@@ -130,7 +130,7 @@
             </tr>
             <tr>
                 <td>
-                    <para style="std-10-left">[[ p.job_id.contact_id.name ]] [[ p.job_id.contact_id.first_name ]] [[ p.job_id.contact_id.title and "("+p.job_id.contact_id.title+")" or '' ]]</para>
+                    <para style="std-10-left">[[ p.job_id.contact_id.name ]] [[ p.job_id.contact_id.first_name ]] [[ p.job_id.contact_id.title and "("+p.job_id.contact_id.title.name+")" or '' ]]</para>
                     <para style="std-10-left">[[ get_ctx() == 'employer' and (p.job_id.external_matricule or '') or removeParentNode('para') ]]</para>
                     <para style="std-10-left">[[ get_ctx() == 'employer' and (p.job_id.contact_id.birthdate and formatLang(p.job_id.contact_id.birthdate, date=True) or '') or '' ]]</para>
                 </td>

=== modified file 'training_diagnostic/report/diagnostic_synthesis.rml'
--- training_diagnostic/report/diagnostic_synthesis.rml	2011-04-25 06:05:34 +0000
+++ training_diagnostic/report/diagnostic_synthesis.rml	2011-05-04 10:15:52 +0000
@@ -146,7 +146,7 @@
         <blockTable colWidths="220.0,150.0,150.0,35.0" style="Table_Head">
             <tr style="Table_Head_Span3">
                 <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>
+                <td><para style="white-10-left">Title: [[ p.job_id.contact_id.title.name or '' ]]</para></td>
             </tr>
             <tr style="Table_Head_Span3">
                 <td><para style="white-10-left">Matricule: [[ p.job_id.external_matricule or '' ]]</para></td>

=== modified file 'training_diagnostic/report/domain_barchart.rml'
--- training_diagnostic/report/domain_barchart.rml	2011-04-21 05:22:39 +0000
+++ training_diagnostic/report/domain_barchart.rml	2011-05-04 10:15:52 +0000
@@ -28,7 +28,7 @@
             </tr>
             <tr>
                 <td>
-                    <para style="std-10-left">[[ p.job_id.contact_id.name ]] [[ p.job_id.contact_id.first_name ]] [[ p.job_id.contact_id.title and "("+p.job_id.contact_id.title+")" or '' ]]</para>
+                    <para style="std-10-left">[[ p.job_id.contact_id.name ]] [[ p.job_id.contact_id.first_name ]] [[ p.job_id.contact_id.title and "("+p.job_id.contact_id.title.name+")" or '' ]]</para>
                 </td>
                 <td>
                     <para style="std-10-left">[[ get_address(p) ]]</para>

=== modified file 'training_diagnostic/report/domain_spiderchart.rml'
--- training_diagnostic/report/domain_spiderchart.rml	2011-04-21 05:15:04 +0000
+++ training_diagnostic/report/domain_spiderchart.rml	2011-05-04 10:15:52 +0000
@@ -28,7 +28,7 @@
             </tr>
             <tr>
                 <td>
-                    <para style="std-10-left">[[ p.job_id.contact_id.name ]] [[ p.job_id.contact_id.first_name ]] [[ p.job_id.contact_id.title and "("+p.job_id.contact_id.title+")" or '' ]]</para>
+                    <para style="std-10-left">[[ p.job_id.contact_id.name ]] [[ p.job_id.contact_id.first_name ]] [[ p.job_id.contact_id.title and "("+p.job_id.contact_id.title.name+")" or '' ]]</para>
                 </td>
                 <td>
                     <para style="std-10-left">[[ get_address(p) ]]</para>

=== modified file 'training_diagnostic/report/exam_false_responses.rml'
--- training_diagnostic/report/exam_false_responses.rml	2011-04-05 10:57:36 +0000
+++ training_diagnostic/report/exam_false_responses.rml	2011-05-04 10:15:52 +0000
@@ -141,7 +141,7 @@
             </tr>
             <tr>
                 <td>
-                    <para style="std-10-left">[[ p.job_id.contact_id.name ]] [[ p.job_id.contact_id.first_name ]] [[ p.job_id.contact_id.title and "("+p.job_id.contact_id.title+")" or '' ]]</para>
+                    <para style="std-10-left">[[ p.job_id.contact_id.name ]] [[ p.job_id.contact_id.first_name ]] [[ p.job_id.contact_id.title and "("+p.job_id.contact_id.title.name+")" or '' ]]</para>
                     <para style="std-10-left">[[ get_ctx() == 'employer' and (p.job_id.external_matricule or '') or removeParentNode('para') ]]</para>
                     <para style="std-10-left">[[ get_ctx() == 'employer' and (p.job_id.contact_id.birthdate and formatLang(p.job_id.contact_id.birthdate, date=True) or '') or '' ]]</para>
                 </td>