Modified account reports:rml with few require changes in some report py file also...
authorvra (Tiny) <vinusoft85@gmail.com>
Thu, 28 May 2009 05:56:33 +0000 (11:26 +0530)
committervra (Tiny) <vinusoft85@gmail.com>
Thu, 28 May 2009 05:56:33 +0000 (11:26 +0530)
bzr revid: vinusoft85@gmail.com-20090528055633-hipi24dpns8li6bl

16 files changed:
addons/account/account_invoice_view.xml
addons/account/account_report.xml
addons/account/report/account_balance.rml
addons/account/report/account_journal.rml
addons/account/report/account_tax_code.py
addons/account/report/account_tax_code.rml
addons/account/report/central_journal.rml
addons/account/report/general_journal.rml
addons/account/report/invoice.rml
addons/account/report/partner_balance.rml
addons/account/report/tax_report.py
addons/account/report/tax_report.rml
addons/account/report/third_party_ledger.py
addons/account/report/third_party_ledger.rml
addons/account/report/third_party_ledger_other.rml [new file with mode: 0644]
addons/account/wizard/wizard_third_party_ledger.py

index b48d4ab..aa2eaa4 100644 (file)
@@ -63,7 +63,7 @@
                             <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id"/>
                             <newline/>
                             <field name="price_subtotal"/>
-                            <field colspan="4" name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
+                            <field colspan="4" name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"/>
                         </page>
                         <page string="Notes">
                             <field colspan="4" name="note" nolabel="1"/>
index 3fe2e12..83b186b 100644 (file)
@@ -3,6 +3,7 @@
     <data>
         <report auto="False" id="account_general_ledger" menu="False" model="account.account" name="account.general.ledger" rml="account/report/general_ledger.rml" string="General Ledger"/>
         <report auto="False" id="account_3rdparty_ledger" menu="False" model="res.partner" name="account.third_party_ledger" rml="account/report/third_party_ledger.rml" string="Partner Ledger"/>
+        <report auto="False" id="account_3rdparty_ledger_other" menu="False" model="res.partner" name="account.third_party_ledger_other" rml="account/report/third_party_ledger_other.rml" string="Partner Other Ledger"/>
         <report auto="False" id="account_account_balance" menu="False" model="account.account" name="account.account.balance" rml="account/report/account_balance.rml" string="Account Balance"/>
         <report auto="False" id="account_3rdparty_account_balance" menu="False" model="account.account" name="account.partner.balance" rml="account/report/partner_balance.rml" string="Partner Balance"/>
         <report auto="False" id="account_central_journal" model="account.journal.period" name="account.central.journal" rml="account/report/central_journal.rml" string="Central Journal"/>
index 250c518..f74fc8d 100644 (file)
     <blockTableStyle id="Table2">
       <blockValign value="TOP"/>
       <blockAlignment value="RIGHT"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,1" stop="-1,1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,2" stop="-1,-1"/>
-
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,0"/>
+         <lineStyle kind="LINEBELOW" colorName="#000000" start="1,0" stop="1,0"/>
+         <lineStyle kind="LINEBELOW" colorName="#000000" start="2,0" stop="2,0"/>
+         <lineStyle kind="LINEBELOW" colorName="#000000" start="3,0" stop="3,0"/>
+         <lineStyle kind="LINEBELOW" colorName="#000000" start="4,0" stop="4,0"/>
+         
+         <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="Table3">
       <blockAlignment value="LEFT"/>
     <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="20.0" leading="25" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P10" fontName="Helvetica" fontSize="8.0" leading="14" spaceBefore="0.0" spaceAfter="6.0" alignment="RIGHT"/>
+    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="8.0" leading="14" spaceBefore="0.0" spaceAfter="6.0" alignment="RIGHT"/>
    <paraStyle name="P9" fontName="Helvetica-Bold" alignment="CENTER" fontSize="14.5" leftIndent="-5.0"/>
     <paraStyle name="P9a" fontName="Helvetica-Bold" fontSize="9" leftIndent="0.0" alignment="LEFT"/>
     <paraStyle name="P9b" fontName="Helvetica" fontSize="9" leftIndent="0.0" alignment="LEFT"/>
     <paraStyle name="P9b" fontName="Helvetica" fontSize="8" leftIndent="-5.0" alignment="LEFT"/>
     <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="8.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P12a" fontName="Helvetica" fontSize="8.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P12b" fontName="Helvetica" fontSize="8.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P12a" fontName="Helvetica-Bold" fontSize="8.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P12b" fontName="Helvetica-Bold" fontSize="8.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P14" rightIndent="17.0" leftIndent="-0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
 
 
 <blockTable colWidths="527.00" style="Table4" repeatRows="1">
       <tr>
         <td>
-          <para style="P9a">[[ get_fiscalyear(data['form']) or removeParentNode('para') ]]:</para>
+                 <para style="P9a">[[ get_fiscalyear(data['form']) or removeParentNode('para') ]]:</para>
           <para style="P9b"><i> [[ get_periods(data['form']) or removeParentNode('para') ]]</i></para>
         </td>
       </tr>
 <para style="P2">
 <font color="white"> </font>
 </para>
-    <blockTable colWidths="46,278.0,73.0,72.0,82.0" style="Table2" repeatRows="1">
+    <blockTable colWidths="67,264.0,70.0,70.0,80.0" style="Table2" repeatRows="1">
       <tr noRowsplits="1">
-        <td>
-          <para style="P12a">Code</para>
-        </td>
-        <td>
-          <para style="P12b">Account</para>
-        </td>
-        <td>
-          <para style="P10">Debit</para>
-        </td>
-        <td>
-          <para style="P10">Credit</para>
-        </td>
-        <td>
-          <para style="P10">Balance</para>
-        </td>
+        <td><para style="P12a">Code</para></td>
+        <td><para style="P12a">Account</para></td>
+        <td><para style="P10">Debit</para></td>
+        <td><para style="P10">Credit</para></td>
+        <td><para style="P10">Balance</para></td>
       </tr>
       <tr>
-               <td><para style="P14">[[ repeatIn(lines(data['form']), 'a') ]]<i>[[ a['code'] or removeParentNode('tr')  ]]</i></para></td>
-        <td>
-              <para style="P14">
-               <font>[[ (a['level']&lt;3 and setTag('tr','tr',{'style':'TrLevel'+str(a['level']), 'paraStyle':('Level'+str(a['level']))})) or removeParentNode('font') ]]</font>
-               <font>[[ (a['level']&gt;2 and setTag('tr','tr',{'style':'TrLevel', 'paraStyle':('Level')})) or removeParentNode('font') ]] </font>
-               <font color="white">[[ '...'*(a['level']) ]]</font><font>[[ a['name'] ]]</font></para>
-        </td>
-        <td>
-               <para style="P3"><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['debit']) ]]</font>
-                       <font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[formatLang(a['debit']) ]]</font></para>
-        </td>
-        <td>
-               <para style="P3"><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['credit']) ]]</font>
-                       <font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[ formatLang(a['credit']) ]]</font></para>
-        </td>
-        <td>
-               <para style="P3"><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['balance']) ]]</font>
-                       <font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[ formatLang(a['balance'])  ]]</font></para>
-        </td>
+               <td><para style="P14">[[ repeatIn(lines(data['form']), 'a') ]]<font>[[ a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"}) ]]</font><i>[[ a['code'] or removeParentNode('tr')  ]]</i></para></td>
+        <td><para style="P14"><font>[[ a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"}) ]]</font><font color="white">[[ '..'*(a['level']-1) ]]</font><font>[[ a['name'] ]]</font></para></td>
+        <td><para style="P3"><font>[[ a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"}) ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['debit']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[formatLang(a['debit']) ]]</font></para></td>
+        <td><para style="P3"><font>[[ a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"}) ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['credit']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[ formatLang(a['credit']) ]]</font></para></td>
+        <td><para style="P3"><font>[[ a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"}) ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['balance']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[ formatLang(a['balance'])  ]]</font></para></td>
       </tr>
     </blockTable>
   </story>
index 9e782e5..2c8036c 100644 (file)
     <para style="Table Contents">[[ repeatIn(objects, 'o') ]]</para>
     <blockTable colWidths="65.0,62.0,58.0,62.0,174.0,57.0,61.0" style="Table1" repeatRows="1">
       <tr>
-        <td>
-          <para style="P10a">Date</para>
-        </td>
-        <td>
-          <para style="P10">Voucher No</para>
-        </td>
-        <td>
-          <para style="P10">A/c No.</para>
-        </td>
-        <td>
-          <para style="P10a">Third party</para>
-        </td>
-        <td>
-          <para style="P10a">Entry label</para>
-        </td>
-        <td>
-          <para style="P10b">Debit</para>
-        </td>
-        <td>
-          <para style="P10b">Credit</para>
-        </td>
+        <td><para style="P10a">Date</para></td>
+        <td><para style="P10">Voucher No</para></td>
+        <td><para style="P10">A/c No.</para></td>
+        <td><para style="P10a">Third party</para></td>
+        <td><para style="P10a">Entry label</para></td>
+        <td><para style="P10b">Debit</para></td>
+        <td><para style="P10b">Credit</para></td>
       </tr>
        <tr>
-        <td>
-            <para style="P11">[[o.period_id.name ]]</para>
-        </td>
-        <td>
-          <para style="P11a">[[ o.journal_id.code ]]</para></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td>
-          <para style="P12"><u>[[ formatLang(sum_debit(o.period_id.id, o.journal_id.id)) ]]</u></para>
-        </td>
-        <td>
-          <para style="P12"><u>[[ formatLang(sum_credit(o.period_id.id, o.journal_id.id)) ]]</u></para>
-        </td>
+        <td><para style="P11">[[o.period_id.name ]]</para></td>
+        <td><para style="P11a">[[ o.journal_id.code ]]</para></td>
+        <td><para style="P11"><font color="white"></font></para></td>
+        <td><para style="P11"><font color="white"></font></para></td>
+        <td><para style="P11"><font color="white"></font></para></td>
+        <td><para style="P12"><u>[[ formatLang(sum_debit(o.period_id.id, o.journal_id.id)) ]]</u></para></td>
+        <td><para style="P12"><u>[[ formatLang(sum_credit(o.period_id.id, o.journal_id.id)) ]]</u></para></td>
       </tr>
-       <tr>
-        <td>
-          <para style="terp_default_8">[[ repeatIn(lines(o.period_id.id, o.journal_id.id), 'line') ]]</para>
-          <para style="terp_default_8">[[ formatLang(line.date,date=True) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_8">[[ line.ref ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_8">[[ line.account_id.code ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_8">[[ line.partner_id and line.partner_id.name ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_8">[[ line.name ]]</para>
-        </td>
-        <td>
-          <para style="P8">[[ formatLang(line.debit) ]]</para>
-        </td>
-        <td>
-          <para style="P8">[[ formatLang(line.credit) ]]</para>
-        </td>
-        <para style="Standard">
-      <font color="white"> </font>
-    </para>
+      <tr>
+        <td><para style="terp_default_8">[[ repeatIn(lines(o.period_id.id, o.journal_id.id), 'line') ]]</para><para style="terp_default_8">[[ formatLang(line.date,date=True) ]]</para></td>
+        <td><para style="terp_default_Centre_8">[[ line.ref ]]</para></td>
+        <td><para style="terp_default_Centre_8">[[ line.account_id.code ]]</para></td>
+        <td><para style="terp_default_8">[[ line.partner_id and line.partner_id.name ]]</para></td>
+        <td><para style="terp_default_8">[[ line.name ]]</para></td>
+        <td><para style="P8">[[ formatLang(line.debit) ]]</para></td>
+        <td><para style="P8">[[ formatLang(line.credit) ]]</para></td>
       </tr>
     </blockTable>
   </story>
index 972646c..21126c5 100644 (file)
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution  
+#    OpenERP, Open Source Management Solution    
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -28,12 +28,37 @@ import re
 
 class account_tax_code_report(rml_parse.rml_parse):
     #_name = 'report.account.tax.code.entries'
+    
     def __init__(self, cr, uid, name, context):
         super(account_tax_code_report, self).__init__(cr, uid, name, context)
         self.localcontext.update({
             'time': time,
+            'get_line':self.get_line,
         })
-
+        
+    def get_line(self,obj):
+        res ={}
+        result=[]
+        line_ids = self.pool.get('account.move.line').search(self.cr,self.uid,[('tax_code_id','=',obj.id)])
+        if line_ids:
+            b_objs = self.pool.get('account.move.line').browse(self.cr,self.uid,line_ids)
+            for line in b_objs:
+               res['date'] = line.date
+               res['ref'] = line.ref
+               res['acode'] = line.account_id.code
+               if line.partner_id:
+                   res['pname'] = line.partner_id.name
+                   res['country'] = ''
+                   if line.partner_id.address:
+                       if line.partner_id.address[0].country_id:
+                           res['country'] = line.partner_id.address[0].country_id.code
+               else:
+                   res['pname'] = ''
+               res['name'] = line.name
+               res['debit'] = line.debit
+               res['credit'] = line.credit
+               result.append(res)
+        return result
         
 report_sxw.report_sxw('report.account.tax.code.entries', 'account.tax.code',
     'addons/account/report/account_tax_code.rml', parser=account_tax_code_report, header=False)
index 72bbf56..e1dd6bd 100644 (file)
     <blockTableStyle id="Table_Line_Title">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
+         <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,0"/>
+         <lineStyle kind="LINEBELOW" colorName="#000000" start="1,0" stop="1,0"/>
+         <lineStyle kind="LINEBELOW" colorName="#000000" start="2,0" stop="2,0"/>
+         <lineStyle kind="LINEBELOW" colorName="#000000" start="3,0" stop="3,0"/>
+         <lineStyle kind="LINEBELOW" colorName="#000000" start="4,0" stop="4,0"/>
+         <lineStyle kind="LINEBELOW" colorName="#000000" start="5,0" stop="5,0"/>
+         <lineStyle kind="LINEBELOW" colorName="#000000" start="6,0" stop="6,0"/>
+                 
+         <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"/>
+         <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,1" stop="5,-1"/>
+         <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,1" stop="6,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table_Line_Content_Detail">
       <blockAlignment value="LEFT"/>
@@ -69,6 +83,7 @@
     <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" 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="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.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"/>
   </stylesheet>
   <images/>
   <story>
-    <!--blockTable colWidths="162.0,222.0,154.0" repeatRows="1" style="Table_Title_Table">
+       <para style="P8">[[ repeatIn(objects, 'o') ]]</para>
+       <para style="terp_tblheader_Details">
+    <font color="white"></font>
+    </para>
+    <blockTable colWidths="162.0,222.0,154.0" repeatRows="1" style="Table_Title_Table">
       <tr>
-        <td>
-          <para style="terp_header">[[ company.name ]]</para>
-        </td>
-        <td>
-          <para style="terp_header">
-            <font face="Times-Roman" size="11.0"/>
-          </para>
-        </td>
-        <td>
-          <para style="terp_header">Accounting Entries-[[ company.currency_id.name ]]</para>
-        </td>
+        <td><para style="terp_header">[[ o.company_id.name ]]</para></td>
+        <td><para style="terp_header"><font face="Times-Roman" size="11.0"/></para></td>
+        <td><para style="terp_header">Accounting Entries-[[ o.company_id.currency_id.name ]]</para></td>
       </tr>
-    </blockTable-->
-    <para style="terp_default_9">
-      <font color="white"> </font>
+    </blockTable>
+    <para style="terp_tblheader_Details">
+    <font color="white"></font>
+    </para>
+    <para style="terp_tblheader_Details">[[ o.name ]]</para> 
+    <para style="terp_tblheader_Details">
+    <font color="white"></font>
     </para>
     <section>
     <blockTable colWidths="55.0,43.0,57.0,125.0,127.0,65.0,67.0" repeatRows="1" style="Table_Line_Title">
       <tr>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Date</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Voucher Nb</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Account Number</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Third party (Country)</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Entry label</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Debit</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Credit</para>
-        </td>
-      </tr>
-      
-      <tr>
-      <td>
-       <para style="terp_default_8">[[ repeatIn(objects, 'o') ]]</para>
-       <para style="terp_default_8">[[ repeatIn(o.line_ids, 'line') ]]</para>
-                 <blockTable colWidths="48.0,43.0,58.0,128.0,127.0,64.0,65.0" style="Table_Line_Content_Detail">
-                   <tr>
-                     <td>
-                       <para style="terp_default_9">[[ formatLang(line.date,date=True) ]]</para>
-                     </td>
-                     <td>
-                       <para style="terp_default_9">[[ line.ref ]]</para>
-                     </td>
-                     <td>
-                       <para style="terp_default_9">[[ line.account_id.code ]]</para>
-                     </td>
-                     <td>
-                       <para style="terp_default_9">[[ line.partner_id and line.partner_id.name ]]<font>([[ line.partner_id and line.partner_id.address and line.partner_id.address[0].country_id.code or removeParentNode('font') ]] )</font></para>
-                     </td>
-                     <td>
-                       <para style="terp_default_9">[[ line.name ]]</para>
-                     </td>
-                     <td>
-                       <para style="terp_default_Right_9">[[ formatLang(line.debit) ]]</para>
-                     </td>
-                     <td>
-                       <para style="terp_default_Right_9">[[ formatLang(line.credit) ]]</para>
-                     </td>
-                   </tr>
-                 </blockTable>
-      </td>
+        <td><para style="terp_tblheader_Details_Centre">Date</para></td>
+        <td><para style="terp_tblheader_Details">Voucher Nb</para></td>
+        <td><para style="terp_tblheader_Details">Account Number</para></td>
+        <td><para style="terp_tblheader_Details">Third party (Country)</para></td>
+        <td><para style="terp_tblheader_Details">Entry label</para></td>
+        <td><para style="terp_tblheader_Details_Right">Debit</para></td>
+        <td><para style="terp_tblheader_Details_Right">Credit</para></td>
       </tr>
+          <tr>
+             <td><para style="terp_default_9">[[ repeatIn(get_line(o),'line') ]]<font>[[ not line and removeParentNode('tr') ]]</font>[[ formatLang(line['date'],date=True) ]]</para></td>
+             <td><para style="terp_default_9">[[ line['ref'] ]]</para></td>
+             <td><para style="terp_default_9">[[ line['acode'] ]]</para></td>
+             <td><para style="terp_default_9">[[ line['pname'] ]]<font>([[ line['country'] ]] )</font></para></td>
+             <td><para style="terp_default_9">[[ line['name'] ]]</para></td>
+             <td><para style="terp_default_Right_9">[[ formatLang(line['debit']) ]]</para></td>
+             <td><para style="terp_default_Right_9">[[ formatLang(line['credit']) ]]</para></td>
+          </tr>
     </blockTable>
     </section>
     <para style="terp_default_8">
index d8f78bc..1fe5b8b 100644 (file)
@@ -80,6 +80,7 @@
     <paraStyle name="Footer" fontName="Times-Roman"/>
     <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.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"/>
   </stylesheet>
   <images/>
   <story>
-    <para style="terp_default_8">
+    <para style="P9">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_8">
+    <para style="P9">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_8">
+    <para style="P9">
       <font color="white"> </font>
     </para>
     <para style="terp_default_8">[[ repeatIn(objects, 'o') ]]</para>
     <blockTable colWidths="180.0,180.0,180.0" style="Table_header_Content">
       <tr>
-        <td>
-          <para style="terp_header">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_header_Centre">Central Journal</para>
-        </td>
-        <td>
-          <para style="terp_header">
-            <font color="white"> </font>
-          </para>
+        <td><para style="terp_header"><font color="white"> </font></para>
         </td>
+        <td><para style="terp_header_Centre">Central Journal</para></td>
+        <td><para style="terp_header"><font color="white"> </font></para></td>
       </tr>
     </blockTable>
-    <para style="terp_default_8">
+    <para style="P9">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="180.0,180.0,180.0" style="Table_Sub_Header_Content">
       <tr>
-        <td>
-          <para style="terp_tblheader_General_Centre">Journal Code</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">Journal Name</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">Printing Date</para>
-        </td>
+        <td><para style="terp_tblheader_General_Centre">Journal Code</para></td>
+        <td><para style="terp_tblheader_General_Centre">Journal Name</para></td>
+        <td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
       </tr>
     </blockTable>
     <blockTable colWidths="180.0,180.0,180.0" style="Table_Subheader_Content_detail">
       <tr>
-        <td>
-          <para style="terp_tblheader_General_Centre">[[ o.journal_id.code or '' ]]</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">[[ o.journal_id.name ]]</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]] </para>
-        </td>
+        <td><para style="terp_tblheader_General_Centre">[[ o.journal_id.code or '' ]]</para></td>
+        <td><para style="terp_tblheader_General_Centre">[[ o.journal_id.name ]]</para></td>
+        <td><para style="terp_tblheader_General_Centre">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]] </para></td>
       </tr>
     </blockTable>
-    <para style="terp_default_8">
+    <para style="P9">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="83.0,269.0,95.0,92.0" style="Table_Account_detail_Title">
       <tr>
-        <td>
-          <para style="terp_tblheader_Details">Account Num.</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Account Name</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">Account Num.</para></td>
+        <td><para style="terp_tblheader_Details">Account Name</para></td>
+        <td><para style="terp_tblheader_Details_Right">Debit</para></td>
+        <td><para style="terp_tblheader_Details_Right">Credit</para></td>
       </tr>
     </blockTable>
     <para style="terp_default_2">
     </para>
     <blockTable colWidths="83.0,269.0,94.0,92.0" style="Table_Final_Total">
       <tr>
-        <td>
-          <para style="terp_default_Bold_9">Total:</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9_Right">[[ formatLang( sum_debit(o.period_id.id, o.journal_id.id)) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)) ]]</para>
-        </td>
+        <td><para style="terp_default_Bold_9">Total:</para></td>
+        <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
+        <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_debit(o.period_id.id, o.journal_id.id)) ]]</para></td>
+        <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)) ]]</para></td>
       </tr>
     </blockTable>
     <para style="terp_default_2">
       <para style="terp_default_8">[[ repeatIn(lines(o.period_id.id,o.journal_id.id),'line') ]]</para>
       <blockTable colWidths="83.0,269.0,94.0,92.0" style="Table_Journal_Line_Content">
         <tr>
-          <td>
-            <para style="terp_default_9">[[ line['code'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9">[[ line['name'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang(line['debit']) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang(line['credit'])]]</para>
-          </td>
+          <td><para style="terp_default_9">[[ line['code'] ]]</para></td>
+          <td><para style="terp_default_9">[[ line['name'] ]]</para></td>
+          <td><para style="terp_default_Right_9">[[ formatLang(line['debit']) ]]</para></td>
+          <td><para style="terp_default_Right_9">[[ formatLang(line['credit'])]]</para></td>
         </tr>
       </blockTable>
       <para style="terp_default_2">
         <font color="white"> </font>
       </para>
     </section>
-    <para style="terp_default_8">
+    <para style="P9">
       <font color="white"> </font>
     </para>
   </story>
index 5a9ccff..6c62d82 100644 (file)
@@ -52,6 +52,7 @@
     </initialize>
     <paraStyle name="Standard" fontName="Times-Roman"/>
     <paraStyle name="Text body" fontName="Times-Roman" 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="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
   </stylesheet>
   <images/>
   <story>
-    <para style="terp_default_8">
+    <para style="P9">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_8">
+    <para style="P9">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="180.0,180.0,179.0" style="Table_Header_Title">
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_8">
+    <para style="P9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="68.0,471.0" style="Table_Print_Current_datetime">
+    <blockTable colWidths="88.0,451.0" style="Table_Print_Current_datetime">
       <tr>
         <td>
           <para style="terp_default_Bold_9">Printing Date :</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_8">
+    <para style="P9">
       <font color="white"> </font>
-    </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
+    </para>    
     <blockTable colWidths="72.0,218.0,89.0,83.0,77.0" style="Table_Journal_Title">
       <tr>
-        <td>
-          <para style="terp_tblheader_Details">Code</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Journal Name</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Period</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Debit Trans.</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Credit Trans.</para>
-        </td>
+        <td><para style="terp_tblheader_Details">Code</para></td>
+        <td><para style="terp_tblheader_Details">Journal Name</para></td>
+        <td><para style="terp_tblheader_Details">Period</para></td>
+        <td><para style="terp_tblheader_Details_Right">Debit Trans.</para></td>
+        <td><para style="terp_tblheader_Details_Right">Credit Trans.</para></td>
       </tr>
     </blockTable>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
     <blockTable colWidths="71.0,219.0,89.0,83.0,77.0" style="Table_Final_Total">
       <tr>
-        <td>
-          <para style="terp_default_Bold_9">Total:</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit()) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit()) ]]</para>
-        </td>
+        <td><para style="terp_default_Bold_9">Total:</para></td>
+        <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
+        <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
+        <td><para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit()) ]]</para></td>
+        <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit()) ]]</para></td>
       </tr>
     </blockTable>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
     <section>
       <para style="terp_default_8">[[ repeatIn( periods(objects), 'o') ]]</para>
       <blockTable colWidths="176.0,115.0,89.0,83.0,76.0" style="Table_Sub_Total">
         <font color="white"> </font>
       </para>
     </section>
-    <para style="terp_default_8">
+    <para style="P9">
       <font color="white"> </font>
     </para>
   </story>
index f3acb1c..48ce204 100644 (file)
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.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"/>
     <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
     <blockTable colWidths="297.0,233.0" style="Table_Partner_Address">
       <tr>
-        <td>
-          <para style="terp_default_8">
-            <font color="white"> </font>
-          </para>
-        </td>
+        <td><para style="P8"><font color="white"> </font></para></td>
         <td>
           <para style="terp_default_8">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
           <para style="terp_default_8">[[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]]</para>
           <para style="terp_default_8">[[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]]</para>
           <para style="terp_default_8">[[ o.address_invoice_id.state_id and o.address_invoice_id.state_id.name or '' ]]</para>
           <para style="terp_default_8">[[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]]</para>
-          <para style="terp_default_8">
+          <para style="P8">
             <font color="white"> </font>
           </para>
           <para style="terp_default_8">Tel. : [[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
     <para style="terp_header">Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
     <para style="terp_header">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
     <para style="terp_header">Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
-    <para style="terp_default_8">
+    <para style="P8">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="177.0,177.0,177.0" style="Table_Invoice_General_Header">
       <tr>
-        <td>
-          <para style="terp_tblheader_General_Centre">Document</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">Invoice Date</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">Partner Ref.</para>
-        </td>
+        <td><para style="terp_tblheader_General_Centre">Document</para></td>
+        <td><para style="terp_tblheader_General_Centre">Invoice Date</para></td>
+        <td><para style="terp_tblheader_General_Centre">Partner Ref.</para></td>
       </tr>
     </blockTable>
     <blockTable colWidths="177.0,177.0,177.0" style="Table_General_Detail_Content">
       <tr>
-        <td>
-          <para style="terp_default_Centre_9">[[ o.name ]]</para>
-        </td>
-        <td>
-          <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>
-        </td>
+        <td><para style="terp_default_Centre_9">[[ o.name ]]</para></td>
+        <td><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></td>
       </tr>
     </blockTable>
-    <para style="terp_default_8">
+    <para style="P8">
+      <font color="white"> </font>
+    </para>
+    <para style="P8">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="211.0,62.0,63.0,63.0,80.0,69.0" style="Table_Header_Invoice_Line">
       <tr>
-        <td>
-          <para style="terp_tblheader_Details">Description</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Taxes</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Quantity</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Unit Price</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Disc. (%)</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Price</para>
-        </td>
+        <td><para style="terp_tblheader_Details">Description</para></td>
+        <td><para style="terp_tblheader_Details">Taxes</para></td>
+        <td><para style="terp_tblheader_Details">Quantity</para></td>
+        <td><para style="terp_tblheader_Details_Right">Unit Price</para></td>
+        <td><para style="terp_tblheader_Details_Right">Disc. (%)</para></td>
+        <td><para style="terp_tblheader_Details_Centre">Price</para></td>
       </tr>
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(o.invoice_line,'l') ]]</para>
       <blockTable colWidths="211.0,62.0,36.0,27.0,63.0,36.0,62.0,26.0" style="Table_Invoice_Line_Content">
         <tr>
-          <td>
-            <para style="terp_default_9">[[ l.name ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9">[[ ', '.join([ lt.description or '' for lt in l.invoice_line_tax_id ]) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.quantity)]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ (l.uos_id and l.uos_id.name) or '' ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.discount) ]] </para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
-          </td>
+          <td><para style="terp_default_9">[[ l.name ]]</para></td>
+          <td><para style="terp_default_9">[[ ', '.join([ lt.description or '' for lt in l.invoice_line_tax_id ]) ]]</para></td>
+          <td><para style="terp_default_Right_9">[[ formatLang(l.quantity)]]</para></td>
+          <td><para style="terp_default_Right_9">[[ (l.uos_id and l.uos_id.name) or '' ]]</para></td>
+          <td><para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]]</para></td>
+          <td><para style="terp_default_Right_9">[[ formatLang(l.discount) ]] </para></td>
+          <td><para style="terp_default_Right_9">[[ formatLang(l.price_subtotal) ]]</para></td>
+          <td><para style="terp_default_Right_9">[[ o.currency_id.code ]]</para></td>
         </tr>
         <tr>
-          <td>
-            <para style="terp_default_Note">[[ format(l.note or removeParentNode('tr')) ]]</para>
-            <para style="terp_default_Note">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Note">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Note">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Note">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Note">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Note">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Note">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Note">
-              <font color="white"> </font>
-            </para>
-          </td>
+          <td><para style="terp_default_Note">[[ format(l.note or removeParentNode('tr')) ]]</para></td>
+          <td><para style="terp_default_Note"><font color="white"> </font></para></td>
+          <td><para style="terp_default_Note"><font color="white"> </font></para></td>
+          <td><para style="terp_default_Note"><font color="white"> </font></para></td>
+          <td><para style="terp_default_Note"><font color="white"> </font></para></td>
+          <td><para style="terp_default_Note"><font color="white"> </font></para></td>
+          <td><para style="terp_default_Note"><font color="white"> </font></para></td>
+          <td><para style="terp_default_Note"><font color="white"> </font></para></td>
         </tr>
       </blockTable>
     </section>
         <td>
           <blockTable colWidths="176.0,258.0" style="Table_format_Table_Line_total">
             <tr>
-              <td>
-                <para style="terp_default_2">
-                  <font color="white"> </font>
-                </para>
-              </td>
-              <td>
-                <para style="terp_default_2">
-                  <font color="white"> </font>
-                </para>
-              </td>
+              <td><para style="terp_default_2"><font color="white"> </font></para></td>
+              <td><para style="terp_default_2"><font color="white"> </font></para></td>
             </tr>
           </blockTable>
         </td>
         <td>
           <blockTable colWidths="62.0,59.0,25.0" style="Table_eclu_Taxes_Total">
             <tr>
-              <td>
-                <para style="terp_default_Bold_9">Net Total:</para>
-              </td>
-              <td>
-                <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
-              </td>
+              <td><para style="terp_default_Bold_9">Net Total:</para></td>
+              <td><para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]]</para></td>
+              <td><para style="terp_default_Right_9">[[ o.currency_id.code ]]</para></td>
             </tr>
           </blockTable>
-          <para style="terp_default_2">
-            <font color="white"> </font>
-          </para>
           <blockTable colWidths="63.0,58.0,26.0" style="Table_Taxes_Total">
             <tr>
-              <td>
-                <para style="terp_default_Bold_9">Taxes:</para>
-              </td>
-              <td>
-                <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
-              </td>
+              <td><para style="terp_default_Bold_9">Taxes:</para></td>
+              <td><para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]]</para></td>
+              <td><para style="terp_default_Right_9">[[ o.currency_id.code ]]</para></td>
             </tr>
           </blockTable>
-          <para style="terp_default_2">
-            <font color="white"> </font>
-          </para>
           <blockTable colWidths="63.0,58.0,26.0" style="Table_Total_Include_Taxes">
             <tr>
-              <td>
-                <para style="terp_default_Bold_9">Total:</para>
-              </td>
-              <td>
-                <para style="terp_default_Right_9">[[ formatLang(o.amount_total) ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
-              </td>
+              <td><para style="terp_default_Bold_9">Total:</para></td>
+              <td><para style="terp_default_Right_9">[[ formatLang(o.amount_total) ]]</para></td>
+              <td><para style="terp_default_Right_9">[[ o.currency_id.code ]]</para></td>
             </tr>
           </blockTable>
         </td>
     <blockTable colWidths="530.0" style="Table_Main_Table">
       <tr>
         <td>
-          <para style="terp_default_8">
-            <font color="white"> </font>
-          </para>
           <blockTable colWidths="54.0,80.0,67.0" style="Table_Tax_Header">
             <tr>
-              <td>
-                <para style="terp_tblheader_Details_Centre">Tax</para>
-              </td>
-              <td>
-                <para style="terp_tblheader_Details_Right">Base</para>
-              </td>
-              <td>
-                <para style="terp_tblheader_Details_Right">Amount</para>
-              </td>
+              <td><para style="terp_tblheader_Details_Centre">Tax</para></td>
+              <td><para style="terp_tblheader_Details_Right">Base</para></td>
+              <td><para style="terp_tblheader_Details_Right">Amount</para></td>
             </tr>
           </blockTable>
-          <para style="terp_default_2">
-            <font color="white"> </font>
-          </para>
         </td>
       </tr>
       <tr>
           <para style="terp_default_8">[[ repeatIn(o.tax_line,'t') ]]</para>
           <blockTable colWidths="53.0,80.0,65.0" style="Table_Tax_Content">
             <tr>
-              <td>
-                <para style="terp_default_Centre_8">[[ t.name ]] </para>
-              </td>
-              <td>
-                <para style="terp_default_Right_8">[[ formatLang(t.base) ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_Right_8">[[  t.tax_code_id.notprintable and removeParentNode('blockTable') or '' ]][[ formatLang(t.amount) ]]</para>
-              </td>
+              <td><para style="terp_default_Centre_8">[[ t.name ]] </para></td>
+              <td><para style="terp_default_Right_8">[[ formatLang(t.base) ]]</para></td>
+              <td><para style="terp_default_Right_8">[[  t.tax_code_id.notprintable and removeParentNode('blockTable') or '' ]][[ formatLang(t.amount) ]]</para></td>
             </tr>
           </blockTable>
         </td>
         <td>
           <blockTable colWidths="53.0,60.0,65.0" style="Table_Table_Border_White">
             <tr>
-              <td>
-                <para style="terp_default_2">
-                  <font color="white"> </font>
-                </para>
-              </td>
-              <td>
-                <para style="terp_default_2">
-                  <font color="white"> </font>
-                </para>
-              </td>
-              <td>
-                <para style="terp_default_2">
-                  <font color="white"> </font>
-                </para>
-              </td>
+              <td><para style="terp_default_2"><font color="white"> </font></para></td>
+              <td><para style="terp_default_2"><font color="white"> </font></para></td>
+              <td><para style="terp_default_2"><font color="white"> </font></para></td>
             </tr>
           </blockTable>
         </td>
     </blockTable>
     <blockTable colWidths="180.0,350.0" style="Table_Final_Border">
       <tr>
-        <td>
-          <para style="terp_default_2">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_2">
-            <font color="white"> </font>
-          </para>
-        </td>
+        <td><para style="terp_default_2"><font color="white"> </font></para></td>
+        <td><para style="terp_default_2"><font color="white"> </font></para></td>
       </tr>
     </blockTable>
     <blockTable colWidths="530.0" style="Table_Coment_Payment_Term">
       <tr>
-        <td>
-          <para style="terp_default_9">[[ format(o.comment or removeParentNode('blockTable')) ]]</para>
-        </td>
+        <td><para style="terp_default_9">[[ format(o.comment or removeParentNode('blockTable')) ]]</para></td>
       </tr>
     </blockTable>
     <para style="terp_default_2">
     </para>
     <blockTable colWidths="530.0" style="Table_Payment_Terms">
       <tr>
-        <td>
-          <para style="terp_default_9">[[ format((o.payment_term and o.payment_term.note) or removeParentNode('blockTable')) ]]</para>
-        </td>
+        <td><para style="terp_default_9">[[ format((o.payment_term and o.payment_term.note) or removeParentNode('blockTable')) ]]</para></td>
       </tr>
     </blockTable>
     <para style="terp_default_2">
index a096b5a..86dc57d 100644 (file)
       <lineStyle kind="GRID" colorName="black"/>
     </blockTableStyle>
     <blockTableStyle id="Table2">
-       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,1" stop="-1,1"/>
-      <!--<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,2" stop="-1,-1"/>
-       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,1" stop="-1,1"/> -->
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,0"/>
+         <lineStyle kind="LINEBELOW" colorName="#000000" start="1,0" stop="1,0"/>
+         <lineStyle kind="LINEBELOW" colorName="#000000" start="2,0" stop="2,0"/>
+         <lineStyle kind="LINEBELOW" colorName="#000000" start="3,0" stop="3,0"/>
+         <lineStyle kind="LINEBELOW" colorName="#000000" start="4,0" stop="4,0"/>
+         <lineStyle kind="LINEBELOW" colorName="#000000" start="5,0" stop="5,0"/>
+         
+         <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"/>
+         <lineStyle kind="LINEBELOW" colorName="#000000" start="5,1" stop="5,1"/>
+         
+         <lineStyle kind="LINEBELOW" colorName="#000000" start="0,2" stop="0,2"/>
+         <lineStyle kind="LINEBELOW" colorName="#000000" start="1,2" stop="1,2"/>
+         <lineStyle kind="LINEBELOW" colorName="#000000" start="2,2" stop="2,2"/>
+         <lineStyle kind="LINEBELOW" colorName="#000000" start="3,2" stop="3,2"/>
+         <lineStyle kind="LINEBELOW" colorName="#000000" start="4,2" stop="4,2"/>
+         <lineStyle kind="LINEBELOW" colorName="#000000" start="5,2" stop="5,2"/>
+                 
+         <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,3" stop="0,-1"/>
+         <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,3" stop="1,-1"/>
+         <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,3" stop="2,-1"/>
+         <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,3" stop="3,-1"/>
+         <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,3" stop="4,-1"/>
+         <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,3" stop="5,-1"/>
     <blockValign value="TOP"/>
     <blockAlignment value="RIGHT" start="2,1" stop="-1,-1"/>
     </blockTableStyle>
     <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P5" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P6" fontName="Helvetica" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-
-    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="9.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-
-    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="8.5" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="8.5" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-
+    <paraStyle name="P6" fontName="Helvetica" fontSize="11.0" leading="12" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="9" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="9" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P9" fontName="Helvetica" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P9b" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P10" fontName="Helvetica" alignment="CENTER"/>
     <paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="10"/>
-    <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="9.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P12a" fontName="Helvetica" fontSize="9.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P12b" fontName="Helvetica" fontSize="9.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P12a" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P12b" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P14" rightIndent="17.0" leftIndent="-0.0" fontName="Times-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <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="Caption" fontName="Helvetica" fontSize="10.0" leading="11" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="Index" fontName="Helvetica"/>
 
      <blockTableStyle id="TrLevel8">
                fontName="Times-Italic" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"
                />
 
-
   </stylesheet>
   <story>
+    <para style="P12a"></para>
         <blockTable colWidths="61.0,206.0,69.0,68.0,69.0,68.0" repeatRows="1" style="Table2">
       <tr>
-        <td>
-          <para style="P12a">[[ setTag('tr','tr',{'style':'Line1'}) ]] Code </para>
-        </td>
-        <td>
-          <para style="P12a">Partner name</para>
-        </td>
-        <td>
-          <para style="P12b">Débit</para>
-        </td>
-        <td>
-          <para style="P12b">Crédit</para>
-        </td>
-        <td>
-          <para style="P12b">Balance</para>
-        </td>
-        <td>
-          <para style="P12b">In dispute</para>
-        </td>
+        <td><para style="P12a">Code</para></td>
+        <td><para style="P12a">(Account/Partner) Name</para></td>
+        <td><para style="P12b">Debit</para></td>
+        <td><para style="P12b">Credit</para></td>
+        <td><para style="P12b">Balance</para></td>
+        <td><para style="P12b">In dispute</para></td>
+      </tr>
+      <tr>
+        <td><para style="P7">Grand total</para></td>
+        <td><para style="P8"></para></td>
+        <td><para style="P8"><u>[[ formatLang(sum_debit(data)) ]]</u></para></td>
+        <td><para style="P8"><u>[[ formatLang(sum_credit(data)) ]]</u></para></td>
+        <td><para style="P8"><u>[[ formatLang((solde_debit(data)-solde_credit(data))) ]]</u></para></td>
+        <td><para style="P8"><u>[[ formatLang(sum_litige(data)) ]]</u></para></td>
       </tr>
       <tr>
-        <td>
-          <para style="P7">[[ setTag('tr','tr',{'style':'Line2'}) ]] Grand total</para>
-        </td>
-        <td>
-          <para style="P8"></para>
-        </td>
-        <td>
-          <para style="P8"><u>[[ formatLang(sum_debit(data)) ]]</u></para>
-        </td>
-        <td>
-          <para style="P8"><u>[[ formatLang(sum_credit(data)) ]]</u></para>
-        </td>
-        <td>
-          <para style="P8"><u>[[ formatLang((solde_debit(data)-solde_credit(data))) ]]</u></para>
-        </td>
-        <td>
-          <para style="P8"><u>[[ formatLang(sum_litige(data)) ]]</u></para>
-        </td>
+        <td><para style="P7">Balance</para></td>
+        <td><para style="P8"></para></td> 
+        <td><para style="P8">[[ formatLang(solde_debit(data)) ]]</para></td>
+        <td><para style="P8">[[ formatLang(solde_credit(data)) ]]</para></td>
+        <td><para style="P8"></para></td>
+        <td><para style="P8"></para></td>
       </tr>
-     <!-- <tr>
-        <td>
-          <para style="P7">Balance</para>
-        </td><td>
-        </td> <td>
-        </td><td>
-          <para style="P8">[[ formatLang(solde_debit(data)) ]]</para>
-        </td>
-        <td>
-          <para style="P8">[[ formatLang(solde_credit(data)) ]]</para>
-        </td>
-        <td>
-        </td>
-      </tr> -->
       <tr>
-        <td>
-          <para style="P3">[[ repeatIn(lines(data), 'a') ]]<font face="Helvetica">[[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ a['ref'] ]] [[ a['type']==3 and a['code'] ]]</font></para>
-        </td>
-        <td>
-          <para style="P3">[[ a['type']==3 and ( setTag('tr','tr',{'style':'TrLevel0'})) ]] [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ a['type']==1 and ( setTag('blockTable','blockTable',{'style':'LineLevel1'})) ]] [[ a['name'] ]]</para>
-        </td>
-        <td>
-          <para style="P4">
-               <font><u>[[ (a['type']==3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica-Bold'}) ]] [[ formatLang(a['debit']) ]]</u></font>
-               <font>[[ (a['type']!=3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica'}) ]] [[ formatLang(a['debit']) ]]</font>
-                 </para>
-        </td>
-        <td>
-          <para style="P4">
-               <font><u>[[ (a['type']==3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica-Bold'}) ]] [[ formatLang(a['credit']) ]]</u></font>
-               <font>[[ (a['type']!=3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica'}) ]] [[ formatLang(a['credit']) ]]</font>
-                 </para>
-        </td>
-        <td>
-          <para style="P4">
-               <font><u>[[ (a['type']==3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica-Bold'}) ]] [[ formatLang(a['balance']) ]]</u></font>
-               <font>[[ (a['type']!=3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica'}) ]] [[ formatLang(a['balance'])  ]]</font>
-                 </para>
-        </td>
-        <td>
-          <para style="P4">
-               <font><u>[[ (a['type']==3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica-Bold'}) ]] [[ formatLang(a['enlitige'] or 0.00) ]]</u></font>
-               <font>[[ (a['type']!=3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica'}) ]] [[ formatLang(a['enlitige'] or 0.00) ]]</font>
-                 </para>
-        </td>
+        <td><para style="P3">[[ repeatIn(lines(data), 'a') ]]<font>[[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]][[ a['ref'] ]] [[ a['type']==3 and a['code'] ]]</font></para></td>
+        <td><para style="P3">[[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]][[ a['name'] ]]</para></td>
+        <td><para style="P4">[[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]][[ formatLang(a['debit']) ]]</para></td>
+        <td><para style="P4">[[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]][[ formatLang(a['credit']) ]]</para></td>
+        <td><para style="P4">[[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]][[ formatLang(a['balance']) ]]</para></td>
+        <td><para style="P4">[[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]][[ formatLang(a['enlitige'] or 0.00) ]]</para></td>
       </tr>
     </blockTable>
   </story>
index d82f9ab..abbef9a 100644 (file)
@@ -57,8 +57,8 @@ class tax_report(rml_parse.rml_parse):
                        return new
                else:
                        return self.comma_me(new)
-       def _get_lines(self, based_on,period_list,company_id=False, parent=False, level=0):
-               res = self._get_codes(based_on,parent,level,period_list)
+       def _get_lines(self, based_on,period_list,company_id, parent=False, level=0):
+               res = self._get_codes(based_on,company_id,parent,level,period_list)
                
                if period_list[0][2] :
                        res = self._add_codes(based_on,res,period_list)
@@ -157,15 +157,15 @@ class tax_report(rml_parse.rml_parse):
                        i+=1
                return res
 
-       def _get_codes(self, based_on, parent=False, level=0,period_list=[]):
+       def _get_codes(self,based_on, company_id, parent=False, level=0,period_list=[]):
                tc = self.pool.get('account.tax.code')
-               ids = tc.search(self.cr, self.uid, [('parent_id','=',parent)])
+               ids = tc.search(self.cr, self.uid, [('parent_id','=',parent),('company_id','=',company_id)])
        
                res = []
                for code in tc.browse(self.cr, self.uid, ids, {'based_on': based_on}):
                        res.append(('.'*2*level,code))
                        
-                       res += self._get_codes(based_on, code.id, level+1)
+                       res += self._get_codes(based_on, company_id, code.id, level+1)
                return res
        
        def _add_codes(self,based_on, account_list=[],period_list=[]):
index 9cdba22..eecf76f 100644 (file)
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,0" stop="3,0"/>
       
-      <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="#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"/>
       
      
       <blockValign value="TOP"/>
@@ -88,7 +88,7 @@
     <paraStyle name="P9b" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P10" fontName="Helvetica" alignment="CENTER"/>
     <paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="14"/>
-    <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.6" spaceAfter="6.0"/>
     <paraStyle name="P12a" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P14" fontName="Helvetica-Bold" spaceBefore="0.0" spaceAfter="6.0"/>
     
   </stylesheet>
   <story>
-       
-       <para style="P2">
-<font color="white"> </font>
-</para>
-    <blockTable colWidths="347.0,64.0,59.0,71.0" style="Table2" repeatRows="1">
-      <tr>
-        <td>
-           <para style="P12">Code</para>
-        </td>
-        <td>
-           <para style="P12a">Debit</para>
-        </td>
-        <td>
-           <para style="P12a">Credit</para>
-        </td>
-        <td>
-           <para style="P12a">Tax Amount</para>
-        </td>
-      </tr>
-    
-     
-      <tr>
-       
-          <para style="Caption">[[ repeatIn(get_lines(data['form']['based_on'],data['form']['periods'],data['form']['company_id']), 'o') ]]</para>
-           <td>
-                       <para style="P5"><font color="white">[[ '...'*len(o['level']) ]]</font> 
-                                               <font>[[o['type']==1 and ( setTag('para','para',{'fontName':'Helvetica-Bold'}))]]</font> 
-                                               
-                                               [[ o['code'] ]]  [[ o['name'] ]]<font></font>
-               </para>
-           </td>
-           <td>
-        
-                                         
-               <para style="P6"> <font><u><b>[[ len(o['level'])&gt;3 and removeParentNode('font') ]][[ formatLang(o['debit']) ]]</b></u></font>
-                                         <font>[[ len(o['level'])&lt;4 and removeParentNode('font') ]][[ formatLang(o['debit']) ]]</font>
-               </para>
-           </td>
-           <td>
-                       <para style="P6"> <font><u><b>[[ len(o['level'])&gt;3 and removeParentNode('font') ]][[ formatLang(o['credit'])]]</b></u></font>
-                                         <font>[[ len(o['level'])&lt;4 and removeParentNode('font') ]][[ formatLang(o['credit'])]]</font>
-               </para>
-               
-           </td>
-           <td>
-                       <para style="P6"> <font><u><b>[[ len(o['level'])&gt;3 and removeParentNode('font') ]][[ formatLang(o['tax_amount']) ]]</b></u></font>
-                                         <font>[[ len(o['level'])&lt;4 and removeParentNode('font') ]][[ formatLang(o['tax_amount']) ]]</font>
-               </para>
-               
-           </td>
-          
-      </tr>
-      
-      
-           </blockTable>
-  
+       <para style="P2"><font color="white"> </font></para>
+       <blockTable colWidths="347.0,64.0,59.0,71.0" style="Table2" repeatRows="1">
+         <tr>
+           <td><para style="P12">Tax Name</para></td>
+           <td><para style="P12a">Debit</para></td>
+           <td><para style="P12a">Credit</para></td>
+           <td><para style="P12a">Tax Amount</para></td>
+         </tr>
+         <tr>
+              <td><para style="P5"><font>[[ repeatIn(get_lines(data['form']['based_on'],data['form']['periods'],data['form']['company_id']), 'o') ]]</font><font color="white">[[ '...'*len(o['level']) ]]</font> <font>[[o['type']==1 and ( setTag('para','para',{'fontName':'Helvetica-Bold'}))]]</font>[[ o['code'] ]]  [[ o['name'] ]]</para></td>
+              <td><para style="P6"><font>[[ len(o['level'])&lt;3 and setTag('para','para',{'fontName':"Helvetica-Bold"}) ]]</font>[[ formatLang(o['debit']) ]]</para></td>
+              <td><para style="P6"><font>[[ len(o['level'])&lt;3 and setTag('para','para',{'fontName':"Helvetica-Bold"}) ]]</font>[[ formatLang(o['credit'])]]</para></td>
+              <td><para style="P6"><font>[[ len(o['level'])&lt;3 and setTag('para','para',{'fontName':"Helvetica-Bold"}) ]]</font>[[ formatLang(o['tax_amount']) ]]</para></td>
+         </tr>
+         </blockTable>
   </story>
 </document>
index 3004bed..9828fdf 100644 (file)
@@ -447,4 +447,8 @@ report_sxw.report_sxw('report.account.third_party_ledger', 'res.partner',
                'addons/account/report/third_party_ledger.rml',parser=third_party_ledger,
                header=False)
 
+report_sxw.report_sxw('report.account.third_party_ledger_other', 'res.partner',
+               'addons/account/report/third_party_ledger_other.rml',parser=third_party_ledger,
+               header=False)
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
index 91a9b67..82d14a6 100644 (file)
     <paraStyle name="Index" fontName="Helvetica"/>
   </stylesheet>
   <story>
-
        <para style="P2"><font color="white"></font></para>
-       <para>
-               <font color="white">[[ data['form']['page_split'] == True or removeParentNode('para') ]] </font>
-               <font color="white">[[ repeatIn(objects, 'p') ]] [[ setLang(p.partner_id.lang) ]]</font>
-               </para>
-               
+    <para>[[ repeatIn(objects, 'p') ]] [[ setLang(p.partner_id.lang) ]]</para>
     <blockTable colWidths="50.0,30.0,42.0,220.0,69.0,72.0,63.0" repeatRows="1" style="tbl_heading">
         <tr>
-        <td>
-
-                       <para style="date">Date</para>
-               </td>
-               <td>
-                       <para style="P12">JNRL</para>
-               </td>
-               <td>
-                       <para style="P12">Ref.</para>
-               </td>
-               <td>
-                       <para style="P12">Entry label</para>
-               </td>
-               <td>
-                       <para style="P16">Debit</para>
-               </td>
-               <td>
-                       <para style="P16">Credit</para>
-               </td>
-               <td>
-                       <para style="P16">Balance</para>
-               </td>
-     </tr>
-     <tr>
+        <td><para style="date">Date</para></td>
+               <td><para style="P12">JNRL</para></td>
+               <td><para style="P12">Ref.</para></td>
+               <td><para style="P12">Entry label</para></td>
+               <td><para style="P16">Debit</para></td>
+               <td><para style="P16">Credit</para></td>
+               <td><para style="P16">Balance</para></td>
      </tr>
      <tr>
        <td>
-       <blockTable colWidths="337.0,69.0,72.0,63.0" style="Table3">
+        <blockTable colWidths="337.0,69.0,72.0,63.0" style="Table3">
         <tr>
-               <td>
-                       <para style="Balance">Balance brought forward</para>
-               </td>
-               <td>
-                       <para style="P8"><u>[[ formatLang((sum_debit(data))) ]]</u></para>
-               </td>
-               <td>
-                       <para style="P8"><u>[[ formatLang((sum_credit(data))) ]]</u></para>
-               </td>
-               <td>
-                       <para style="P8"><u>[[ formatLang((sum_debit(data) - sum_credit(data))) ]]</u></para>
-               </td>
+               <td><para style="Balance">Balance brought forward</para></td>
+               <td><para style="P8"><u>[[ formatLang((sum_debit(data))) ]]</u></para></td>
+               <td><para style="P8"><u>[[ formatLang((sum_credit(data))) ]]</u></para></td>
+               <td><para style="P8"><u>[[ formatLang((sum_debit(data) - sum_credit(data))) ]]</u></para></td>
             </tr>
            </blockTable>
            </td>
      </tr>
      <tr>
        <td>
-                       <para style="P1">
-                     <font color="white">[[ data['form']['page_split'] == False or removeParentNode('para') ]] </font>
-                      <font color="white">[[ repeatIn(objects, 'p') ]]</font>
-                   </para>
                        <blockTable colWidths="300.0,37.0,69.0,72.0,63.0" style="Table5">
                     <tr>
-                       <td>
-                               <para style="total">[[ p.ref ]] - [[ p.name ]]</para>
-                       </td>
-                       <td>
-                               <para style="total"></para>
-                       </td>
-                       <td>
-                           <para style="P9b"><u>[[ formatLang((sum_debit_partner(p,data))) ]]</u></para>
-                       </td>
-                       <td>
-                           <para style="P9b"><u>[[ formatLang((sum_credit_partner(p,data))) ]]</u></para>
-                       </td>
-                       <td>
-                           <para style="P9b"><u>[[ formatLang((sum_debit_partner(p,data) - sum_credit_partner(p,data))) ]]</u></para>
-                       </td>
+                       <td><para style="total">[[ p.ref ]] - [[ p.name ]]</para></td>
+                       <td><para style="total"></para></td>
+                       <td><para style="P9b"><u>[[ formatLang((sum_debit_partner(p,data))) ]]</u></para></td>
+                       <td><para style="P9b"><u>[[ formatLang((sum_credit_partner(p,data))) ]]</u></para></td>
+                       <td><para style="P9b"><u>[[ formatLang((sum_debit_partner(p,data) - sum_credit_partner(p,data))) ]]</u></para></td>
                     </tr>
                    </blockTable>
                    <blockTable colWidths="45.0,30.0,262.0,0.0,69.0,72.0,63.0" style="Table2">
                     <tr>
-                            <td>
-                               <para style="P15"><font face="Helvetica">[[ repeatIn(lines(p,data), 'line') ]]</font>[[ formatLang(line['date'],date=True) ]]</para>
-                        </td>
-                        <td>
-                               <para style="P3">[[ line['code'] ]]</para>
-                        </td>
-                        <td>
-                               <para style="P3">[[ line['ref'] ]] / [[ line['name'] ]]</para>
-                        </td>
-                        <td>
-                               <para style="P4"></para>
-                        </td>
-                        <td>
-                               <para style="P5">[[ formatLang((line['debit'])) ]]</para>
-                        </td>
-                        <td>
-                               <para style="P5">[[ formatLang((line['credit'])) ]]</para>
-                        </td>
-                        <td>
-                               <para style="P5">[[ formatLang((line['progress'])) ]]</para>
-                        </td>
+                            <td><para style="P15"><font face="Helvetica">[[ repeatIn(lines(p,data), 'line') ]]</font>[[ formatLang(line['date'],date=True) ]]</para></td>
+                        <td><para style="P3">[[ line['code'] ]]</para></td>
+                        <td><para style="P3">[[ line['ref'] ]] / [[ line['name'] ]]</para></td>
+                        <td><para style="P4"></para></td>
+                        <td><para style="P5">[[ formatLang((line['debit'])) ]]</para></td>
+                        <td><para style="P5">[[ formatLang((line['credit'])) ]]</para></td>
+                        <td><para style="P5">[[ formatLang((line['progress'])) ]]</para></td>
                     </tr>
                    </blockTable>
-
        </td>
      </tr>
     </blockTable>
-
-
-
-
   </story>
 </document>
\ No newline at end of file
diff --git a/addons/account/report/third_party_ledger_other.rml b/addons/account/report/third_party_ledger_other.rml
new file mode 100644 (file)
index 0000000..36a208d
--- /dev/null
@@ -0,0 +1,177 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+
+      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+       <header>
+                       <pageGraphics>
+                               <!--logo-->
+                               <!--<fill color="darkblue"/>-->
+                               <!--<stroke color="darkblue"/>-->
+
+                               <!--TITLE COMPANY-->
+                               <!-- <drawString x="4.6cm" y="28.7cm">[[ company.partner_id.name ]]</drawString> -->
+
+                               <setFont name="Helvetica-Bold" size="9"/>
+
+
+                               <!--COL 1-->
+                               <drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
+                               <drawRightString x="20cm" y="28.1cm">Third Party Ledger [[ data['form']['result_selection'] == 'customer' and '/ Débiteur' ]] [[ data['form']['result_selection'] == 'supplier' and '/ Créancier' ]] [[ data['form']['result_selection'] == 'all' and '/ Créancier et Débiteur' ]]</drawRightString>
+
+                               <!-- Header -->
+
+
+                               <setFont name="Helvetica" size="9"/>
+                               <drawString x="1.0cm" y="1cm"> [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]</drawString>
+                               <drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
+                               <!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
+
+
+                           <lineMode width="0.7"/>
+                               <lines>1cm 27.7cm 20cm 27.7cm</lines>
+                               <setFont name="Helvetica" size="8"/>
+
+                       </pageGraphics>
+                       </header>
+    </pageTemplate>
+
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <blockBackground colorName="#e6e6e6" start="0,1" stop="0,1"/>
+      <blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/>
+      <blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/>
+    </blockTableStyle>
+
+    <blockTableStyle id="tbl_heading">
+
+      <blockValign value="TOP"/>
+
+       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
+    </blockTableStyle>
+
+       <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="LEFT"/>
+
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+
+
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockLeftPadding length="0" start="1,0" stop="1,0"/>
+      <blockAlignment value="LEFT"/>
+      <blockValign value="LEFT"/>
+
+     <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="LEFT"/>
+         <lineStyle kind="LINEBELOW" colorName="#777777" start="0,0" stop="0,-1"/>
+
+
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="LEFT"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+    </blockTableStyle>
+
+
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="2.0" leading="1" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="14.5" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" fontName="Helvetica" fontSize="7.5" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P4" fontName="Helvetica" fontSize="7.5" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="7.5" leading="10" 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="8.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="8.5" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Balance" fontName="Helvetica-Bold" fontSize="8.5" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P9" fontName="Helvetica-Bold" alignment="CENTER" fontSize="14.5" leftIndent="-5.0"/>
+    <paraStyle name="P9a" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P9c" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P9b" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="total" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P10" fontName="Helvetica" alignment="CENTER"/>
+    <paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="14"/>
+    <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="date" fontName="Helvetica" fontSize="8.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P14" fontName="Helvetica-Bold" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P15" rightIndent="17.0" leftIndent="-0.0" fontName="Helvetica" fontSize="7.5" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P16" fontName="Helvetica" fontSize="8.0" leading="12" alignment="RIGHT" 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="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <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="Index" fontName="Helvetica"/>
+  </stylesheet>
+  <story>
+       <para style="P2"><font color="white"></font></para>
+    <blockTable colWidths="50.0,30.0,42.0,220.0,69.0,72.0,63.0" repeatRows="1" style="tbl_heading">
+        <tr>
+        <td><para style="date">Date</para></td>
+               <td><para style="P12">JNRL</para></td>
+               <td><para style="P12">Ref.</para></td>
+               <td><para style="P12">Entry label</para></td>
+               <td><para style="P16">Debit</para></td>
+               <td><para style="P16">Credit</para></td>
+               <td><para style="P16">Balance</para></td>
+     </tr>
+     <tr>
+       <td>
+        <blockTable colWidths="337.0,69.0,72.0,63.0" style="Table3">
+        <tr>
+               <td><para style="Balance">Balance brought forward</para></td>
+               <td><para style="P8"><u>[[ formatLang((sum_debit(data))) ]]</u></para></td>
+               <td><para style="P8"><u>[[ formatLang((sum_credit(data))) ]]</u></para></td>
+               <td><para style="P8"><u>[[ formatLang((sum_debit(data) - sum_credit(data))) ]]</u></para></td>
+            </tr>
+           </blockTable>
+           </td>
+     </tr>
+     <tr>
+       <td>
+                       <para style="P1">[[ repeatIn(objects, 'p') ]]</para>
+                       <blockTable colWidths="300.0,37.0,69.0,72.0,63.0" style="Table5">
+                    <tr>
+                       <td><para style="total">[[ p.ref ]] - [[ p.name ]]</para></td>
+                       <td><para style="total"></para></td>
+                       <td><para style="P9b"><u>[[ formatLang((sum_debit_partner(p,data))) ]]</u></para></td>
+                       <td><para style="P9b"><u>[[ formatLang((sum_credit_partner(p,data))) ]]</u></para></td>
+                       <td><para style="P9b"><u>[[ formatLang((sum_debit_partner(p,data) - sum_credit_partner(p,data))) ]]</u></para></td>
+                    </tr>
+                   </blockTable>
+                   <blockTable colWidths="45.0,30.0,262.0,0.0,69.0,72.0,63.0" style="Table2">
+                    <tr>
+                            <td><para style="P15"><font face="Helvetica">[[ repeatIn(lines(p,data), 'line') ]]</font>[[ formatLang(line['date'],date=True) ]]</para></td>
+                        <td><para style="P3">[[ line['code'] ]]</para></td>
+                        <td><para style="P3">[[ line['ref'] ]] / [[ line['name'] ]]</para></td>
+                        <td><para style="P4"></para></td>
+                        <td><para style="P5">[[ formatLang((line['debit'])) ]]</para></td>
+                        <td><para style="P5">[[ formatLang((line['credit'])) ]]</para></td>
+                        <td><para style="P5">[[ formatLang((line['progress'])) ]]</para></td>
+                    </tr>
+                   </blockTable>
+       </td>
+     </tr>
+    </blockTable>
+  </story>
+</document>
\ No newline at end of file
index 8d7a468..be83d6d 100755 (executable)
@@ -105,6 +105,12 @@ class wizard_report(wizard.interface):
         data['form']['soldeinit'] = True
         return data['form']
 
+    def _check(self, cr, uid, data, context):
+        if data['form']['page_split']==True:
+            return 'report'
+        else:
+            return 'report_other'
+
     def _check_date(self, cr, uid, data, context):
 
         sql = """
@@ -134,12 +140,21 @@ class wizard_report(wizard.interface):
     states = {
         'init': {
             'actions': [_get_defaults],
-            'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel','gtk-cancel'),('report','Print','gtk-print')]}
+            'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel','gtk-cancel'),('checkreport','Print','gtk-print')]}
+        },
+        'checkreport': {
+            'actions': [],
+            'result': {'type':'choice','next_state':_check}
         },
         'report': {
             'actions': [_check_state],
             'result': {'type':'print', 'report':'account.third_party_ledger', 'state':'end'}
+        },
+        'report_other': {
+            'actions': [_check_state],
+            'result': {'type':'print', 'report':'account.third_party_ledger_other', 'state':'end'}
         }
+
     }
 wizard_report('account.third_party_ledger.report')