[IMP] change position of information wizard from header to page and refactoring code

pull/367/head
Ciro Urselli 2016-04-28 10:25:56 +02:00 committed by Jordi Ballester
parent 758c287022
commit 5c27020d71
2 changed files with 82 additions and 71 deletions

View File

@ -32,80 +32,90 @@
</npage> </npage>
</div> </div>
</div> </div>
<div class="row">
<table class="table table-bordered table-condensed" style="text-align: center;">
<thead>
<tr>
<th>Chart of Account</th>
<th>Fiscal Year</th>
<th>Period Filters</th>
<th>Accounts Filter</th>
<th>Target Moves</th>
<th>Initial Balance</th>
</tr>
</thead>
<tbody>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tbody>
</table>
</div>
</div> </div>
<t t-call="report.html_container"> <t t-call="report.html_container">
<t t-call="report.internal_layout"> <t t-call="report.internal_layout">
<div class="page"> <div class="page">
<t t-foreach="data" t-as="account"> <div class="row">
<p><span t-esc="account" /></p> <table class="table table-bordered table-condensed" style="text-align: center;">
<t t-foreach="data[account]" t-as="partner"> <thead>
<p><span t-esc="partner" /></p> <tr>
<table class="table table-bordered table-condensed"> <th>Chart of Account</th>
<thead> <th>Fiscal Year</th>
<tr> <th>Period Filters</th>
<th>Date</th> <th>Accounts Filter</th>
<th>Period</th> <th>Target Moves</th>
<th>Entry</th> <th>Initial Balance</th>
<th>Journal</th> </tr>
<th>Partner</th> </thead>
<th>Reference</th> <tbody>
<th>Label</th> <td></td>
<th>Rec.</th> <td></td>
<th>Due Date</th> <td></td>
<th>Debit</th> <td></td>
<th>Credit</th> <td></td>
<th>Cumul.Bal.</th> <td></td>
</tr> </tbody>
</thead> </table>
<tbody> <br/>
<tr t-foreach="data[account][partner]" t-as="move"> </div>
<td></td> <t t-foreach="data" t-as="account">
<td></td> <p><strong><span t-esc="account"/></strong></p>
<td></td> <t t-foreach="data[account]" t-as="partner">
<td></td> <p><strong><span t-esc="partner"/></strong></p>
<td></td> <table class="table table-bordered table-condensed">
<td></td> <thead>
<td></td> <tr>
<td></td> <th>Date</th>
<td></td> <th>Period</th>
<td></td> <th>Entry</th>
<td></td> <th>Journal</th>
<td></td> <th>Partner</th>
</tr> <th>Reference</th>
<tr> <th>Label</th>
<td>Comulate Balance on Partner</td> <th>Rec.</th>
<td>0</td> <th>Due Date</th>
<td>0</td> <th>Debit</th>
<td>0</td> <th>Credit</th>
</tr> <th>Cumul.Bal.</th>
</tbody> </tr>
</table> </thead>
</t> <tbody>
<p>ACCOUNT Comulate Balance</p> <tr t-foreach="data[account][partner]" t-as="move">
<td><span t-esc="move['date']"/></td>
<td><span t-esc="move['period']"/></td>
<td><span t-esc="move['entry']"/></td>
<td><span t-esc="move['journal']"/></td>
<td><span t-esc="partner"/></td>
<td><span t-esc="move['reference']"/></td>
<td><span t-esc="move['label']"/></td>
<td><span t-esc="move['rec']"/></td>
<td><span t-esc="move['due_date']"/></td>
<td class="text-right"><span t-esc="move['debit']"/></td>
<td class="text-right"><span t-esc="move['credit']"/></td>
<td class="text-right"><span t-esc="move['balance']"/></td>
</tr>
<tr>
<td colspan="6"></td>
<td colspan="3">Comulate Balance on Partner</td>
<td class="text-right">0</td>
<td class="text-right">0</td>
<td class="text-right">0</td>
</tr>
</tbody>
</table>
</t> </t>
<table>
<tbody><tr><h2>
<td colspan="9"><strong><span t-esc="account"/> Comulate Balance</strong></td>
<td class="text-right">0</td>
<td class="text-right">0</td>
<td class="text-right">0</td></h2></tr>
</tbody>
</table>
<br/>
</t>
</div> </div>
</t> </t>
</t> </t>

View File

@ -15,9 +15,10 @@
<record id="open_invoice_report_format_a4_horizontal" model="report.paperformat"> <record id="open_invoice_report_format_a4_horizontal" model="report.paperformat">
<field name="name">Open Invoice Report Internal A4 Horizontal</field> <field name="name">Open Invoice Report Internal A4 Horizontal</field>
<field name="margin_top">20</field> <field name="margin_top">10</field>
<field name="margin_bottom">20</field> <field name="margin_bottom">10</field>
<field name="header_spacing">20</field> <field name="header_line" eval="True"/>
<field name="header_spacing">10</field>
<field name="orientation">Landscape</field> <field name="orientation">Landscape</field>
</record> </record>