diff --git a/addons/custom/corporate_rml_header.rml b/addons/custom/corporate_rml_header.rml
index 3d3cfc6719a..fead5ab1cb1 100644
--- a/addons/custom/corporate_rml_header.rml
+++ b/addons/custom/corporate_rml_header.rml
@@ -13,12 +13,12 @@
 			<drawRightString x="20cm" y="27.8cm">[[ company.rml_header1 ]]</drawRightString>
 
 
-			<drawString x="1cm" y="27.1cm">[[ company.partner_id.address[0].street ]]</drawString>
-			<drawString x="1cm" y="26.7cm">[[ company.partner_id.address[0].zip ]] [[ company.partner_id.address[0].city ]] - [[ company.partner_id.address[0].country_id.name ]]</drawString>
+			<drawString x="1cm" y="27.1cm">[[ company.partner_id.address and company.partner_id.address[0].street ]]</drawString>
+			<drawString x="1cm" y="26.7cm">[[ company.partner_id.address and company.partner_id.address[0].zip ]] [[ company.partner_id.address and company.partner_id.address[0].city ]] - [[ company.partner_id.address and company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name ]]</drawString>
 			<drawString x="1cm" y="26.2cm">Phone:</drawString>
-			<drawRightString x="7cm" y="26.2cm">[[ company.partner_id.address[0].phone ]]</drawRightString>
+			<drawRightString x="7cm" y="26.2cm">[[ company.partner_id.address and company.partner_id.address[0].phone ]]</drawRightString>
 			<drawString x="1cm" y="25.8cm">Mail:</drawString>
-			<drawRightString x="7cm" y="25.8cm">[[ company.partner_id.address[0].email ]]</drawRightString>
+			<drawRightString x="7cm" y="25.8cm">[[ company.partner_id.address and company.partner_id.address[0].email ]]</drawRightString>
 			<lines>1cm 25.7cm 7cm 25.7cm</lines>
 
 			<!--page bottom-->
diff --git a/addons/letter/letter.py b/addons/letter/letter.py
index 574973e9914..45ba91469a3 100644
--- a/addons/letter/letter.py
+++ b/addons/letter/letter.py
@@ -76,7 +76,7 @@ class letter_letter(osv.osv):
 
 	def onchange_type_id(self, cr, uid, ids, type_id):
 		if type_id:
-			letter = pooler.get_pool(cr.dbname).get('letter.letter.type').browse(cr, uid, type_id)[0]
+			letter = pooler.get_pool(cr.dbname).get('letter.letter.type').browse(cr, uid, type_id)
 			return {'value':{'paragraph_ids': [x.id for x in letter.paragraph_ids]}}
 		else:
 			return  {'value':{'paragraph_ids': []}}
diff --git a/addons/letter/report/letter.rml b/addons/letter/report/letter.rml
index 04183784d3e..0e736900a75 100644
--- a/addons/letter/report/letter.rml
+++ b/addons/letter/report/letter.rml
@@ -98,7 +98,8 @@
     <paraStyle name="subsection" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="14.0" spaceAfter="14.0"/>
   </stylesheet>
   <story>
-    <blockTable colWidths="227.0,228.0" style="Tableau4">
+    <para style="P1">[[ repeatIn(objects,'o') ]]</para>
+    <!--blockTable colWidths="227.0,228.0" style="Tableau4">
       <tr>
         <td>
           <illustration height="41.0" width="171.0">
@@ -111,7 +112,7 @@
           </illustration>
         </td>
       </tr>
-    </blockTable>
+    </blockTable-->
     <para style="P2">Paris, le 26 septembre 2005</para>
     <para style="P3">
       <font color="white"> </font>
@@ -134,9 +135,9 @@
         </td>
         <td>
           <para style="Table Contents">[[ o.partner_id.name ]]</para>
-          <para style="Table Contents">[[ o.partner_id.address[0].name ]]</para>
-          <para style="Table Contents">[[ o.partner_id.address[0].zip ]] [[o.partner_id.address[0].city ]]</para>
-          <para style="Table Contents">[[ o.partner_id.address[0].country_id.name ]]</para>
+          <para style="Table Contents">[[ o.partner_id.address and o.partner_id.address[0].name ]]</para>
+          <para style="Table Contents">[[ o.partner_id.address and o.partner_id.address[0].zip ]] [[ o.partner_id.address and o.partner_id.address[0].city ]]</para>
+          <para style="Table Contents">[[ o.partner_id.address and o.partner_id.address[0].country_id and o.partner_id.address[0].country_id.name ]]</para>
           <para style="Table Contents">
             <font color="white"> </font>
           </para>
@@ -273,8 +274,9 @@
     </para>
     <blockTable colWidths="454.0" style="Tableau5">
       <tr>
+        [[ repeatIn(o.paragraph_ids, 'x') ]]
         <td>
-          <para style="P14">[[ [x.content for x in o.paragraph_ids if x.type_id.name=='keys'] ]]</para>
+          <para style="P14">[[ x.type_id and x.type_id.name=='keys' and x.content or removeParentNode('tr') ]]</para>
           <para style="P14">
             <font color="white"> </font>
           </para>
@@ -400,8 +402,9 @@
     </para>
     <blockTable colWidths="454.0" style="Tableau6">
       <tr>
+        [[ repeatIn(o.paragraph_ids, 'x') ]]
         <td>
-          <para style="P14">[[ [x.content for x in o.paragraph_ids if x.type_id.name=='modules'] ]]</para>
+          <para style="P14">[[ x.type_id and x.type_id.name=='modules' and x.content or removeParentNode('tr') ]]</para>
           <para style="P14">
             <font color="white"> </font>
           </para>
@@ -458,8 +461,9 @@
     </para>
     <blockTable colWidths="454.0" style="Tableau7">
       <tr>
+        [[ repeatIn(o.paragraph_ids, 'x') ]]
         <td>
-          <para style="P14">[[ [x.content for x in o.paragraph_ids if x.type_id.name=='specific'] ]]</para>
+          <para style="P14">[[ x.type_id and x.type_id.name=='specific' and x.content or removeParentNode('tr') ]]</para>
           <para style="P14">
             <font color="white"> </font>
           </para>
@@ -508,8 +512,9 @@
     </para>
     <blockTable colWidths="454.0" style="Tableau8">
       <tr>
+        [[ repeatIn(o.paragraph_ids, 'x') ]]
         <td>
-          <para style="P14">[[ [x.content for x in o.paragraph_ids if x.type_id.name=='price'] ]]</para>
+          <para style="P14">[[ x.type_id and x.type_id.name=='price' and x.content or removeParentNode('tr') ]]</para>
           <para style="P14">
             <font color="white"> </font>
           </para>