From e32bbebeab4707dad67b889a961a1c2af2d1443b Mon Sep 17 00:00:00 2001
From: Naresh Choksy <nch@tinyerp.com>
Date: Wed, 3 Jun 2009 14:58:42 +0530
Subject: [PATCH 1/3] Bugfix:mrp_operation barCode reports

bzr revid: nch@tinyerp.com-20090603092842-8ly14913t6p6mbsi
---
 addons/mrp_operations/report/mrp_code_barcode.rml | 6 +++---
 addons/mrp_operations/report/mrp_wc_barcode.rml   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/mrp_operations/report/mrp_code_barcode.rml b/addons/mrp_operations/report/mrp_code_barcode.rml
index e23ffc3e5fc..10440a45e11 100755
--- a/addons/mrp_operations/report/mrp_code_barcode.rml
+++ b/addons/mrp_operations/report/mrp_code_barcode.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-<template pageSize="(5.5cm,2.8cm)" title="Test" author="Martin Simon" allowSplitting="20">
+<template pageSize="(550,280)" title="Test" author="Martin Simon" allowSplitting="20">
 <pageTemplate id="first">
-  <frame id="first" x1="0.1cm" y1="0.1cm" width="5.3cm" height="2.4cm"/>
+  <frame id="first" x1="0.1cm" y1="0.1cm" width="530" height="240"/>
 </pageTemplate>
 </template>
 <stylesheet>
@@ -34,7 +34,7 @@
 	  <tr>
 		<td>
 		  <para style="P1">[[ str(o.name) ]] ([[ str(o.code) ]])</para>
-	<barCode code="code128" x="26.9mm" height="68.1mm" quiet="9" fontName="Times-Roman" fontSize="50"  alignment="CENTER">[['ID'+str(o.id)]]</barCode>
+	<barCode code="code128" x="300" height="180" quiet="9" fontName="Times-Roman" fontSize="50"  alignment="CENTER">[['ID'+str(o.id)]]</barCode>
 		</td>
 	  </tr>
 	</blockTable>
diff --git a/addons/mrp_operations/report/mrp_wc_barcode.rml b/addons/mrp_operations/report/mrp_wc_barcode.rml
index 6a4b8ae13d7..af0352ac80d 100755
--- a/addons/mrp_operations/report/mrp_wc_barcode.rml
+++ b/addons/mrp_operations/report/mrp_wc_barcode.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-<template pageSize="(5.5cm,2.8cm)" title="Test" author="Martin Simon" allowSplitting="20">
+<template pageSize="(550,280)" title="Test" author="Martin Simon" allowSplitting="20">
 <pageTemplate id="first">
-  <frame id="first" x1="0.1cm" y1="0.1cm" width="5.3cm" height="2.4cm"/>
+  <frame id="first" x1="0.1cm" y1="0.1cm" width="530" height="240"/>
 </pageTemplate>
 </template>
 <stylesheet>
@@ -34,7 +34,7 @@
 	  <tr>
 		<td>
 		  <para style="P1">[[ str(o.name) ]]</para>
-	<barCode code="code128" x="26.9mm" height="68.1mm" quiet="9" fontName="Times-Roman" fontSize="50"  alignment="CENTER">[['ID'+str(o.id)]]</barCode>
+	<barCode code="code128" x="300" height="180" quiet="9" fontName="Times-Roman" fontSize="50"  alignment="CENTER">[['ID'+str(o.id)]]</barCode>
 		</td>
 	  </tr>
 	</blockTable>

From 79065838721ae84d9d964380213f37f09fea477a Mon Sep 17 00:00:00 2001
From: Naresh Choksy <nch@tinyerp.com>
Date: Wed, 3 Jun 2009 15:41:31 +0530
Subject: [PATCH 2/3] Improved mrp_repair's order report

bzr revid: nch@tinyerp.com-20090603101131-gb2wl7o3f6ezd3ai
---
 addons/mrp_repair/report/order.rml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index 0a89efc73dd..6c56c80978b 100644
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.rml
@@ -277,18 +277,17 @@
       </tr>
     </blockTable>
     <section>
-      <para style="P30">
-        <font color="white"> </font>
-      </para>
+      <para style="P30"><font color="white">[[ repeatIn(o.operations,'line') ]] </font></para>
+      <para style="P30"><font color="white">[[ line or removeParentNode('section')]]</font></para>
       <para style="P29">Operation Line(s)</para>
       <blockTable colWidths="28.0,145.0,150.0,96.0,51.0,69.0" style="Table5">
         <tr>
           <td>
-            <para style="P4"><font face="Times-Roman" size="2.0">[[ repeatIn(o.operations,'line') ]]</font>Add [[ ((line.type == 'add') or removeParentNode('para')) and '' ]] </para>
+            <para style="P4">Add [[ ((line.type == 'add') or removeParentNode('para')) and '' ]] </para>
             <para style="P4">Remove [[ ((line.type == 'remove') or removeParentNode('para')) and '' ]]</para>
           </td>
           <td>
-            <para style="P3">[[ line.name ]][[ (line.to_invoice==True) or removeParentNode('tr') ]]</para>
+            <para style="P3"><font>[[ line.name ]]</font><font>[[ (line.to_invoice==True) or removeParentNode('blockTable') ]]</font></para>
           </td>
           <td>
             <para style="P6">[[ ','.join(map( lambda x: x.name, line.tax_id)) ]]</para>
@@ -306,14 +305,17 @@
         </tr>
       </blockTable>
     </section>
+    <section>
+    <para style="P30"><font color="white">[[ repeatIn(o.fees_lines,'fees') ]]</font></para>
+    <para style="P30"><font color="white">[[ fees or removeParentNode('section')]]</font></para>
    	<para style="P23">Fees Line(s) [[ (o.fees_lines ==[] and  removeParentNode('para') )  ]]</para>
     <blockTable colWidths="28.0,145.0,150.0,96.0,51.0,69.0" style="Table6">
       <tr>
         <td>
-          <para style="P21">[[ repeatIn(o.fees_lines,'fees') ]]</para>
+          <para style="P21"></para>
         </td>
         <td>
-          <para style="P3">[[ fees.name ]][[ (fees.to_invoice==True) or removeParentNode('tr') ]]</para>
+          <para style="P3"><font>[[ fees.name ]]</font><font>[[ (fees.to_invoice==True) or removeParentNode('blockTable') ]]</font></para>
         </td>
         <td>
           <para style="P6">[[ ','.join(map( lambda x: x.name, fees.tax_id)) ]]</para>
@@ -329,6 +331,7 @@
         </td>
       </tr>
     </blockTable>
+    </section>
     <para style="P22">
       <font color="white"> </font>
     </para>

From b1314614a7ce767d6e914294c0315334ed3b7033 Mon Sep 17 00:00:00 2001
From: Naresh Choksy <nch@tinyerp.com>
Date: Wed, 3 Jun 2009 16:04:05 +0530
Subject: [PATCH 3/3] Improved invoice report of report_intrastat

bzr revid: nch@tinyerp.com-20090603103405-r1whdte0kbfa4g1i
---
 addons/report_intrastat/report/invoice.rml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/report_intrastat/report/invoice.rml b/addons/report_intrastat/report/invoice.rml
index 565a68413e5..89b6448072e 100644
--- a/addons/report_intrastat/report/invoice.rml
+++ b/addons/report_intrastat/report/invoice.rml
@@ -290,7 +290,7 @@
           <para style="terp_default_Centre_9">[[ o.name ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_9">[[ o.date_invoice ]]</para>
+          <para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_9">[[ o.address_invoice_id.partner_id.ref or '' ]]</para>