[Merge]: Merge from report_dev branch.

bzr revid: rch@tinyerp.com-20101119134517-oibj3b2w13k24fbl

diff --cc addons/account/report/account_general_ledger_landscape.rml
index 6245e30,516b831..37b1a56
--- 1/addons/account/report/account_general_ledger_landscape.rml
--- 2/addons/account/report/account_general_ledger_landscape.rml
+++ b/addons/account/report/account_general_ledger_landscape.rml
@@@ -138,82 -233,140 +233,141 @@@
      <initialize>
        <paraStyle name="all" alignment="justify"/>
      </initialize>
-     <paraStyle name="P1" fontName="Helvetica" fontSize="20.0" leading="25" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-     <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="9.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
-     <paraStyle name="date" leftIndent="6.0" fontName="Helvetica-Bold" fontSize="9.0" leading="10" spaceBefore="6.0" spaceAfter="0.0" alignment="LEFT"/>
-     <paraStyle name="P2_content" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
-     <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-     <paraStyle name="P3_center" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-     <paraStyle name="P3_content" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-     <paraStyle name="P3_content_center" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-     <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-     <paraStyle name="P4_content" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-     <paraStyle name="P5" fontName="Helvetica" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-     <paraStyle name="P6" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-     <paraStyle name="P7" fontName="Helvetica" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-     <paraStyle name="P8" fontName="Helvetica" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-     <paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-     <paraStyle name="P9b" fontName="Helvetica-Bold" fontSize="8.5" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-     <paraStyle name="P10" fontName="Helvetica" alignment="CENTER"/>
-     <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-     <paraStyle name="terp_default_Centre_8a" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-     <paraStyle name="P11" fontName="Helvetica" fontSize="11.0" leading="14"/>
-     <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="9.0" leading="0"/>
-     <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="10.0" leading="8" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-     <paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
-     <paraStyle name="P15" fontName="Helvetica-Bold" spaceBefore="0.0" spaceAfter="6.0"/>
-     <paraStyle name="P16" rightIndent="17.0" leftIndent="-0.0" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
-     <paraStyle name="P17" fontName="Helvetica" alignment="LEFT" fontSize="12.0"  spaceAfter="0.0"/>
-     <paraStyle name="Standard" fontName="Helvetica-Bold" fontSize="8.5"/>
-     <paraStyle name="Account" fontName="Helvetica"/>
+     <paraStyle name="Standard" fontName="Helvetica"/>
+     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
      <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
      <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+     <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+     <paraStyle name="Index" fontName="Helvetica"/>
      <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
      <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-     <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
-     <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
-     <paraStyle name="Index" fontName="Helvetica"/>
-     <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0"/>
-   <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+     <paraStyle name="Footer" fontName="Helvetica"/>
+     <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+     <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+     <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+     <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+     <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+     <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+     <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+     <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+     <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+     <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+     <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+     <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+     <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+     <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+     <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+     <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+     <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+     <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+     <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+     <images/>
    </stylesheet>
    <story>
-   <pto>
-   <pto_header>
-   <blockTable colWidths="66.0,35.0,120.0,90.0,60.0,200.0,124.0,90.0,90.0,90.0,90.00" style="tbl_header">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
-        <tr>
-           <td><para style="date">Date</para></td>
-           <td><para style="P2">JNRL</para></td>
-           <td><para style="P2">Partner</para></td>
-           <td><para style="P2">Ref</para></td>
-           <td><para style="P2">Move</para></td>
-           <td><para style="P3">Entry Label</para></td>
-           <td><para style="P3_center">Counterpart</para></td>
-           <td><para style="P4">Debit</para></td>
-           <td><para style="P4">Credit</para></td>
-           <td><para style="P4">Balance</para></td>
-           <td><para style="P4">Currency</para></td>
-        </tr>
-     </blockTable>
-     <blockTable colWidths="66.0,35.0,166.0,90.0,60.0,230.0,133.0,90.0,90.0,90.0" style="tbl_header">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
-        <tr>
-           <td><para style="date">Date</para></td>
-           <td><para style="P2">JNRL</para></td>
-           <td><para style="P2">Partner</para></td>
-           <td><para style="P2">Ref</para></td>
-           <td><para style="P2">Move</para></td>
-           <td><para style="P3">Entry Label</para></td>
-           <td><para style="P3_center">Counterpart</para></td>
-           <td><para style="P4">Debit</para></td>
-           <td><para style="P4">Credit</para></td>
-           <td><para style="P4">Balance</para></td>
-        </tr>
-       </blockTable>
-   </pto_header>
-     <blockTable colWidths="539.0" style="Table_Company_Name">
++
+       <pto>
+       <pto_header>
+               <blockTable colWidths="45.0,55.0,72.0,64.0,64.0,77.0,85.0,71.0,71.0,88.0,80.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+             <tr>
+               <td>
+                 <para style="terp_tblheader_Details">Date</para>
+               </td>
+               <td>
+                 <para style="terp_tblheader_Details">JNRL</para>
+               </td>
+               <td>
+                 <para style="terp_tblheader_Details">Partner</para>
+               </td>
+               <td>
+                 <para style="terp_tblheader_Details_Centre">Ref</para>
+               </td>
+               <td>
+                 <para style="terp_tblheader_Details_Centre">Move</para>
+               </td>
+               <td>
+                 <para style="terp_tblheader_Details">Entry Label</para>
+               </td>
+               <td>
+                 <para style="terp_tblheader_Details_Centre">Counterpart</para>
+               </td>
+               <td>
+                 <para style="terp_tblheader_Details_Right">Debit</para>
+               </td>
+               <td>
+                 <para style="terp_tblheader_Details_Right">Credit</para>
+               </td>
+               <td>
+                 <para style="terp_tblheader_Details_Right">Balance</para>
+               </td>
+               <td>
+                 <para style="terp_tblheader_Details_Right">Currency</para>
+               </td>
+             </tr>
+           </blockTable>
+               <blockTable colWidths="45.0,54.0,85.0,70.0,70.0,130.0,85.0,71.0,71.0,90.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+             <tr>
+               <td>
+                 <para style="terp_tblheader_Details">Date</para>
+               </td>
+               <td>
+                 <para style="terp_tblheader_Details">JNRL</para>
+               </td>
+               <td>
+                 <para style="terp_tblheader_Details">Partner</para>
+               </td>
+               <td>
+                 <para style="terp_tblheader_Details_Centre">Ref</para>
+               </td>
+               <td>
+                 <para style="terp_tblheader_Details_Centre">Move</para>
+               </td>
+               <td>
+                 <para style="terp_tblheader_Details">Entry Label</para>
+               </td>
+               <td>
+                 <para style="terp_tblheader_Details_Centre">Counterpart</para>
+               </td>
+               <td>
+                 <para style="terp_tblheader_Details_Right">Debit</para>
+               </td>
+               <td>
+                 <para style="terp_tblheader_Details_Right">Credit</para>
+               </td>
+               <td>
+                 <para style="terp_tblheader_Details_Right">Balance</para>
+               </td>
+             </tr>
+           </blockTable>
+       </pto_header>
+     <para style="terp_default_8">[[ repeatIn(objects, 'a') ]]</para>
+     <para style="terp_header_Centre">General Ledger</para>
+     <blockTable colWidths="110.0,110.0,110.0,110.0,128.0,93.0,110.0" style="Table1">
        <tr>
          <td>
-           <para style="terp_header_Centre">General Ledger </para>
+           <para style="terp_tblheader_General_Centre">[[ data['model']=='account.account' and 'Company' or removeParentNode('para') ]]</para>
+           <para style="terp_tblheader_General_Centre">[[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]]</para>
+         </td>
+         <td>
+           <para style="terp_tblheader_General_Centre">Fiscal Year</para>
+         </td>
+         <td>
+           <para style="terp_tblheader_General_Centre">Journals</para>
+         </td>
+         <td>
+           <para style="terp_tblheader_General_Centre">Display Account</para>
+         </td>
+         <td>
+           <para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para>
+         </td>
+         <td>
+           <para style="terp_tblheader_General_Centre">Entries Sorted By</para>
+         </td>
+         <td>
+           <para style="terp_tblheader_General_Centre">Target Moves</para>
          </td>
        </tr>
      </blockTable>