From 026db4241a462dd5f2de2f9f5e1ced7781784f80 Mon Sep 17 00:00:00 2001
From: "apa (OpenERP)" <apa@tinyerp.com>
Date: Thu, 16 Dec 2010 18:59:56 +0530
Subject: [PATCH] [IMP]:project_planning:improved planning report

bzr revid: apa@tinyerp.com-20101216132956-aua2mycfp096g5sf
---
 .../report/report_planning.rml                | 226 +++++++++---------
 1 file changed, 115 insertions(+), 111 deletions(-)

diff --git a/addons/project_planning/report/report_planning.rml b/addons/project_planning/report/report_planning.rml
index 43dab8eb5b4..7d46de5e025 100644
--- a/addons/project_planning/report/report_planning.rml
+++ b/addons/project_planning/report/report_planning.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="HR Planning" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="HR Planning.pdf">
+  <template pageSize="(595.0,842.0)" title="HR Planning" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+      <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -15,7 +15,6 @@
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#808080" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#808080" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#808080" start="2,-1" stop="2,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
@@ -24,17 +23,21 @@
     <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
+    <blockTableStyle id="Table8">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -42,33 +45,24 @@
     <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica"/>
-    <paraStyle name="P2" fontName="Helvetica" alignment="RIGHT"/>
-    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="11.0" leading="14"/>
-    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="CENTER"/>
-    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="14.0" leading="17"/>
-    <paraStyle name="P6" fontName="Helvetica" fontSize="11.0" leading="14"/>
-    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="11.0" leading="14"/>
-    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="RIGHT"/>
-    <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER"/>
-    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="20.0" leading="25" alignment="CENTER"/>
-    <paraStyle name="P11" fontName="Helvetica" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P12" fontName="Helvetica" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -77,139 +71,149 @@
     <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="Index" fontName="Helvetica"/>
     <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10"/>
+    <paraStyle name="terp_header_center" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER"/>
+    <paraStyle name="terp_default_8_center" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="terp_default_9_right" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="terp_default_12_center_bold" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER"/>
+    <paraStyle name="terp_tbl_header" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
+    <paraStyle name="terp_tbl_header_center" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="terp_tbl_header_right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="terp_default_9_center" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
+    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3"/>
     <images/>
   </stylesheet>
   <story>
-    <para style="P1">[[ repeatIn(objects, 'o') ]]</para>
-    <para style="P1">
+    <para style="terp_default_8">[[ repeatIn(objects, 'o') ]]</para>
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="P1">
+    <para style="terp_header_center">HR Planning</para>
+    <para style="terp_default_8_center">[[ o.name]]</para>
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="P10">HR Planning</para>
-    <para style="Standard">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="149.0,192.0,141.0" repeatRows="1" style="Table1">
+    <blockTable colWidths="227.0,312.0" repeatRows="1" style="Table1">
       <tr>
         <td>
-          <para style="P1"><font face="Helvetica">Responsible</font>: [[ o.user_id.name ]]</para>
+          <para style="terp_default_9"><font fontName="Helvetica-Bold">Responsible : </font>[[ o.user_id.name ]]</para>
         </td>
         <td>
-          <para style="P11">[[ o.name]]</para>
-        </td>
-        <td>
-          <para style="P2"><font face="Helvetica">From</font>: [[ formatLang(o.date_from,date=True) ]]</para>
-          <para style="P2"><font face="Helvetica">To</font>: [[ formatLang(o.date_to,date=True) ]]</para>
+          <para style="terp_default_9_right"><font fontName="Helvetica-Bold">From :</font> [[ formatLang(o.date_from,date=True) ]] <font fontName="Helvetica-Bold"> To : </font>[[ formatLang(o.date_to,date=True) ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P4">
-      <font color="white"> </font>
-    </para>
-    <para style="P5">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="482.0" style="Table6">
+    <blockTable colWidths="539.0" style="Table6">
       <tr>
         <td>
-          <para style="P9">Summary by user</para>
-          <para style="P9">
+          <para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
+          <para style="terp_default_12_center_bold">Summary by user</para>
+          <para style="terp_default_8">
             <font color="white"> </font>
           </para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="104.0,101.0,113.0,100.0,63.0" style="Table3">
+    <blockTable colWidths="150.0,110.0,90.0,100.0,90.0" style="Table3">
       <tr>
         <td>
-          <para style="P7">User</para>
+          <para style="terp_tbl_header">User</para>
         </td>
         <td>
-          <para style="P7">Total Planned Tasks</para>
+          <para style="terp_tbl_header_center">Total planned tasks</para>
         </td>
         <td>
-          <para style="P7">Remaining tasks</para>
+          <para style="terp_tbl_header_center">Remaining tasks</para>
         </td>
         <td>
-          <para style="P7">Time without</para>
-          <para style="P7">tasks</para>
+          <para style="terp_tbl_header_center">Time without tasks</para>
         </td>
         <td>
-          <para style="P8">Timesheet</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P6">[[ repeatIn(o.planning_user_ids , 'u') ]] [[ u.user_id.name ]]</para>
-        </td>
-        <td>
-          <para style="P6">[[ formatLang(u.plan_tasks) ]]</para>
-        </td>
-        <td>
-          <para style="P6">[[ formatLang(u.tasks) ]]</para>
-        </td>
-        <td>
-          <para style="P6">[[ formatLang(u.free) ]]</para>
-        </td>
-        <td>
-          <para style="P6">[[ formatLang(u.timesheet) ]]</para>
+          <para style="terp_tbl_header_center">Timesheet</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P5">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="482.0" style="Table5">
+    <section>
+      <para style="terp_default_8">[[ repeatIn(o.planning_user_ids , 'u') ]]</para>
+      <blockTable colWidths="150.0,110.0,90.0,100.0,90.0" style="Table8">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ u.user_id.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9_center">[[ formatLang(u.plan_tasks) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9_center">[[ formatLang(u.tasks) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9_center">[[ formatLang(u.free) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9_center">[[ formatLang(u.timesheet) ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <blockTable colWidths="539.0" style="Table5">
       <tr>
         <td>
-          <para style="P9">Summary by project</para>
-          <para style="P9">
+          <para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
+          <para style="terp_default_12_center_bold">Summary by project</para>
+          <para style="terp_default_8">
             <font color="white"> </font>
           </para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="104.0,103.0,112.0,101.0,63.0" style="Table4">
+    <blockTable colWidths="150.0,110.0,90.0,100.0,90.0" style="Table4">
       <tr>
         <td>
-          <para style="P13">Project</para>
+          <para style="terp_tbl_header">Project</para>
         </td>
         <td>
-          <para style="P7">Total Planned Tasks</para>
+          <para style="terp_tbl_header_center">Total planned tasks</para>
         </td>
         <td>
-          <para style="P7">Remaining tasks</para>
+          <para style="terp_tbl_header_center">Remaining tasks</para>
         </td>
         <td>
-          <para style="P7">Time without</para>
-          <para style="P7">tasks</para>
+          <para style="terp_tbl_header_center">Time without tasks</para>
         </td>
         <td>
-          <para style="P8">Timesheet</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P12"><font face="Helvetica" size="11.0">[[ repeatIn(o.planning_account , 'l') ]] </font>[ [[ l.account_id.code ]] ] [[ l.account_id.name ]]</para>
-        </td>
-        <td>
-          <para style="P6">[[ formatLang(l.plan_tasks) ]]</para>
-        </td>
-        <td>
-          <para style="P6">[[ formatLang(l.tasks) ]]</para>
-        </td>
-        <td>
-          <para style="P6">[[ formatLang(l.plan_open) ]]</para>
-        </td>
-        <td>
-          <para style="P6">[[ formatLang(l.timesheet) ]]</para>
+          <para style="terp_tbl_header_center">Timesheet</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P3">
-      <font color="white"> </font>
-    </para>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(o.planning_account , 'l') ]] </para>
+      <blockTable colWidths="150.0,110.0,90.0,100.0,90.0" style="Table2">
+        <tr>
+          <td>
+            <para style="terp_default_9">[ [[ l.account_id.code ]] ] [[ l.account_id.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9_center">[[ formatLang(l.plan_tasks) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9_center">[[ formatLang(l.tasks) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9_center">[[ formatLang(l.plan_open) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9_center">[[ formatLang(l.timesheet) ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
   </story>
-</document>
\ No newline at end of file
+</document>