openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #00555
[Merge] lp:~openerp-dev/openobject-addons/report_dev into lp:openobject-addons
Jni (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/report_dev into lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
Merge APA's task into trunk.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/report_dev/+merge/41289
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/report_dev.
=== modified file 'account/account_report.xml'
--- account/account_report.xml 2010-10-15 08:05:33 +0000
+++ account/account_report.xml 2010-11-19 12:21:01 +0000
@@ -3,12 +3,12 @@
<data>
<report auto="False" id="account_general_ledger" menu="False" model="account.account" name="account.general.ledger" rml="account/report/account_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/account_partner_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/account_partner_ledger_other.rml" string="Partner Other Ledger"/>
+ <report auto="False" id="account_3rdparty_ledger_other" menu="False" model="res.partner" name="account.third_party_ledger_other" rml="account/report/account_partner_ledger_other.rml" string="Partner Ledger"/>
<report auto="False" id="account_account_balance" menu="False" model="account.account" name="account.account.balance" rml="account/report/account_balance.rml" string="Trial Balance"/>
<report auto="False" id="account_3rdparty_account_balance" menu="False" model="account.account" name="account.partner.balance" rml="account/report/account_partner_balance.rml" string="Partner Balance"/>
- <report auto="False" id="account_central_journal" model="account.journal.period" name="account.central.journal" rml="account/report/account_central_journal.rml" string="Central Journals" header="False"/>
- <report auto="False" id="account_general_journal" model="account.journal.period" name="account.general.journal" rml="account/report/account_general_journal.rml" string="General Journals" header="False"/>
- <report auto="False" id="account_journal" model="account.journal.period" name="account.journal.period.print" rml="account/report/account_journal.rml" string="Journals" header="False"/>
+ <report auto="False" id="account_central_journal" model="account.journal.period" name="account.central.journal" rml="account/report/account_central_journal.rml" string="Central Journal" header="False"/>
+ <report auto="False" id="account_general_journal" model="account.journal.period" name="account.general.journal" rml="account/report/account_general_journal.rml" string="General Journal" header="False"/>
+ <report auto="False" id="account_journal" model="account.journal.period" name="account.journal.period.print" rml="account/report/account_journal.rml" string="Journal" header="False"/>
<report auto="False" id="account_overdue" model="res.partner" name="account.overdue" rml="account/report/account_print_overdue.rml" string="Overdue Payments"/>
<report
auto="False"
=== modified file 'account/board_account_view.xml'
--- account/board_account_view.xml 2010-11-12 13:21:27 +0000
+++ account/board_account_view.xml 2010-11-19 12:21:01 +0000
@@ -49,7 +49,7 @@
</child1>
<child2>
<action colspan="4" height="220" name="%(action_treasory_graph)d" string="Treasury"/>
- <action colspan="4" height="220" name="%(action_aged_receivable)d" string="Aged receivables"/>
+ <action colspan="4" height="220" name="%(action_aged_receivable)d" string="Aged Receivables"/>
<!-- <action colspan="4" height="220" name="%(action_aged_income)d" string="Aged income"/> -->
</child2>
</hpaned>
=== modified file 'account/report/account_aged_partner_balance.rml'
--- account/report/account_aged_partner_balance.rml 2010-11-10 07:04:30 +0000
+++ account/report/account_aged_partner_balance.rml 2010-11-19 12:21:01 +0000
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<document filename="Aged Trial Balance.pdf">
- <template pageSize="(1120.0,770.0)" title="Aged Trial Balance" author="OpenERP S.A.(sales@xxxxxxxxxxx)" allowSplitting="20">
+ <template pageSize="(842.0,595.0)" title="Aged Trial Balance" author="OpenERP S.A.(sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
- <frame id="first" x1="20.0" y1="35.0" width="1080" height="650"/>
+ <frame id="first" x1="28.0" y1="57.0" width="772" height="481"/>
</pageTemplate>
</template>
<stylesheet>
@@ -100,9 +100,7 @@
</stylesheet>
<story>
- <para style="P9">
- <font color="white"> </font>
- </para>
+
<blockTable colWidths="180.0,180.0,180.0" style="Table_header_Content">
<tr>
<td><para style="terp_header"><font color="white"> </font></para>
@@ -111,7 +109,7 @@
<td><para style="terp_header"><font color="white"> </font></para></td>
</tr>
</blockTable>
- <blockTable colWidths="200.0,200.0,100.0,100.0,119.0,100.0,200.0" style="Table8">
+ <blockTable colWidths="110.0,110.0,110.0,110.0,128.0,93.0,110.0" style="Table8">
<tr>
<td>
<para style="terp_tblheader_General_Centre">Chart of Account</para>
@@ -162,7 +160,7 @@
<para style="P9">
<font color="white"> </font>
</para>
- <blockTable colWidths="300.0,100.0,100.0,100.0,100.0,105.0,105.0,125.0" style="Table2" repeatRows="1">
+ <blockTable colWidths="135.0,90.0,90.0,90.0,90.0,90.0,90.0,90.0" style="Table2" repeatRows="1">
<tr>
<td>
<para style="terp_tblheader_Details">Partners</para>
=== modified file 'account/report/account_balance_sheet_horizontal.rml'
--- account/report/account_balance_sheet_horizontal.rml 2010-11-10 07:04:30 +0000
+++ account/report/account_balance_sheet_horizontal.rml 2010-11-19 12:21:01 +0000
@@ -1,9 +1,8 @@
<?xml version="1.0"?>
<document filename="Balance Sheet.pdf">
- <template pageSize="(1120.0,770.0)" title="Balance Sheet" author="OpenERP S.A.(sales@xxxxxxxxxxx)" allowSplitting="20" >
+ <template pageSize="(842.0,595.0)" title="Balance Sheet" author="OpenERP S.A.(sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
- <frame id="first" x1="22.0" y1="15.0" width="1080" height="680"/>
-
+ <frame id="first" x1="28.0" y1="57.0" width="772" height="481"/>
</pageTemplate>
</template>
<stylesheet>
@@ -114,7 +113,7 @@
<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="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+ <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="10" alignment="CENTER" spaceBefore="6.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"/>
@@ -125,34 +124,13 @@
</stylesheet>
<images/>
<story>
- <para style="Standard">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="539.0" style="Table_Heading">
- <tr>
- <td>
- <para style="Standard">
- <font color="white"> </font>
- </para>
- </td>
- </tr>
- </blockTable>
- <blockTable colWidths="539.0" style="Table_Company_Name">
- <tr>
- <td>
- <para style="terp_header_Centre">Balance Sheet</para>
- </td>
- </tr>
- </blockTable>
- <para style="Standard">
- <font color="white"> </font>
- </para>
- <para style="Standard">
+ <para style="terp_header_Centre">Balance Sheet</para>
+ <para style="terp_default_8">
<font color="white"> </font>
</para>
<para style="terp_default_8">[[ get_data(data) or removeParentNode('para') ]]</para>
- <blockTable colWidths="210.0,210.0,200.0,200.0,200.0" style="Table2_header" >
+ <blockTable colWidths="250.0,100.0,150.0,120.0,150.0" style="Table2_header" >
<tr>
<td><para style="terp_tblheader_General_Centre">Chart of Account </para></td>
<td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
@@ -164,7 +142,7 @@
<td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
<td><para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para></td>
<td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
- <blockTable colWidths="85.0,85.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+ <blockTable colWidths="70.0,70.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
<td><para style="terp_tblheader_Details_Centre">End Date</para></td>
@@ -174,7 +152,7 @@
<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
</tr>
</blockTable>
- <blockTable colWidths="85.0,85.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+ <blockTable colWidths="70.0,70.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
<td><para style="terp_tblheader_Details_Centre">End Period</para></td>
@@ -195,7 +173,7 @@
<para style="Standard">
<font color="white"> </font>
</para>
- <blockTable colWidths="100.0,308.16,116.32,100.0,308.16,116.32" style="Table_Account_Line_Title" repeatRows="1">
+ <blockTable colWidths="80.0,210.16,100.32,80.0,210.16,100.32" style="Table_Account_Line_Title" repeatRows="1">
<tr>
<td>
<para style="terp_default_Bold_9">Code</para>
@@ -237,7 +215,7 @@
</td>
</tr>
</blockTable>
- <blockTable colWidths="408.16,116.32,408.16,116.32" style="Table_Net_Profit_Loss">
+ <blockTable colWidths="290.16,100.32,290.16,100.32" style="Table_Net_Profit_Loss">
<tr>
<td>
<para style="terp_default_Bold_9">Balance:</para>
@@ -253,9 +231,6 @@
</td>
</tr>
</blockTable>
- <para style="terp_default_Right_9">
- <font color="white"> </font>
- </para>
</story>
</document>
=== modified file 'account/report/account_general_journal.rml'
--- account/report/account_general_journal.rml 2010-11-10 07:04:30 +0000
+++ account/report/account_general_journal.rml 2010-11-19 12:21:01 +0000
@@ -159,6 +159,7 @@
<blockTableStyle id="Table_Journal_Detail">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
@@ -199,9 +200,7 @@
<images/>
<story>
<para style="terp_default_8">[[ repeatIn( periods(objects), 'o') ]]</para>
- <para style="P9">
- <font color="white"> </font>
- </para>
+
<blockTable colWidths="180.0,180.0,179.0" style="Table_Header_Title">
<tr>
<td>
=== modified file 'account/report/account_general_ledger.rml'
--- account/report/account_general_ledger.rml 2010-11-10 07:04:30 +0000
+++ account/report/account_general_ledger.rml 2010-11-19 12:21:01 +0000
@@ -3,9 +3,6 @@
<template pageSize="(595.0,842.0)" title="General Ledger" author="OpenERP S.A.(sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
- <pageGraphics>
-
- </pageGraphics>
</pageTemplate>
</template>
<stylesheet>
@@ -93,7 +90,6 @@
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="8,0" stop="8,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
</blockTableStyle>
-
<blockTableStyle id="Table5">
<blockAlignment value="LEFT"/>
<lineStyle kind="LINEBELOW" colorName="#777777" start="0,0" stop="0,0"/>
@@ -135,7 +131,6 @@
<blockAlignment value="LEFT"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
</blockTableStyle>
-
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
@@ -179,24 +174,24 @@
<story>
<pto>
<pto_header>
- <blockTable colWidths="66.0,44.0,80.0,60.0,92.5,66.5,64.5,71.5" style="tbl_header">[[data['form']['amount_currency'] == False or removeParentNode('blockTable')]]
+ <blockTable colWidths="45.0,60.0,60.0,60.0,65.0,85.0,85.0,85.0" style="tbl_header" repeatRows="1">[[data['form']['amount_currency'] == False or removeParentNode('blockTable')]]
<tr>
<td><para style="date">Date</para></td>
<td><para style="P3b">Partner</para></td>
- <td><para style="P3b">Ref</para></td>
- <td><para style="P3b">Move</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="P3b">Entry Label</para></td>
<td><para style="P9b">Debit</para></td>
<td><para style="P9b">Credit</para></td>
<td><para style="P9b">Balance</para></td>
</tr>
</blockTable>
- <blockTable colWidths="70.0,40.0,60.0,55.0,89.0,58.0,58.0,58.0,58.0" style="tbl_header">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
+ <blockTable colWidths="45.0,45.0,55.0,60.0,60.0,62.5,62.5,77.5,77.5" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
<tr>
<td><para style="date">Date</para></td>
<td><para style="P3b">Partner</para></td>
- <td><para style="P3b">Ref</para></td>
- <td><para style="P3b">Move</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="P3b">Entry Label</para></td>
<td><para style="P9b">Debit</para></td>
<td><para style="P9b">Credit</para></td>
@@ -265,12 +260,12 @@
<font color="white"> </font>
</para>
- <blockTable colWidths="66.0,44.0,80.0,60.0,92.5,66.5,64.5,71.5" style="tbl_header" repeatRows="1">[[data['form']['amount_currency'] == False or removeParentNode('blockTable')]]
+ <blockTable colWidths="45.0,60.0,60.0,60.0,65.0,85.0,85.0,85.0" style="tbl_header" repeatRows="1">[[data['form']['amount_currency'] == False or removeParentNode('blockTable')]]
<tr>
<td><para style="date">Date</para></td>
<td><para style="P3b">Partner</para></td>
- <td><para style="P3b">Ref</para></td>
- <td><para style="P3b">Move</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="P3b">Entry Label</para></td>
<td><para style="P9b">Debit</para></td>
<td><para style="P9b">Credit</para></td>
@@ -279,10 +274,10 @@
</blockTable>
<section>
<para>[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
- <blockTable colWidths="66.0,44.0,80.0,60.0,92.5,66.5,64.5,71.5" style="tbl_content">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+ <blockTable colWidths="45.0,60.0,60.0,60.0,65.0,85.0,84.0,86.0" style="tbl_content">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
<tr>
<td>
- <blockTable colWidths="245.0,92.5,65.5,67.5,68.5" style="Table5">
+ <blockTable colWidths="245.0,40.0,84.0,86.0,84.0" style="Table5">
<tr>
<td><para style="Standard"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code or '']] [[ o.name or '']]</para></td>
<td><para style="Standard"></para></td>
@@ -313,14 +308,12 @@
</blockTable>
</section>
-
-
- <blockTable colWidths="70.0,40.0,60.0,55.0,89.0,58.0,58.0,58.0,58.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
+ <blockTable colWidths="45.0,45.0,55.0,60.0,60.0,62.5,62.5,77.5,77.5" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
<tr>
<td><para style="date">Date</para></td>
<td><para style="P3b">Partner</para></td>
- <td><para style="P3b">Ref</para></td>
- <td><para style="P3b">Move</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="P3b">Entry Label</para></td>
<td><para style="P9b">Debit</para></td>
<td><para style="P9b">Credit</para></td>
@@ -330,10 +323,10 @@
</blockTable>
<section>
<para>[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
- <blockTable colWidths="70.0,40.0,60.0,55.0,89.0,58.0,58.0,58.0,58.0" style="tbl_content">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
+ <blockTable colWidths="45.0,45.0,55.0,60.0,60.0,62.5,62.5,77.5,77.5" style="tbl_content">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
<tr>
<td>
- <blockTable colWidths="230.00,80.0,56.5,57.5,57.5,65.5" style="Table5">
+ <blockTable colWidths="230.0,30.0,62.5,62.5,77.5,77.5" style="Table5">
<tr>
<td><para style="Standard"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code or '' ]] [[ o.name or '' ]]</para></td>
<td><para style="Standard"></para></td>
=== modified file 'account/report/account_general_ledger_landscape.rml'
--- account/report/account_general_ledger_landscape.rml 2010-11-10 07:04:30 +0000
+++ account/report/account_general_ledger_landscape.rml 2010-11-19 12:21:01 +0000
@@ -1,399 +1,632 @@
<?xml version="1.0"?>
<document filename="General Ledger.pdf">
- <template pageSize="(1120.5,767.8)" title="General Ledger" author="OpenERP S.A.(sales@xxxxxxxxxxx)" allowSplitting="20" >
+ <template pageSize="(842.0,595.0)" title="General Ledger" author="OpenERP S.A.(sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
- <frame id="first" x1="22.0" y1="31.0" width="1080" height="680"/>
+ <frame id="first" x1="28.0" y1="57.0" width="772" height="481"/>
</pageTemplate>
</template>
- <stylesheet>
- <blockTableStyle id="tbl_header">
- <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
- <blockValign value="TOP"/>
- </blockTableStyle>
- <blockTableStyle id="Table_Subheader_Content_detail">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#cccccc" start="2,0" stop="2,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="6,0" stop="6,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#cccccc" start="6,0" stop="6,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="6,0" stop="6,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="8,0" stop="8,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#cccccc" start="8,0" stop="8,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="8,0" stop="8,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
- </blockTableStyle>
- <blockTableStyle id="Table_Company_Name">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- </blockTableStyle>
- <blockTableStyle id="Table_Sub_Header_Content">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#cccccc" start="2,0" stop="2,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="6,0" stop="6,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#cccccc" start="6,0" stop="6,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="6,0" stop="6,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="8,0" stop="8,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#cccccc" start="8,0" stop="8,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="8,0" stop="8,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
- </blockTableStyle>
- <blockTableStyle id="tbl_content">
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
- <blockValign value="TOP"/>
+ <stylesheet>
+ <blockTableStyle id="Standard_Outline">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table1">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="5,0" stop="5,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="5,0" stop="5,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="6,0" stop="6,-1"/>
+ <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="6,0" stop="6,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="6,0" stop="6,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table2">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="5,0" stop="5,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="5,0" stop="5,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="6,0" stop="6,-1"/>
+ <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="6,0" stop="6,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="6,0" stop="6,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="7,0" stop="7,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="7,0" stop="7,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="8,0" stop="8,-1"/>
+ <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="8,0" stop="8,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="8,0" stop="8,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="9,0" stop="9,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="9,0" stop="9,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="9,-1" stop="9,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="10,0" stop="10,-1"/>
+ <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="10,0" stop="10,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="10,0" stop="10,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="10,-1" stop="10,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="11,0" stop="11,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="11,0" stop="11,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="11,-1" stop="11,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="12,0" stop="12,-1"/>
+ <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="12,0" stop="12,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="12,0" stop="12,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="12,-1" stop="12,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="13,0" stop="13,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="13,0" stop="13,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="13,-1" stop="13,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="14,0" stop="14,-1"/>
+ <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="14,0" stop="14,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="14,0" stop="14,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="14,-1" stop="14,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,1" stop="0,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,1" stop="0,1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
+ <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,1" stop="1,1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,2" stop="0,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,2" stop="0,2"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,2" stop="1,-1"/>
+ <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,2" stop="1,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,2" stop="1,2"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,3" stop="0,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,3" stop="0,3"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,3" stop="1,-1"/>
+ <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,3" stop="1,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,3" stop="1,3"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,4" stop="0,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,4" stop="0,4"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,4" stop="1,-1"/>
+ <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,4" stop="1,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,4" stop="1,4"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table3">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+ <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table4">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+ <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
</blockTableStyle>
<blockTableStyle id="Table5">
<blockAlignment value="LEFT"/>
- <lineStyle kind="LINEBELOW" colorName="#777777" start="0,0" stop="0,0"/>
- <blockValign value="TOP"/>
- </blockTableStyle>
- <blockTableStyle id="Table2">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,0"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#cccccc" start="2,0" stop="2,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="6,0" stop="6,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#cccccc" start="6,0" stop="6,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="6,0" stop="6,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
- </blockTableStyle>
- <blockTableStyle id="Table3">
- <blockAlignment value="LEFT"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
- </blockTableStyle>
- <blockTableStyle id="Table_Company_Name">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+ <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table6">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+ <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table7">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <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="6,-1" stop="6,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="9,-1" stop="9,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="10,-1" stop="10,-1"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table8">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table9">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="9,-1" stop="9,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="10,-1" stop="10,-1"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table10">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <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="6,-1" stop="6,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="9,-1" stop="9,-1"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table11">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table12">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="9,-1" stop="9,-1"/>
</blockTableStyle>
<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,180.0,73.0,73.0,73.0,85.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,245.0,148.0,80.0,80.0,80.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">
- <tr>
- <td>
- <para style="terp_header_Centre">General Ledger </para>
- </td>
- </tr>
- </blockTable>
- <para>[[ repeatIn(objects, 'a') ]]</para>
-
- <para style="terp_default_8">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="200.0,130.0,200.0,150.0,150.0,100.0,110.0" style="Table2">
- <tr>
- <td><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>
- <tr>
- <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
- <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para></td>
- <td> <para style="terp_default_Centre_8">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]] </para></td>
- <td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
-
- <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
- <blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
- <tr>
- <td><para style="terp_tblheader_General_Centre">Start Date</para></td>
- <td><para style="terp_tblheader_General_Centre">End Date</para></td>
- </tr>
- <tr>
- <td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
- <td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
- </tr>
- </blockTable>
- <blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
- <tr>
- <td><para style="terp_tblheader_General_Centre">Start Period</para></td>
- <td><para style="terp_tblheader_General_Centre">End Period</para></td>
- </tr>
- <tr>
- <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
- <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
- </tr>
- </blockTable>
- </td>
- <td><para style="terp_default_Centre_8">[[ get_sortby(data) ]]</para></td>
- <td><para style="terp_default_Centre_8">[[ get_target_move(data) ]] </para></td>
- </tr>
- </blockTable>
- <para style="terp_default_8">
- <font color="white"> </font>
- </para>
- <para style="terp_default_8">
- <font color="white"> </font>
- </para>
-
- <blockTable colWidths="66.0,35.0,120.0,90.0,60.0,200.0,180.0,73.0,73.0,73.0,85.00" style="tbl_header" repeatRows="1">[[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>
- <section>
-
- <para>[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
-
- <blockTable colWidths="66.0,35.0,120.0,90.0,60.0,200.0,180.0,73.0,73.0,73.0,85.00" style="tbl_content">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
- <tr>
- <td>
- <blockTable colWidths="404.0,335.0,79,73.5,72.5,79.00" style="Table5">
- <tr>
- <td><para style="Standard"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para></td>
- <td><para style="Standard"></para></td>
- <td alignment="right"><para style="P9b"><u>[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</u></para></td>
- <td alignment="right"><para style="P9b"><u>[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</u></para></td>
- <td><para style="P9b"><u>[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</u></para></td>
- <td><para style="P9b"><u>[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.code or '' ]]</u></para></td>
- </tr>
- </blockTable>
- </td>
- <td><para style="Standard"></para></td>
- <td><para style="Standard"></para></td>
- <td><para style="Standard"></para></td>
- <td><para style="Standard"></para></td>
- <td><para style="Standard"></para></td>
- <td><para style="Standard"></para></td>
- <td><para style="Standard"></para></td>
- <td><para style="Standard"></para></td>
- <td><para style="Standard"></para></td>
- <td><para style="Standard"></para></td>
- </tr>
- <tr><para style="P2_content">[[ repeatIn(lines(o), 'line') ]]</para>
- <td><para style="P2_content"> [[ formatLang(line['ldate'],date=True) ]]</para></td>
- <td><para style="P2_content">[[ line['lcode'] ]]</para></td>
- <td><para style="P2_content">[[ line['partner_name'] ]]</para></td>
- <td><para style="P2_content">[[ line['lref'] ]]</para></td>
- <td><para style="P2_content">[[ line['move'] ]]</para></td>
- <td><para style="P3_content">[[ line['lname'] ]]</para></td>
- <td><para style="P3_content_center">[[ strip_name(line['line_corresp'].replace(', ',','),40) ]]</para></td>
- <td><para style="P4_content">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para></td>
- <td><para style="P4_content">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para></td>
- <td><para style="P4_content">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para></td>
- <td><para style="P4_content"><font>[[ (line.has_key('currency_id') and line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']]</font></para></td>
- </tr>
- </blockTable>
-
- </section>
-
- <blockTable colWidths="66.0,35.0,166.0,90.0,60.0,245.0,148.0,80.0,80.0,80.0" style="tbl_header" repeatRows="1">[[ 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>
-
- <section>
-
- <para>[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
-
- <blockTable colWidths="66.0,35.0,166.0,90.0,60.0,245.0,148.0,80.0,80.0,80.0" style="tbl_content">[[data['form']['amount_currency'] == False or removeParentNode('blockTable')]]
- <tr>
- <td>
- <blockTable colWidths="405.0,399.0,80.0,80.0,80.0" style="Table5">
- <tr>
- <td><para style="Standard"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para></td>
- <td><para style="Standard"></para></td>
- <td alignment="right"><para style="P9b"><u>[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</u></para></td>
- <td alignment="right"><para style="P9b"><u>[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</u></para></td>
- <td><para style="P9b"><u>[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</u></para></td>
- </tr>
- </blockTable>
- </td>
- <td><para style="Standard"></para></td>
- <td><para style="Standard"></para></td>
- <td><para style="Standard"></para></td>
- <td><para style="Standard"></para></td>
- <td><para style="Standard"></para></td>
- <td><para style="Standard"></para></td>
- <td><para style="Standard"></para></td>
- <td><para style="Standard"></para></td>
- <td><para style="Standard"></para></td>
- </tr>
- <tr>
- <td><para style="P2_content">[[ repeatIn(lines(o), 'line') ]]<font>[[ line['ldate'] and formatLang(line['ldate'],date=True) or removeParentNode('tr') ]]</font></para></td>
- <para>[[ line or removeParentNode('tr')</para>
- <td><para style="P2_content">[[ line['lcode'] ]]</para></td>
- <td><para style="P2_content">[[ line['partner'] ]]</para></td>
- <td><para style="P2_content">[[ line['lref'] ]]</para></td>
- <td><para style="P2_content">[[ line['move'] ]]</para></td>
- <td><para style="P3_content">[[ line['lname'] ]]</para></td>
- <td><para style="P3_content_center">[[ strip_name(line['line_corresp'],15) ]]</para></td>
- <td><para style="P4_content">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]] </para></td>
- <td><para style="P4_content">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para></td>
- <td><para style="P4_content">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para></td>
- </tr>
- </blockTable>
-
- </section>
- <para style="terp_default_8">
- <font color="white"> </font>
- </para>
+ <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_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>
+ <blockTable colWidths="110.0,110.0,110.0,110.0,128.0,93.0,110.0" style="Table2">
+ <tr>
+ <td>
+ <para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_8">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]]</para>
+ <blockTable colWidths="58.0,58.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+ <tr>
+ <td>
+ <para style="terp_tblheader_General_Centre">Start Date</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Centre">End Date</para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="58.0,58.0" style="Table4">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+ <tr>
+ <td>
+ <para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="58.0,58.0" style="Table5">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+ <tr>
+ <td>
+ <para style="terp_tblheader_General_Centre">Start Period</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Centre">End Period</para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="58.0,58.0" style="Table6">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+ <tr>
+ <td>
+ <para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ </td>
+ <td>
+ <para style="terp_default_Centre_8">[[ get_sortby(data) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ <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>
+ <section>
+ <para style="terp_default_8">[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
+ <blockTable rowHeights="0.55cm" colWidths="461.0,71.0,71.0,88.0,80.0" style="Table8">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+ <tr>
+ <td>
+ <para style="terp_default_Bold_9"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_9_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.code or '' ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <section>
+ <para style="terp_default_8">[[ repeatIn(lines(o), 'line') ]]</para>
+ <blockTable rowHeights="0.55cm" colWidths="45.0,55.0,72.0,64.0,64.0,77.0,85.0,71.0,71.0,88.0,80.0" style="Table9">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+ <tr>
+ <td>
+ <para style="terp_default_8">[[ formatLang(line['ldate'],date=True) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ line['lcode'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ line['partner_name'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ line['lref'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_8">[[ line['move'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ line['lname'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_8">[[ strip_name(line['line_corresp'].replace(', ',','),25) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font size="8.0">[[ (line.has_key('currency_id') and line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']]</font></para>
+ </td>
+ </tr>
+ </blockTable>
+ </section>
+ </section>
+ <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>
+ <section>
+ <para style="Standard">[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
+ <blockTable colWidths="540.0,71.0,71.0,90.0" style="Table11">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+ <tr>
+ <td>
+ <para style="terp_default_Bold_9"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <section>
+ <para style="Standard">[[ repeatIn(lines(o), 'line') ]]</para>
+ <blockTable colWidths="45.0,54.0,85.0,70.0,70.0,130.0,85.0,71.0,71.0,90.0" style="Table12">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+ <tr>
+ <td>
+ <para style="terp_default_8">[[ formatLang(line['ldate'],date=True) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ line['lcode'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ line['partner_name'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ line['lref'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_8">[[ line['move'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ line['lname'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_8">[[ strip_name(line['line_corresp'].replace(', ',','),25) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ </section>
+ </section>
</pto>
- </story>
-</document>
+ </story>
+</document>
\ No newline at end of file
=== added file 'account/report/account_general_ledger_landscape.sxw'
Binary files account/report/account_general_ledger_landscape.sxw 1970-01-01 00:00:00 +0000 and account/report/account_general_ledger_landscape.sxw 2010-11-19 12:21:01 +0000 differ
=== modified file 'account/report/account_journal.rml'
--- account/report/account_journal.rml 2010-11-10 07:04:30 +0000
+++ account/report/account_journal.rml 2010-11-19 12:21:01 +0000
@@ -183,9 +183,7 @@
<images/>
<story>
<para style="Table Contents">[[ repeatIn(objects, 'o') ]]</para>
- <para style="P9">
- <font color="white"> </font>
- </para>
+
<blockTable colWidths="539.0" style="Table_Company_Name">
<tr>
<td>
@@ -193,11 +191,7 @@
</td>
</tr>
</blockTable>
- <para style="P9">
- <font color="white"> </font>
- </para>
-
- <para style="P9">
+ <para style="P9">
<font color="white"> </font>
</para>
<blockTable colWidths="85.0,80.0,80.0,120.0,70.0,100.0" style="Table2">
@@ -246,13 +240,13 @@
<para style="P9">
<font color="white"> </font>
</para>
- <blockTable colWidths="40.0,65.0,50.0,62.0,152.0,60.0,60.0,60.0" style="Table1" repeatRows="1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+ <blockTable colWidths="45.0,65.0,50.0,50.0,100.0,80.0,80.0,80.0" style="Table1" repeatRows="1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td><para style="P10a">Date</para></td>
<td><para style="P10">Entry No</para></td>
<td><para style="P10">A/c No.</para></td>
<td><para style="P10a">Partner</para></td>
- <td><para style="P10a">Move/Entry label</para></td>
+ <td><para style="P10a">Move/Entry Label</para></td>
<td><para style="P10b">Debit</para></td>
<td><para style="P10b">Credit</para></td>
<td><para style="P10b">Balance</para></td>
@@ -280,14 +274,13 @@
</tr>
</blockTable>
-
- <blockTable colWidths="50.0,65.0,50.0,60.0,69.0,60.0,60.0,60.0,50.0" style="Table1" repeatRows="1">[[ display_currency(data) or removeParentNode('blockTable') ]]
+ <blockTable colWidths="45.0,55.0,50.0,50.0,65.0,62.5,62.5,80.0,80.0" style="Table1" repeatRows="1">[[ display_currency(data) or removeParentNode('blockTable') ]]
<tr>
<td><para style="P10a">Date</para></td>
<td><para style="P10">Entry No</para></td>
<td><para style="P10">A/c No.</para></td>
<td><para style="P10a">Partner</para></td>
- <td><para style="P10a">Move/Entry label</para></td>
+ <td><para style="P10a">Move/Entry Label</para></td>
<td><para style="P10b">Debit</para></td>
<td><para style="P10b">Credit</para></td>
<td><para style="P10b">Balance</para></td>
@@ -314,7 +307,6 @@
<td><para style="P8">[[ formatLang(line.credit) ]]</para></td>
<td><para style="P8">[[ formatLang(line.credit - line.debit) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="P8">[[ line.currency_id and formatLang(line.amount_currency) or '' ]] [[ line.currency_id.symbol or '']]</para></td>
-
</tr>
</blockTable>
</story>
=== modified file 'account/report/account_partner_ledger.rml'
--- account/report/account_partner_ledger.rml 2010-11-10 07:04:30 +0000
+++ account/report/account_partner_ledger.rml 2010-11-19 12:21:01 +0000
@@ -177,7 +177,7 @@
<story>
<pto>
<pto_header>
- <blockTable colWidths="55.0,28.0,60.0,81.0,125.0,57.0,58.0,80.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+ <blockTable colWidths="50.0,50.0,70.0,50.0,109.0,70.0,70.0,80.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="terp_tblheader_Details">Date</para>
@@ -186,7 +186,7 @@
<para style="terp_tblheader_Details">JNRL</para>
</td>
<td>
- <para style="terp_tblheader_Details">Ref.</para>
+ <para style="terp_tblheader_Details_Centre">Ref.</para>
</td>
<td>
<para style="terp_tblheader_Details">Account</para>
@@ -205,7 +205,7 @@
</td>
</tr>
</blockTable>
- <blockTable colWidths="50.0,25.0,60.0,81.0,97.0,56.0,58.0,63.0,53.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+ <blockTable colWidths="50.0,40.0,60.0,50.0,60.0,65.0,65.0,80.0,80.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="terp_tblheader_Details">Date</para>
@@ -214,10 +214,10 @@
<para style="terp_tblheader_Details">JNRL</para>
</td>
<td>
- <para style="terp_tblheader_Details">Ref.</para>
+ <para style="terp_tblheader_Details_Centre">Ref.</para>
</td>
<td>
- <para style="terp_tblheader_Details">Account</para>
+ <para style="terp_tblheader_Details_Centre">Account</para>
</td>
<td>
<para style="terp_tblheader_Details">Entry Label</para>
@@ -339,7 +339,7 @@
<para style="P4">
<font color="white"> </font>
</para>
- <blockTable colWidths="55.0,28.0,60.0,81.0,125.0,57.0,58.0,80.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+ <blockTable colWidths="50.0,50.0,70.0,50.0,109.0,70.0,70.0,80.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="terp_tblheader_Details">Date</para>
@@ -348,7 +348,7 @@
<para style="terp_tblheader_Details">JNRL</para>
</td>
<td>
- <para style="terp_tblheader_Details">Ref.</para>
+ <para style="terp_tblheader_Details_Centre">Ref.</para>
</td>
<td>
<para style="terp_tblheader_Details">Account</para>
@@ -373,7 +373,7 @@
<para style="terp_default_2">
<font color="white"> </font>
</para>
- <blockTable colWidths="344.0,60.0,60.0,80.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+ <blockTable colWidths="329.0,70.0,70.0,80.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td>
@@ -409,7 +409,7 @@
</para>
<section>
<para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
- <blockTable colWidths="55.0,28.0,60.0,80.0,121.0,60.0,60.0,80.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+ <blockTable colWidths="50.0,50.0,70.0,50.0,109.0,70.0,70.0,80.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="P3">[[ formatLang(line['date'],date=True) ]]</para>
@@ -441,7 +441,7 @@
<font color="white"> </font>
</para>
</section>
- <blockTable colWidths="50.0,25.0,60.0,81.0,97.0,56.0,58.0,63.0,53.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+ <blockTable colWidths="50.0,40.0,60.0,50.0,60.0,65.0,65.0,80.0,80.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="terp_tblheader_Details">Date</para>
@@ -450,10 +450,10 @@
<para style="terp_tblheader_Details">JNRL</para>
</td>
<td>
- <para style="terp_tblheader_Details">Ref.</para>
+ <para style="terp_tblheader_Details_Centre">Ref.</para>
</td>
<td>
- <para style="terp_tblheader_Details">Account</para>
+ <para style="terp_tblheader_Details_Centre">Account</para>
</td>
<td>
<para style="terp_tblheader_Details">Entry Label</para>
@@ -478,7 +478,7 @@
<para style="terp_default_2">
<font color="white"> </font>
</para>
- <blockTable colWidths="308.0,56.0,58.0,63.0,53.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+ <blockTable colWidths="260.0,65.0,65.0,80.0,80.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<tr>
<td>
@@ -522,7 +522,7 @@
</para>
<section>
<para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
- <blockTable colWidths="50.0,25.0,60.0,81.0,97.0,56.0,58.0,63.0,53.0" style="Table7">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+ <blockTable colWidths="50.0,40.0,60.0,50.0,60.0,65.0,65.0,80.0,80.0" style="Table7">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="P3">[[ formatLang(line['date'],date=True) ]]</para>
@@ -534,7 +534,7 @@
<para style="P3">[[ line['move_name'] ]]</para>
</td>
<td>
- <para style="P3">[[ line['a_code'] ]]</para>
+ <para style="terp_default_Centre_9">[[ line['a_code'] ]]</para>
</td>
<td>
<para style="P3">[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
=== modified file 'account/report/account_partner_ledger_other.rml'
--- account/report/account_partner_ledger_other.rml 2010-11-10 07:04:30 +0000
+++ account/report/account_partner_ledger_other.rml 2010-11-19 12:21:01 +0000
@@ -309,7 +309,7 @@
<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" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="13" alignment="CENTER" spaceBefore="0.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"/>
@@ -333,7 +333,7 @@
<story>
<pto>
<pto_header>
- <blockTable colWidths="50.0,28.0,65.0,61.0,145.0,60.0,60.0,80.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+ <blockTable colWidths="50.0,50.0,70.0,50.0,109.0,70.0,70.0,80.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="terp_tblheader_Details">Date</para>
@@ -342,7 +342,7 @@
<para style="terp_tblheader_Details">JNRL</para>
</td>
<td>
- <para style="terp_tblheader_Details">Ref.</para>
+ <para style="terp_tblheader_Details_Centre">Ref.</para>
</td>
<td>
<para style="terp_tblheader_Details">Account</para>
@@ -361,7 +361,7 @@
</td>
</tr>
</blockTable>
- <blockTable colWidths="50.0,28.0,65.0,65.0,112.0,53.0,53.0,60.0,53.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+<blockTable colWidths="50.0,40.0,60.0,50.0,60.0,65.0,65.0,80.0,80.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="terp_tblheader_Details">Date</para>
@@ -370,10 +370,10 @@
<para style="terp_tblheader_Details">JNRL</para>
</td>
<td>
- <para style="terp_tblheader_Details">Ref.</para>
+ <para style="terp_tblheader_Details_Centre">Ref.</para>
</td>
<td>
- <para style="terp_tblheader_Details">Account</para>
+ <para style="terp_tblheader_Details_Centre">Account</para>
</td>
<td>
<para style="terp_tblheader_Details">Entry Label</para>
@@ -494,7 +494,7 @@
<para style="P5">
<font color="white"> </font>
</para>
- <blockTable colWidths="50.0,28.0,65.0,61.0,145.0,60.0,60.0,80.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+ <blockTable colWidths="50.0,50.0,70.0,50.0,109.0,70.0,70.0,80.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="terp_tblheader_Details">Date</para>
@@ -503,7 +503,7 @@
<para style="terp_tblheader_Details">JNRL</para>
</td>
<td>
- <para style="terp_tblheader_Details">Ref.</para>
+ <para style="terp_tblheader_Details_Centre">Ref.</para>
</td>
<td>
<para style="terp_tblheader_Details">Account</para>
@@ -524,7 +524,7 @@
</blockTable>
<section>
<para style="P3">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
- <blockTable colWidths="349.0,60.0,60.0,80.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+ <blockTable colWidths="329.0,70.0,70.0,80.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td>
@@ -557,7 +557,7 @@
</blockTable>
<section>
<para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
- <blockTable colWidths="50.0,28.0,65.0,61.0,145.0,60.0,60.0,80.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+ <blockTable colWidths="50.0,50.0,70.0,50.0,109.0,70.0,70.0,80.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="P3">[[ formatLang(line['date'],date=True) ]]</para>
@@ -587,7 +587,7 @@
</blockTable>
</section>
</section>
- <blockTable colWidths="50.0,28.0,65.0,65.0,112.0,53.0,53.0,60.0,53.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+ <blockTable colWidths="50.0,40.0,60.0,50.0,60.0,65.0,65.0,80.0,80.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="terp_tblheader_Details">Date</para>
@@ -596,10 +596,10 @@
<para style="terp_tblheader_Details">JNRL</para>
</td>
<td>
- <para style="terp_tblheader_Details">Ref.</para>
+ <para style="terp_tblheader_Details_Centre">Ref.</para>
</td>
<td>
- <para style="terp_tblheader_Details">Account</para>
+ <para style="terp_tblheader_Details_Centre">Account</para>
</td>
<td>
<para style="terp_tblheader_Details">Entry Label</para>
@@ -621,8 +621,7 @@
<para style="P4"/>
<section>
<para style="P3">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
- <blockTable colWidths="320.0,53.0,53.0,60.0,53.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
-
+ <blockTable colWidths="260.0,65.0,65.0,80.0,80.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="P2">[[ p.ref ]] - [[ p.name ]]</para>
@@ -662,7 +661,7 @@
</blockTable>
<section>
<para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
- <blockTable colWidths="50.0,28.0,65.0,65.0,112.0,53.0,53.0,60.0,53.0" style="Table7">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+ <blockTable colWidths="50.0,40.0,60.0,50.0,60.0,65.0,65.0,80.0,80.0" style="Table7">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<tr>
<td>
<para style="P3"> [[ formatLang(line['date'],date=True) ]]</para>
@@ -674,7 +673,7 @@
<para style="P3">[[ line['move_name'] ]]</para>
</td>
<td>
- <para style="P3">[[ line['a_code'] ]]</para>
+ <para style="terp_default_Centre_9">[[ line['a_code'] ]]</para>
</td>
<td>
<para style="P3">[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
=== modified file 'account/report/account_print_invoice.rml'
--- account/report/account_print_invoice.rml 2010-11-01 11:06:11 +0000
+++ account/report/account_print_invoice.rml 2010-11-19 12:21:01 +0000
@@ -130,6 +130,31 @@
<images/>
</stylesheet>
<story>
+ <pto>
+ <pto_header>
+ <blockTable colWidths="202.0,87.0,71.0,57.0,42.0,71.0" style="Table7">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Description</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Taxes</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">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_Right">Price</para>
+ </td>
+ </tr>
+ </blockTable>
+ </pto_header>
<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
<para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
<blockTable colWidths="297.0,233.0" style="Table_Partner_Address">
@@ -378,5 +403,6 @@
<para style="terp_default_2">
<font color="white"> </font>
</para>
+ </pto>
</story>
</document>
\ No newline at end of file
=== modified file 'account/report/account_print_overdue.rml'
--- account/report/account_print_overdue.rml 2010-11-10 07:04:30 +0000
+++ account/report/account_print_overdue.rml 2010-11-19 12:21:01 +0000
@@ -89,6 +89,37 @@
<images/>
</stylesheet>
<story>
+ <pto>
+ <pto_header>
+ <blockTable colWidths="57.0,136.0,51.0,72.0,54.0,56.0,66.0,18.0" style="Table1">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Date</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">Description</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Ref</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Maturity date</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Due</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Paid</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Maturity</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Li.</para>
+ </td>
+ </tr>
+ </blockTable>
+ </pto_header>
<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
<para style="terp_default_8">[[ setLang(o.lang) ]]</para>
<blockTable colWidths="286.0,224.0" style="Tableau2">
@@ -253,5 +284,6 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
+ </pto>
</story>
</document>
\ No newline at end of file
=== modified file 'account/report/account_profit_horizontal.rml'
--- account/report/account_profit_horizontal.rml 2010-11-10 07:04:30 +0000
+++ account/report/account_profit_horizontal.rml 2010-11-19 12:21:01 +0000
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<document filename="Profit and Loss.pdf">
- <template pageSize="(1120.0,770.0)" title="Profit and Loss" author="OpenERP S.A.(sales@xxxxxxxxxxx)" allowSplitting="20" >
+ <template pageSize="(842.0,595.0)" title="Profit And Loss" author="OpenERP S.A.(sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
- <frame id="first" x1="22.0" y1="15.0" width="1080" height="680"/>
+ <frame id="first" x1="28.0" y1="57.0" width="772" height="481"/>
</pageTemplate>
</template>
<stylesheet>
@@ -136,9 +136,6 @@
</stylesheet>
<images/>
<story>
- <para style="terp_header_Centre">
- <font color="white"> </font>
- </para>
<blockTable colWidths="539.0" style="Table_Company_Name">
<tr>
<td>
@@ -150,7 +147,7 @@
<font color="white"> </font>
</para>
<para style="P2">[[ get_data(data) or removeParentNode('para')]]</para>
- <blockTable colWidths="250.0,200.0,200.0,200.0,200.0" style="Table2_header">
+ <blockTable colWidths="250.0,100.0,150.0,120.0,150.0" style="Table2_header">
<tr>
<td><para style="terp_tblheader_General_Centre">Chart of Account </para></td>
<td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
@@ -162,7 +159,7 @@
<td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
<td><para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para></td>
<td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
- <blockTable colWidths="90.0,90.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+ <blockTable colWidths="70.0,70.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_tblheader_General_Centre">Start Date</para></td>
<td><para style="terp_tblheader_General_Centre">End Date</para></td>
@@ -172,7 +169,7 @@
<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
</tr>
</blockTable>
- <blockTable colWidths="90.0,90.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+ <blockTable colWidths="70.0,70.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_tblheader_General_Centre">Start Period</para></td>
<td><para style="terp_tblheader_General_Centre">End Period</para></td>
@@ -190,10 +187,7 @@
<para style="Standard">
<font color="white"> </font>
</para>
- <para style="Standard">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="100.0,308.16,116.32,100.0,308.16,116.32" style="Table_Account_Line_Title" repeatRows="1">
+ <blockTable colWidths="80.0,210.16,100.32,80.0,210.16,100.32" style="Table_Account_Line_Title" repeatRows="1">
<tr>
<td>
<para style="terp_default_Bold_9">Code</para>
@@ -244,7 +238,7 @@
</td>
</tr>
</blockTable>
- <blockTable colWidths="100.0,308.16,116.32,100.0,308.16,116.32" style="Table_Net_Profit_Loss">
+ <blockTable colWidths="80.0,210.16,100.32,80.0,210.16,100.32" style="Table_Net_Profit_Loss">
<tr>
<td>
<para style="terp_default_Bold_9"></para>
@@ -267,7 +261,7 @@
</tr>
</blockTable>
- <blockTable colWidths="408.16,116.32,408.16,116.32" style="Table_Net_Profit_Loss">
+ <blockTable colWidths="290.16,100.32,290.16,100.32" style="Table_Net_Profit_Loss">
<tr>
<td>
<para style="terp_default_Bold_9">Total:</para>
@@ -283,9 +277,6 @@
</td>
</tr>
</blockTable>
- <para style="terp_default_8">
- <font color="white"> </font>
- </para>
</story>
</document>
=== modified file 'account/report/account_voucher_print.rml'
--- account/report/account_voucher_print.rml 2010-10-05 07:06:57 +0000
+++ account/report/account_voucher_print.rml 2010-11-19 12:21:01 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+<document filename="Voucher.pdf">
+ <template pageSize="(595.0,842.0)" title="Voucher" author="OpenERP S.A.(sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="28.0" y1="42.0" width="525" height="772"/>
</pageTemplate>
@@ -162,6 +162,22 @@
<images/>
</stylesheet>
<story>
+ <pto>
+ <pto_header>
+ <blockTable colWidths="313.0,107.0,105.0" style="Heading1">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Particulars</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Debit</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Credit</para>
+ </td>
+ </tr>
+ </blockTable>
+ </pto_header>
<para style="P8">[[ repeatIn(objects,'voucher') ]]</para>
<blockTable colWidths="524.0" style="Table6">
<tr>
@@ -449,5 +465,6 @@
<para style="P1">
<font color="white"> </font>
</para>
+ </pto>
</story>
</document>
=== modified file 'account_invoice_layout/report/report_account_invoice_layout.rml'
--- account_invoice_layout/report/report_account_invoice_layout.rml 2010-11-01 11:06:11 +0000
+++ account_invoice_layout/report/report_account_invoice_layout.rml 2010-11-19 12:21:01 +0000
@@ -174,6 +174,28 @@
<images/>
</stylesheet>
<story>
+ <pto>
+ <pto_header>
+ <blockTable colWidths="283.0,71.0,57.0,57.0,71.0" style="Tableau6">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Description / Taxes</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">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_Right">Price</para>
+ </td>
+ </tr>
+ </blockTable>
+ </pto_header>
<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
<para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
<blockTable colWidths="302.0,237.0" style="Tableau2">
@@ -469,5 +491,6 @@
<para style="Standard">
<font color="white"> </font>
</para>
+ </pto>
</story>
</document>
\ No newline at end of file
=== modified file 'account_invoice_layout/report/special_message_invoice.rml'
--- account_invoice_layout/report/special_message_invoice.rml 2010-11-01 11:06:11 +0000
+++ account_invoice_layout/report/special_message_invoice.rml 2010-11-19 12:21:01 +0000
@@ -178,6 +178,28 @@
<images/>
</stylesheet>
<story>
+ <pto>
+ <pto_header>
+ <blockTable colWidths="283.0,71.0,57.0,57.0,71.0" style="Tableau6">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Description / Taxes</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">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_Right">Price</para>
+ </td>
+ </tr>
+ </blockTable>
+ </pto_header>
<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
<para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
<blockTable colWidths="302.0,237.0" style="Tableau2">
@@ -487,5 +509,6 @@
<para style="terp_default_9">
<font color="white"> </font>
</para>
+ </pto>
</story>
</document>
\ No newline at end of file
=== modified file 'account_payment/report/order.rml'
--- account_payment/report/order.rml 2010-10-12 11:08:41 +0000
+++ account_payment/report/order.rml 2010-11-19 12:21:01 +0000
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
+<document filename="Payment Order.pdf">
<template pageSize="(595.0,842.0)" title="Payment Order" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="34.0" y1="34.0" width="527" height="774"/>
@@ -121,6 +121,31 @@
<images/>
</stylesheet>
<story>
+ <pto>
+ <pto_header>
+ <blockTable colWidths="112.0,86.0,106.0,63.0,85.0,75.0" style="Table3">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Partner</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Bank Account</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Invoice Ref</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Value Date</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Amount</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Currency</para>
+ </td>
+ </tr>
+ </blockTable>
+ </pto_header>
<para style="terp_default_8">[[ repeatIn(objects, 'o') ]]</para>
<para style="terp_default_8">
<font color="white"> </font>
@@ -260,5 +285,6 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
+ </pto>
</story>
</document>
\ No newline at end of file
=== modified file 'account_voucher/report/account_voucher.rml'
--- account_voucher/report/account_voucher.rml 2010-09-29 05:06:15 +0000
+++ account_voucher/report/account_voucher.rml 2010-11-19 12:21:01 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+<document filename="Voucher.pdf">
+ <template pageSize="(595.0,842.0)" title="Voucher" author="OpenERP S.A.(sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="28.0" y1="42.0" width="525" height="772"/>
</pageTemplate>
=== modified file 'account_voucher/report/account_voucher_print.rml'
--- account_voucher/report/account_voucher_print.rml 2010-10-15 13:02:29 +0000
+++ account_voucher/report/account_voucher_print.rml 2010-11-19 12:21:01 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+<document filename="Voucher.pdf">
+ <template pageSize="(595.0,842.0)" title="Voucher" author="OpenERP S.A.(sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="28.0" y1="42.0" width="525" height="772"/>
</pageTemplate>
=== modified file 'auction/report/report_lot_bar_code.rml'
--- auction/report/report_lot_bar_code.rml 2008-08-24 14:45:43 +0000
+++ auction/report/report_lot_bar_code.rml 2010-11-19 12:21:01 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<document filename="test.pdf">
-<template pageSize="(5.5cm,2.8cm)" title="Test" author="Martin Simon" allowSplitting="20">
+<template pageSize="(5.5cm,2.8cm)" title="Flagey" author="OpenERP S.A.(sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="0.1cm" y1="0.1cm" width="5.3cm" height="2.6cm"/>
</pageTemplate>
=== modified file 'delivery/report/shipping.rml'
--- delivery/report/shipping.rml 2010-10-14 10:21:07 +0000
+++ delivery/report/shipping.rml 2010-11-19 12:21:01 +0000
@@ -105,6 +105,22 @@
<images/>
</stylesheet>
<story>
+ <pto>
+ <pto_header>
+ <blockTable colWidths="370.0,85.0,82.0" repeatRows="1" style="Table3">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Description</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Lot</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Quantity</para>
+ </td>
+ </tr>
+ </blockTable>
+ </pto_header>
<para style="terp_default_9">[[repeatIn(objects,'o')]]</para>
<para style="terp_default_8">
<font color="white"> </font>
@@ -208,5 +224,6 @@
<font color="white"> </font>
</para>
</section>
+ </pto>
</story>
</document>
\ No newline at end of file
=== modified file 'hr_expense/report/expense.rml'
--- hr_expense/report/expense.rml 2010-10-13 13:46:30 +0000
+++ hr_expense/report/expense.rml 2010-11-19 12:21:01 +0000
@@ -111,6 +111,31 @@
<images/>
</stylesheet>
<story>
+ <pto>
+ <pto_header>
+ <blockTable colWidths="49.0,204.0,45.0,80.0,53.0,91.0" style="Table_hr_expense_line_header">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Date</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">Name</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Ref.</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Unit Price</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Qty</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Total Price</para>
+ </td>
+ </tr>
+ </blockTable>
+ </pto_header>
<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
<para style="terp_default_8">
<font color="white"> </font>
@@ -272,5 +297,6 @@
<font color="white"> </font>
</para>
<para style="terp_default_9">This document must be dated and signed for reimbursement</para>
+ </pto>
</story>
</document>
=== modified file 'hr_payroll/report/payroll_register.rml'
--- hr_payroll/report/payroll_register.rml 2010-10-15 10:07:13 +0000
+++ hr_payroll/report/payroll_register.rml 2010-11-19 12:21:01 +0000
@@ -88,6 +88,37 @@
<images/>
</stylesheet>
<story>
+ <pto>
+ <pto_header>
+ <blockTable colWidths="26.0,106.0,66.0,66.0,66.0,66.0,66.0,66.0" style="Table6">
+ <tr>
+ <td>
+ <para style="terp_tblheader_details_center">#</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_details">Employee Name</para>
+ </td>
+ <td>
+ <para style="terp_tbleheader_details_right">Basic</para>
+ </td>
+ <td>
+ <para style="terp_tbleheader_details_right">Others </para>
+ </td>
+ <td>
+ <para style="terp_tbleheader_details_right">Allowances </para>
+ </td>
+ <td>
+ <para style="terp_tbleheader_details_right">Gross Sal.</para>
+ </td>
+ <td>
+ <para style="terp_tbleheader_details_right">Deduction </para>
+ </td>
+ <td>
+ <para style="terp_tbleheader_details_right">Net Sal.</para>
+ </td>
+ </tr>
+ </blockTable>
+ </pto_header>
<para style="terp_default_8">[[ repeatIn(objects, 'o') ]]</para>
<para style="terp_header_center">Salary Payment Register</para>
<para style="terp_default_9_bold_center">[[o.name]]</para>
@@ -226,5 +257,6 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
+ </pto>
</story>
</document>
\ No newline at end of file
=== modified file 'hr_payroll/report/payslip.rml'
--- hr_payroll/report/payslip.rml 2010-10-15 10:57:57 +0000
+++ hr_payroll/report/payslip.rml 2010-11-19 12:21:01 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+<document filename="Pay Slip.pdf">
+ <template pageSize="(595.0,842.0)" title="Pay Slip" author="OpenERP S.A.(sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
</pageTemplate>
=== modified file 'hr_payroll/report/report_emp_salary_structure.rml'
--- hr_payroll/report/report_emp_salary_structure.rml 2010-10-11 12:56:46 +0000
+++ hr_payroll/report/report_emp_salary_structure.rml 2010-11-19 12:21:01 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+<document filename="Salary Structure.pdf">
+ <template pageSize="(595.0,842.0)" title="Salary Structure" author="OpenERP S.A.(sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
</pageTemplate>
@@ -262,6 +262,25 @@
<images/>
</stylesheet>
<story>
+ <pto>
+ <pto_header>
+ <blockTable colWidths="34.0,341.0,80.0,83.0" style="Table5">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Code</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">Name</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Amount</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">Amount Type</para>
+ </td>
+ </tr>
+ </blockTable>
+ </pto_header>
<para style="terp_default_8">[[repeatIn(objects,'employee')]]</para>
<para style="terp_default_1">
<font color="white"> </font>
@@ -554,5 +573,6 @@
<para style="terp_default_9">
<font color="white"> </font>
</para>
+ </pto>
</story>
</document>
=== modified file 'hr_payroll/report/report_payroll_advice.rml'
--- hr_payroll/report/report_payroll_advice.rml 2010-10-15 12:44:03 +0000
+++ hr_payroll/report/report_payroll_advice.rml 2010-11-19 12:21:01 +0000
@@ -125,6 +125,31 @@
<images/>
</stylesheet>
<story>
+ <pto>
+ <pto_header>
+ <blockTable colWidths="61.0,166.0,84.0,82.0,111.0,35.0" style="Table4">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">SI. No.</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">Name of the Employee</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Amount</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">By Salary</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">Bank Account</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">C/D</para>
+ </td>
+ </tr>
+ </blockTable>
+ </pto_header>
<para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
<blockTable colWidths="269.0,269.0" style="Table1">
<tr>
@@ -334,5 +359,6 @@
<para>
<seqReset id="L1"/>
</para>
+ </pto>
</story>
</document>
\ No newline at end of file
=== modified file 'hr_timesheet_invoice/board_hr_timesheet_invoice.xml'
--- hr_timesheet_invoice/board_hr_timesheet_invoice.xml 2010-10-01 10:54:32 +0000
+++ hr_timesheet_invoice/board_hr_timesheet_invoice.xml 2010-11-19 12:21:01 +0000
@@ -68,7 +68,7 @@
<field name="inherit_id" ref="hr.board_hr_manager_form"/>
<field name="arch" type="xml">
<xpath expr="/form/hpaned/child1" position="inside">
- <action colspan="4" height="220" name="%(action_timesheet_uninvoiced_line)d" string="Uninvoice lines with billing rate" />
+ <action colspan="4" height="220" name="%(action_timesheet_uninvoiced_line)d" string="Uninvoice Lines With Billing Rate" />
</xpath>
</field>
</record>
=== modified file 'l10n_it/report/libroIVA_debito.rml'
--- l10n_it/report/libroIVA_debito.rml 2010-10-28 08:42:58 +0000
+++ l10n_it/report/libroIVA_debito.rml 2010-11-19 12:21:01 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
- <template pageSize="(612.0,792.0)" title="Test" author="Martin Simon" allowSplitting="20">
+<document filename="LibroIVA.pdf">
+ <template pageSize="(612.0,792.0)" title="LibroIVA" author="OpenERP S.A.(sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="498" height="678"/>
</pageTemplate>
=== modified file 'lunch/report/order.rml'
--- lunch/report/order.rml 2010-10-18 07:33:00 +0000
+++ lunch/report/order.rml 2010-11-19 12:21:01 +0000
@@ -71,6 +71,25 @@
<images/>
</stylesheet>
<story>
+ <pto>
+ <pto_header>
+ <blockTable colWidths="149.0,114.0,201.0,63.0" style="Table5">
+ <tr>
+ <td>
+ <para style="terp_tbl_detail_header">Name/Date</para>
+ </td>
+ <td>
+ <para style="terp_tbl_detail_header">Order</para>
+ </td>
+ <td>
+ <para style="terp_tbl_detail_header">Description</para>
+ </td>
+ <td>
+ <para style="terp_tbl_detail_header_right">Unit Price</para>
+ </td>
+ </tr>
+ </blockTable>
+ </pto_header>
<para style="terp_default_8">
<font color="white"> </font>
</para>
@@ -163,5 +182,6 @@
<para style="terp_default_2">
<font color="white"> </font>
</para>
+ </pto>
</story>
</document>
\ No newline at end of file
=== modified file 'marketing_campaign_crm_demo/crm_lead_mc_demo_report.rml'
--- marketing_campaign_crm_demo/crm_lead_mc_demo_report.rml 2010-06-29 13:17:23 +0000
+++ marketing_campaign_crm_demo/crm_lead_mc_demo_report.rml 2010-11-19 12:21:01 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+<document filename="CRM Lead.pdf">
+ <template pageSize="(595.0,842.0)" title="CRM Lead" author="OpenERP S.A.(sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
</pageTemplate>
=== modified file 'mrp/report/order.rml'
--- mrp/report/order.rml 2010-10-14 11:06:37 +0000
+++ mrp/report/order.rml 2010-11-19 12:21:01 +0000
@@ -173,6 +173,25 @@
<images/>
</stylesheet>
<story>
+ <pto>
+ <pto_header>
+ <blockTable colWidths="256.0,61.0,107.0,104.0" style="Table8">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Product </para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Quantity</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Source Location</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Destination Location</para>
+ </td>
+ </tr>
+ </blockTable>
+ </pto_header>
<para style="terp_default_8">[[repeatIn(objects,'o')]] </para>
<para style="terp_default_8">
<font color="white"> </font>
@@ -368,5 +387,6 @@
<font color="white"> </font>
</para>
</section>
+ </pto>
</story>
</document>
\ No newline at end of file
=== modified file 'mrp_repair/report/order.rml'
--- mrp_repair/report/order.rml 2010-10-12 09:26:17 +0000
+++ mrp_repair/report/order.rml 2010-11-19 12:21:01 +0000
@@ -161,6 +161,28 @@
</stylesheet>
<images/>
<story>
+ <pto>
+ <pto_header>
+ <blockTable colWidths="254.0,100.0,60.0,60.0,60.0" repeatRows="1" style="Table4">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Description</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">VAT</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Quantity</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Unit Price</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Price</para>
+ </td>
+ </tr>
+ </blockTable>
+ </pto_header>
<para style="P12">[[ repeatIn(objects,'o') ]]</para>
<blockTable colWidths="265.0,51.0,225.0" style="Table1">
<tr>
@@ -390,5 +412,6 @@
<para style="P24">
<font color="white"> </font>
</para>
+ </pto>
</story>
</document>
=== modified file 'point_of_sale/report/account_statement.rml'
--- point_of_sale/report/account_statement.rml 2010-10-08 13:43:58 +0000
+++ point_of_sale/report/account_statement.rml 2010-11-19 12:21:01 +0000
@@ -136,6 +136,22 @@
<images/>
</stylesheet>
<story>
+ <pto>
+ <pto_header>
+ <blockTable colWidths="131.0,292.0,97.0" style="Table9">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Name</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">Partner</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Amount </para>
+ </td>
+ </tr>
+ </blockTable>
+ </pto_header>
<para style="terp_default_8">[[ repeatIn(objects,'statement') ]]</para>
<para style="terp_header_Centre">Statement</para>
<blockTable colWidths="130.0,130.0,130.0,130.0" style="Table1">
@@ -264,5 +280,6 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
+ </pto>
</story>
</document>
\ No newline at end of file
=== modified file 'product/report/product_pricelist.rml'
--- product/report/product_pricelist.rml 2010-09-22 07:00:43 +0000
+++ product/report/product_pricelist.rml 2010-11-19 12:21:01 +0000
@@ -127,6 +127,32 @@
<images/>
</stylesheet>
<story>
+ <pto>
+ <pto_header>
+ <blockTable colWidths="255.0,57.0,57.0,57.0,57.0,57.0" style="Table7">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Description</para>
+ <para style="terp_default_1">[[repeatIn(get_titles(data['form']), 'k')]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9_Bold">[[ (k.has_key('qty1') and k['qty1']) or '' ]] </para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9_Bold">[[ (k.has_key('qty2') and k['qty2']) or '' ]] </para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9_Bold">[[ (k.has_key('qty3') and k['qty3']) or '' ]] </para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9_Bold">[[ (k.has_key('qty4') and k['qty4']) or '' ]] </para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9_Bold">[[ (k.has_key('qty5') and k['qty5']) or '' ]] </para>
+ </td>
+ </tr>
+ </blockTable>
+ </pto_header>
<para style="terp_default_8">
<font color="white"> </font>
</para>
@@ -235,5 +261,6 @@
</para>
</section>
</section>
+ </pto>
</story>
</document>
\ No newline at end of file
=== modified file 'purchase/report/order.rml'
--- purchase/report/order.rml 2010-11-01 11:29:29 +0000
+++ purchase/report/order.rml 2010-11-19 12:21:01 +0000
@@ -129,6 +129,31 @@
<images/>
</stylesheet>
<story>
+ <pto>
+ <pto_header>
+ <blockTable colWidths="180.0,85.0,71.0,71.0,57.0,71.0" repeatRows="1" style="Table_Header_Pur_ord_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_Centre">Date Req.</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Qty</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Unit Price</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Net Price</para>
+ </td>
+ </tr>
+ </blockTable>
+ </pto_header>
<para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
<para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
<para style="terp_default_9">
@@ -357,5 +382,6 @@
<para style="terp_default_9">
<font color="white"> </font>
</para>
+ </pto>
</story>
</document>
\ No newline at end of file
=== modified file 'purchase/report/request_quotation.rml'
--- purchase/report/request_quotation.rml 2010-10-14 10:36:10 +0000
+++ purchase/report/request_quotation.rml 2010-11-19 12:21:01 +0000
@@ -69,6 +69,22 @@
<images/>
</stylesheet>
<story>
+ <pto>
+ <pto_header>
+ <blockTable colWidths="371.0,98.0,61.0" repeatRows="1" style="Table_Product_Header_Title">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Description</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Expected Date</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Qty</para>
+ </td>
+ </tr>
+ </blockTable>
+ </pto_header>
<para style="terp_default_9">[[repeatIn(objects,'order')]]</para>
<para style="terp_default_9">[[ setLang(order.partner_id.lang) ]]</para>
<blockTable colWidths="250.0,59.0,221.0" style="Table_Address_Detail">
@@ -162,5 +178,6 @@
<font color="white"> </font>
</para>
<para style="terp_default_9">[[ user.signature or '' ]]</para>
+ </pto>
</story>
</document>
\ No newline at end of file
=== modified file 'purchase_requisition/report/purchase_requisition.rml'
--- purchase_requisition/report/purchase_requisition.rml 2010-10-14 13:38:02 +0000
+++ purchase_requisition/report/purchase_requisition.rml 2010-11-19 12:21:01 +0000
@@ -112,6 +112,22 @@
<images/>
</stylesheet>
<story>
+ <pto>
+ <pto_header>
+ <blockTable colWidths="375.0,71.0,84.0" style="Table4">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Description [[ requisition.line_ids==[] and removeParentNode('blockTable') ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Qty</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Product UoM</para>
+ </td>
+ </tr>
+ </blockTable>
+ </pto_header>
<para style="terp_default_8">[[ repeatIn(objects,'requisition') ]]</para>
<para style="terp_default_8">
<font color="white"> </font>
@@ -218,5 +234,6 @@
</tr>
</blockTable>
</section>
+ </pto>
</story>
</document>
\ No newline at end of file
=== modified file 'report_intrastat/report/invoice.rml'
--- report_intrastat/report/invoice.rml 2010-10-15 10:57:57 +0000
+++ report_intrastat/report/invoice.rml 2010-11-19 12:21:01 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Invoices" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
+<document filename="Invoices.pdf">
+ <template pageSize="(595.0,842.0)" title="Invoices" author="OpenERP S.A.(sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="34.0" y1="28.0" width="530" height="786"/>
</pageTemplate>
@@ -10,39 +10,39 @@
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
- <blockTableStyle id="Table_Partner_Address">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- </blockTableStyle>
- <blockTableStyle id="Table_Invoice_General_Header">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
- </blockTableStyle>
- <blockTableStyle id="Table_General_Detail_Content">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
- </blockTableStyle>
- <blockTableStyle id="Table_Header_Invoice_Line">
+ <blockTableStyle id="Table1">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table2">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+ <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table3">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+ <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table4">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
@@ -54,7 +54,7 @@
<lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
</blockTableStyle>
- <blockTableStyle id="Table_Invoice_Line_Content">
+ <blockTableStyle id="Table5">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
@@ -65,152 +65,48 @@
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="9,-1" stop="9,-1"/>
</blockTableStyle>
- <blockTableStyle id="Table_Format_2">
+ <blockTableStyle id="Table6">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
- <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,0" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="1,0" stop="1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#ffffff" start="2,0" stop="2,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#ffffff" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#ffffff" start="3,0" stop="3,0"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="3,-1" stop="3,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="10,0" stop="10,0"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="11,0" stop="11,0"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="12,0" stop="12,0"/>
- <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,1" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,1" stop="0,1"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#ffffff" start="1,1" stop="1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,1" stop="1,1"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="0,2" stop="0,2"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="1,2"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="2,2" stop="2,2"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="0,4" stop="0,4"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="1,4" stop="1,4"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="2,4" stop="2,4"/>
- </blockTableStyle>
- <blockTableStyle id="Table_format_Table_Line_total">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,0" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#ffffff" start="1,0" stop="1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
- </blockTableStyle>
- <blockTableStyle id="Table_eclu_Taxes_Total">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
- </blockTableStyle>
- <blockTableStyle id="Table_Taxes_Total">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- </blockTableStyle>
- <blockTableStyle id="Table_Total_Include_Taxes">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
- </blockTableStyle>
- <blockTableStyle id="Table_Main_Table">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,0" stop="0,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#ffffff" start="0,0" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" 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="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="LINEBEFORE" colorName="#ffffff" start="0,2" stop="0,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#ffffff" start="0,2" stop="0,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" 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="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="#ffffff" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="3,-1" stop="3,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="2,-1" stop="2,-1"/>
- </blockTableStyle>
- <blockTableStyle id="Table_Tax_Header">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <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"/>
- </blockTableStyle>
- <blockTableStyle id="Table_Tax_Content">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
- </blockTableStyle>
- <blockTableStyle id="Table_Table_Border_White">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="2,-1" stop="2,-1"/>
- </blockTableStyle>
- <blockTableStyle id="Table_Final_Border">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
- </blockTableStyle>
- <blockTableStyle id="Table_Coment_Payment_Term">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- </blockTableStyle>
- <blockTableStyle id="Table_Payment_Terms">
+ </blockTableStyle>
+ <blockTableStyle id="Table9">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <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"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table7">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table8">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
- <paraStyle name="Standard" fontName="Times-Roman"/>
- <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="List" fontName="Times-Roman" 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="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="Index" fontName="Times-Roman"/>
+ <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"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.0"/>
<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="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.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="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"/>
@@ -230,14 +126,14 @@
<paraStyle name="terp_default_Right_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_Right_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_White_2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_White_2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
<paraStyle name="terp_default_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <images/>
</stylesheet>
- <images/>
<story>
<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
- <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]][[ setLang(o.partner_id.lang) ]]</para>
- <blockTable colWidths="297.0,233.0" style="Table_Partner_Address">
+ <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
+ <blockTable colWidths="297.0,233.0" style="Table1">
<tr>
<td>
<para style="terp_default_8">
@@ -245,33 +141,32 @@
</para>
</td>
<td>
- <para style="terp_default_8">[[ o.partner_id.name ]] [[ o.partner_id.title or '' ]]</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.street ]]</para>
- <para style="terp_default_8">[[ o.address_invoice_id.street2 or '' ]]</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">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
+ <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.street) or '' ]]</para>
+ <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.street2) or removeParentNode('para') ]]</para>
+ <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.zip) or '' ]] [[ (o.address_invoice_id and o.address_invoice_id.city) or '' ]]</para>
+ <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.state_id and o.address_invoice_id.state_id.name) or removeParentNode('para') ]]</para>
+ <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.country_id and o.address_invoice_id.country_id.name) or '' ]]</para>
<para style="terp_default_8">
<font color="white"> </font>
</para>
- <para style="terp_default_8">Tel. : [[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
- <para style="terp_default_8">Fax : [[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
- <para style="terp_default_8">VAT : [[ o.partner_id.vat or removeParentNode('para') ]]</para>
+ <para style="terp_default_8">Tel. : [[ (o.address_invoice_id and o.address_invoice_id.phone) or removeParentNode('para') ]]</para>
+ <para style="terp_default_8">Fax : [[ (o.address_invoice_id and o.address_invoice_id.fax) or removeParentNode('para') ]]</para>
+ <para style="terp_default_8">VAT : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_header">Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
- <para style="terp_header">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
+ <para style="terp_header">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma2') or removeParentNode('para')) and '' ]]</para>
<para style="terp_header">Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</para>
- <para style="terp_header">Canceled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
+ <para style="terp_header">Cancelled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]] [[ o.number ]]</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">
<font color="white"> </font>
</para>
- <blockTable colWidths="177.0,177.0,177.0" style="Table_Invoice_General_Header">
+ <blockTable colWidths="177.0,177.0,177.0" style="Table2">
<tr>
<td>
<para style="terp_tblheader_General_Centre">Document</para>
@@ -284,310 +179,227 @@
</td>
</tr>
</blockTable>
- <blockTable colWidths="177.0,177.0,177.0" style="Table_General_Detail_Content">
+ <blockTable colWidths="177.0,177.0,177.0" style="Table3">
<tr>
<td>
- <para style="terp_default_Centre_9">[[ o.name ]]</para>
+ <para style="terp_default_Centre_9">[[ o.name or ' ' ]]</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>
+ <para style="terp_default_Centre_9">[[ (o.address_invoice_id and o.address_invoice_id.partner_id and o.address_invoice_id.partner_id.ref) or ' ' ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_8">
<font color="white"> </font>
</para>
- <blockTable colWidths="170.0,50.0,50.0,50.0,51.0,51.0,29.0,72.0" style="Table_Header_Invoice_Line">
+ <blockTable colWidths="105.0,57.0,57.0,42.0,71.0,57.0,57.0,85.0" style="Table4">
<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">Intrastat</para>
- </td>
- <td>
- <para style="terp_tblheader_Details">Weight</para>
- </td>
- <td>
- <para style="terp_tblheader_Details">Quantity</para>
+ <para style="terp_tblheader_Details_Centre">Taxes</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Intrastat</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Weight</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Quantity</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Unit Price</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">Disc. (%)</para>
+ <para style="terp_tblheader_Details_Centre">Disc. (%)</para>
</td>
<td>
- <para style="terp_tblheader_Details_Centre">Price</para>
+ <para style="terp_tblheader_Details_Right">Price</para>
</td>
</tr>
</blockTable>
<section>
<para style="terp_default_8">[[ repeatIn(o.invoice_line,'l') ]]</para>
- <blockTable colWidths="170.0,50.0,50.0,50.0,29.0,22.0,51.0,29.0,50.0,8.0" style="Table_Invoice_Line_Content">
+ <blockTable colWidths="105.0,57.0,57.0,42.0,71.0,57.0,57.0,85.0" style="Table5">
<tr>
<td>
<para style="terp_default_9">[[ l.name ]]</para>
</td>
<td>
- <para style="terp_default_9">[[ ', '.join([lt.name for lt in l.invoice_line_tax_id]) ]]</para>
- </td>
- <td>
- <para style="terp_default_9">[[l.product_id and l.product_id.intrastat_id and l.product_id.intrastat_id.name or '']]</para>
- </td>
- <td>
- <para style="terp_default_9">[[ l.product_id and l.product_id.weight or '']]</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>
+ <para style="terp_default_Centre_9">[[ ', '.join([lt.name for lt in l.invoice_line_tax_id]) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_9">[[l.product_id and l.product_id.intrastat_id and l.product_id.intrastat_id.name or '']]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ l.product_id and l.product_id.weight or '']]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(l.quantity) ]] [[ (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">[[ l.discount and formatLang (l.discount) or '' ]] </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.symbol ]]</para>
+ <para style="terp_default_Centre_9">[[ l.discount and formatLang (l.discount) or '' ]] </para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal) ]] [[ o.currency_id.symbol ]]</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">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_default_Note">
- <font color="white"> </font>
- </para>
- </td>
- </tr>
- </blockTable>
- </section>
- <blockTable colWidths="277.0,247.0" style="Table_Format_2">
- <tr>
- <td>
- <blockTable colWidths="138.0,138.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>
- </tr>
- </blockTable>
- </td>
- <td>
- <blockTable colWidths="120.0,91.0,8.0" style="Table_eclu_Taxes_Total">
- <tr>
- <td>
- <para style="terp_default_Bold_9">Total (excl. taxes):</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.symbol ]]</para>
- </td>
- </tr>
- </blockTable>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="120.0,92.0,8.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.symbol ]]</para>
- </td>
- </tr>
- </blockTable>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="119.0,93.0,8.0" style="Table_Total_Include_Taxes">
- <tr>
- <td>
- <para style="terp_default_Bold_9">Total (inclu. taxes):</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.symbol ]]</para>
- </td>
- </tr>
- </blockTable>
- </td>
- </tr>
- </blockTable>
- <blockTable colWidths="530.0" style="Table_Main_Table">
- <tr>
- <td>
- <para style="terp_default_8">[[ o.amount_tax and formatLang(o.amount_tax, digits=get_digits(dp='Account')) or removeParentNode('blockTable') ]]</para>
- <blockTable colWidths="54.0,58.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>
- </tr>
- </blockTable>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
- </td>
- </tr>
- <tr>
- <td>
- <para style="terp_default_8">[[ repeatIn(o.tax_line,'t') ]]</para>
- <blockTable colWidths="53.0,60.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, digits=get_digits(dp='Account')) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_8">[[ formatLang(t.amount, digits=get_digits(dp='Account')) ]]</para>
- </td>
- </tr>
- </blockTable>
- </td>
- </tr>
- <tr>
- <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>
- </tr>
- </blockTable>
- </td>
- </tr>
- </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>
- </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>
- </tr>
- </blockTable>
- <para style="terp_default_2">
- <font color="white"> </font>
- </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>
- </tr>
- </blockTable>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
- <para style="terp_default_2">
- <font color="white"> </font>
- </para>
- <para style="terp_default_Centre_9">
- <font face="Times-Roman"/>
+ </td>
+ <td>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ </blockTable>
+ </section>
+ <blockTable colWidths="332.0,99.0,99.0" style="Table6">
+ <tr>
+ <td>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_9">Total (excl. taxes):</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]] [[ o.currency_id.symbol ]]</para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_9">Taxes:</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[ o.currency_id.symbol ]]</para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_9">Total (inclu. taxes):</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(o.amount_total) ]] [[ o.currency_id.symbol ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ <blockTable colWidths="205.0,71.0,71.0,183.0" style="Table9">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Tax [[ o.tax_line==[] and removeParentNode('blockTable') ]]</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_default_8">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ </blockTable>
+ <section>
+ <para style="terp_default_2">[[ repeatIn(o.tax_line,'t') ]]</para>
+ <blockTable colWidths="205.0,71.0,71.0,184.0" style="Table7">
+ <tr>
+ <td>
+ <para style="terp_default_8">[[ t.name ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ formatLang(t.base, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ </blockTable>
+ </section>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
+ <para style="terp_default_9">[[ (o.comment and format(o.comment )) or removeParentNode('para') ]]</para>
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ <para style="terp_default_9">[[ (o.payment_term and o.payment_term.note and format(o.payment_term and o.payment_term.note)) or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
+ <blockTable colWidths="120.0,410.0" style="Table8">
+ <tr>
+ <td>
+ <para style="terp_default_Bold_9">Fiscal Position Remark : </para>
+ </td>
+ <td>
+ <para style="terp_default_9">[[ (o.fiscal_position and o.fiscal_position.note and format(o.fiscal_position.note)) or removeParentNode('blockTable') ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <para style="terp_default_2">
+ <font color="white"> </font>
</para>
</story>
-</document>
+</document>
\ No newline at end of file
=== modified file 'report_intrastat/report/invoice.sxw'
Binary files report_intrastat/report/invoice.sxw 2009-03-05 12:52:29 +0000 and report_intrastat/report/invoice.sxw 2010-11-19 12:21:01 +0000 differ
=== modified file 'sale/report/sale_order.rml'
--- sale/report/sale_order.rml 2010-10-15 04:48:41 +0000
+++ sale/report/sale_order.rml 2010-11-19 12:21:01 +0000
@@ -126,6 +126,31 @@
<images/>
</stylesheet>
<story>
+ <pto>
+ <pto_header>
+ <blockTable colWidths="202.0,94.0,68.0,59.0,50.0,63.0" repeatRows="1" style="Table4">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Description</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">VAT</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">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_Right">Price</para>
+ </td>
+ </tr>
+ </blockTable>
+ </pto_header>
<para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
<para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
<blockTable colWidths="265.0,51.0,225.0" style="Table1">
@@ -360,5 +385,6 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
+ </pto>
</story>
</document>
=== modified file 'sale_crm/board_sale_crm_view.xml'
--- sale_crm/board_sale_crm_view.xml 2010-10-12 13:28:22 +0000
+++ sale_crm/board_sale_crm_view.xml 2010-11-19 12:21:01 +0000
@@ -62,14 +62,14 @@
</field>
</record>
- <record model="ir.ui.view" id="board_crm_form_inherit_child2">
- <field name="name">board.crm.form.inherit.child2</field>
+ <record model="ir.ui.view" id="board_crm_form_inherit_replace1">
+ <field name="name">board.crm.form.inherit.replace1</field>
<field name="model">board.board</field>
<field name="type">form</field>
<field name="inherit_id" ref="crm.board_crm_form"/>
<field name="arch" type="xml">
- <xpath expr="/form/hpaned/child2/action[@name='%(crm.act_sales_pipeline)d']" position="after">
- <action
+ <xpath expr="/form/hpaned/child2/action[@name='%(crm.act_sales_pipeline)d']" position="replace">
+ <action
string="Monthly Turnover"
name="%(action_turnover_by_month)d"
colspan="4"/>
@@ -77,17 +77,6 @@
</field>
</record>
- <record model="ir.ui.view" id="board_crm_form_inherit_replace1">
- <field name="name">board.crm.form.inherit.replace1</field>
- <field name="model">board.board</field>
- <field name="type">form</field>
- <field name="inherit_id" ref="crm.board_crm_form"/>
- <field name="arch" type="xml">
- <xpath expr="/form/hpaned/child2/action[@name='%(crm.act_sales_pipeline)d']" position="replace">
- </xpath>
- </field>
- </record>
-
<record model="ir.ui.view" id="board_crm_form_inherit_replace2">
<field name="name">board.crm.form.inherit.replace2</field>
<field name="model">board.board</field>
=== modified file 'sale_layout/report/report_sale_layout.rml'
--- sale_layout/report/report_sale_layout.rml 2010-11-04 08:54:43 +0000
+++ sale_layout/report/report_sale_layout.rml 2010-11-19 12:21:01 +0000
@@ -133,6 +133,31 @@
<images/>
</stylesheet>
<story>
+ <pto>
+ <pto_header>
+ <blockTable colWidths="198.0,85.0,71.0,57.0,57.0,71.0" style="Table7">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Description</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">VAT</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">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_Right">Price</para>
+ </td>
+ </tr>
+ </blockTable>
+ </pto_header>
<para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
<para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
<blockTable colWidths="260.0,64.0,215.0" style="Tableau2">
@@ -371,5 +396,6 @@
<para style="Standard">
<font color="white"> </font>
</para>
+ </pto>
</story>
</document>
\ No newline at end of file
=== modified file 'stock/report/lot_overview.rml'
--- stock/report/lot_overview.rml 2010-11-10 07:15:47 +0000
+++ stock/report/lot_overview.rml 2010-11-19 12:21:01 +0000
@@ -88,6 +88,28 @@
<images/>
</stylesheet>
<story>
+ <pto>
+ <pto_header>
+ <blockTable colWidths="248.0,91.0,62.0,59.0,67.0" style="Table6">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Location / Product</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Variants</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Quantity</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Unit Price</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Value</para>
+ </td>
+ </tr>
+ </blockTable>
+ </pto_header>
<para style="terp_default_8">
<font color="white"> </font>
</para>
@@ -95,7 +117,7 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
- <blockTable colWidths="248.0,91.0,62.0,59.0,67.0" style="Table6">
+ <blockTable colWidths="215.0,85.0,85.0,57.0,85.0" style="Table6">
<tr>
<td>
<para style="terp_tblheader_Details">Location / Product</para>
@@ -142,7 +164,7 @@
</blockTable>
<section>
<para style="terp_default_2">[[ repeatIn(ob['product'],'p') ]]</para>
- <blockTable colWidths="32.0,216.0,91.0,62.0,60.0,65.0" style="Table8">
+ <blockTable colWidths="28.0,186.0,85.0,85.0,57.0,85.0" style="Table8">
<tr>
<td>
<para style="terp_default_9">
@@ -167,7 +189,7 @@
</tr>
</blockTable>
</section>
- <blockTable colWidths="32.0,421.0,74.0" style="Table10">
+ <blockTable colWidths="28.0,399.0,99.0" style="Table10">
<tr>
<td>
<para style="terp_tblheader_Details">[[ (not ob['product']) and removeParentNode('blockTable') ]]</para>
@@ -182,7 +204,7 @@
</blockTable>
</section>
</section>
- <blockTable colWidths="78.0,365.0,84.0" repeatRows="1" style="Table1">
+ <blockTable colWidths="85.0,328.0,113.0" repeatRows="1" style="Table1">
<tr>
<td>
<para style="terp_default_Bold_9">Grand Total:</para>
@@ -200,5 +222,6 @@
<para style="terp_default_2">
<font color="white"> </font>
</para>
+ </pto>
</story>
</document>
\ No newline at end of file
=== modified file 'stock/report/lot_overview.sxw'
Binary files stock/report/lot_overview.sxw 2010-11-10 07:15:47 +0000 and stock/report/lot_overview.sxw 2010-11-19 12:21:01 +0000 differ
=== modified file 'stock/report/lot_overview_all.rml'
--- stock/report/lot_overview_all.rml 2010-11-10 08:34:58 +0000
+++ stock/report/lot_overview_all.rml 2010-11-19 12:21:01 +0000
@@ -88,6 +88,28 @@
<images/>
</stylesheet>
<story>
+ <pto>
+ <pto_header>
+ <blockTable colWidths="253.0,65.0,63.0,63.0,78.0" style="Table6">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Location / Product</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Variants</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Quantity</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Unit Price</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Value</para>
+ </td>
+ </tr>
+ </blockTable>
+ </pto_header>
<para style="terp_default_8">
<font color="white"> </font>
</para>
@@ -95,7 +117,7 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
- <blockTable colWidths="253.0,65.0,63.0,63.0,78.0" style="Table6">
+ <blockTable colWidths="211.0,85.0,85.0,57.0,85.0" style="Table6">
<tr>
<td>
<para style="terp_tblheader_Details">Location / Product</para>
@@ -142,7 +164,7 @@
</blockTable>
<section>
<para style="terp_default_2">[[ repeatIn(ob['product'],'p') ]]</para>
- <blockTable colWidths="29.0,225.0,65.0,63.0,63.0,78.0" style="Table8">
+ <blockTable colWidths="28.0,183.0,85.0,85.0,57.0,85.0" style="Table8">
<tr>
<td>
<para style="terp_default_9">
@@ -167,7 +189,7 @@
</tr>
</blockTable>
</section>
- <blockTable colWidths="29.0,409.0,84.0" style="Table10">
+ <blockTable colWidths="28.0,395.0,99.0" style="Table10">
<tr>
<td>
<para style="terp_tblheader_Details">[[ (not ob['product']) and removeParentNode('blockTable') ]]</para>
@@ -182,7 +204,7 @@
</blockTable>
</section>
</section>
- <blockTable colWidths="77.0,362.0,84.0" repeatRows="1" style="Table2">
+ <blockTable colWidths="85.0,325.0,113.0" repeatRows="1" style="Table2">
<tr>
<td>
<para style="terp_default_Bold_9">Grand Total:</para>
@@ -200,5 +222,6 @@
<para style="terp_default_2">
<font color="white"> </font>
</para>
+ </pto>
</story>
</document>
\ No newline at end of file
=== modified file 'stock/report/lot_overview_all.sxw'
Binary files stock/report/lot_overview_all.sxw 2010-11-10 08:34:58 +0000 and stock/report/lot_overview_all.sxw 2010-11-19 12:21:01 +0000 differ
=== modified file 'stock/report/picking.rml'
--- stock/report/picking.rml 2010-11-10 11:21:01 +0000
+++ stock/report/picking.rml 2010-11-19 12:21:01 +0000
@@ -123,6 +123,28 @@
<images/>
</stylesheet>
<story>
+ <pto>
+ <pto_header>
+ <blockTable colWidths="256.0,73.0,59.0,59.0,71.0" repeatRows="1" style="Move_Line_Header">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Description</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Lot</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">State</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Location</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Quantity</para>
+ </td>
+ </tr>
+ </blockTable>
+ </pto_header>
<para style="terp_default_8">[[repeatIn(objects,'picking')]] </para>
<para style="terp_default_9">
<font color="white"> </font>
@@ -285,5 +307,6 @@
<para style="terp_default_2">
<font color="white"> </font>
</para>
+ </pto>
</story>
</document>
\ No newline at end of file
=== modified file 'stock/report/stock_inventory_move.rml'
--- stock/report/stock_inventory_move.rml 2010-11-10 11:21:01 +0000
+++ stock/report/stock_inventory_move.rml 2010-11-19 12:21:01 +0000
@@ -104,6 +104,25 @@
<images/>
</stylesheet>
<story>
+ <pto>
+ <pto_header>
+ <blockTable colWidths="70.0,103.0,256.0,109.0" style="Table4">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Location</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Production Lot</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">Product </para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">Quantity</para>
+ </td>
+ </tr>
+ </blockTable>
+ </pto_header>
<para style="terp_default_8">[[ repeatIn(objects,'o') ]] </para>
<blockTable colWidths="539.0" style="Table3">
<tr>
@@ -197,5 +216,6 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
+ </pto>
</story>
</document>
\ No newline at end of file
=== modified file 'survey/report/survey_analysis_report.py'
--- survey/report/survey_analysis_report.py 2010-10-28 06:54:18 +0000
+++ survey/report/survey_analysis_report.py 2010-11-19 12:21:01 +0000
@@ -35,7 +35,7 @@
company=user_obj.browse(cr,uid,[uid],context)[0].company_id
rml ="""<document filename="Survey Analysis Report.pdf">
- <template pageSize="(595.0,842.0)" title="Survey Analysis" author="OpenERP S.A. (sales@xxxxxxxxxxx)" allowSplitting="20">
+ <template pageSize="(595.0,842.0)" title="Survey Analysis" author="OpenERP S.A.(sales@xxxxxxxxxxx)" allowSplitting="20">
<pageTemplate>
<frame id="first" x1="1.3cm" y1="1.5cm" width="18.4cm" height="26.5cm"/>
<pageGraphics>
=== modified file 'survey/report/survey_browse_response.py'
--- survey/report/survey_browse_response.py 2010-10-28 07:05:42 +0000
+++ survey/report/survey_browse_response.py 2010-11-19 12:21:01 +0000
@@ -52,7 +52,7 @@
_frame_height = tools.ustr(float(_pageSize[1].replace('cm','')) - float(1.90))+'cm'
_tbl_widths = tools.ustr(float(_pageSize[0].replace('cm','')) - float(2.10))+'cm'
rml ="""<document filename="Survey Answer Report.pdf">
- <template pageSize="("""+_pageSize[0]+""","""+_pageSize[1]+""")" title='Survey Answer.pdf' author="Martin Simon" allowSplitting="20" >
+ <template pageSize="("""+_pageSize[0]+""","""+_pageSize[1]+""")" title='Survey Answer' author="OpenERP S.A.(sales@xxxxxxxxxxx)" allowSplitting="20" >
<pageTemplate id="first">
<frame id="first" x1="0.0cm" y1="1.0cm" width='"""+_frame_width+"""' height='"""+_frame_height+"""'/>
<pageGraphics>
=== modified file 'survey/report/survey_form.py'
--- survey/report/survey_form.py 2010-10-28 06:54:18 +0000
+++ survey/report/survey_form.py 2010-11-19 12:21:01 +0000
@@ -50,7 +50,7 @@
_tbl_widths = tools.ustr(float(_pageSize[0].replace('cm','')) - float(2.10))+'cm'
rml="""<document filename="Survey Form.pdf">
- <template pageSize="("""+_pageSize[0]+""","""+_pageSize[1]+""")" title='Survey Form.pdf' author="Martin Simon" allowSplitting="20" >
+ <template pageSize="("""+_pageSize[0]+""","""+_pageSize[1]+""")" title='Survey Form' author="OpenERP S.A.(sales@xxxxxxxxxxx)" allowSplitting="20" >
<pageTemplate id="first">
<frame id="first" x1="0.0cm" y1="1.0cm" width='"""+_frame_width+"""' height='"""+_frame_height+"""'/>
<pageGraphics>
Follow ups
