[REF] *: modify templates to allow smoother modifications

With the report editor in Studio, some reports were not easily editable (not
idiomatic XML, too much Python logic in XML, etc.).

These reports have been cleaned up.
This commit is contained in:
Martin Geubelle
2018-08-13 17:09:28 +02:00
committed by Christophe Matthieu
parent 4d3a776389
commit 9dbf815dd8
7 changed files with 52 additions and 55 deletions
@@ -34,11 +34,11 @@
<table class="table table-sm">
<thead>
<tr>
<th>Invoice Date</th>
<th>Invoice Number</th>
<th class="text-right">Original Amount</th>
<th class="text-right">Amount Paid</th>
<th class="text-right">Balance</th>
<th><span>Invoice Date</span></th>
<th><span>Invoice Number</span></th>
<th class="text-right"><span>Original Amount</span></th>
<th class="text-right"><span>Amount Paid</span></th>
<th class="text-right"><span>Balance</span></th>
</tr>
</thead>
<tbody>
@@ -37,7 +37,7 @@
<table class="table table-sm">
<thead>
<tr>
<th>Partners</th>
<th><span>Partners</span></th>
<th class="text-right">
<span>Not due</span>
</th>
@@ -46,7 +46,7 @@
<th class="text-right"><span t-esc="data['2']['name']"/></th>
<th class="text-right"><span t-esc="data['1']['name']"/></th>
<th class="text-right"><span t-esc="data['0']['name']"/></th>
<th class="text-right">Total</th>
<th class="text-right"><span>Total</span></th>
</tr>
<tr t-if="get_partner_lines">
<th>Account Total</th>
+8 -8
View File
@@ -26,10 +26,10 @@
<table class="table table-sm" t-if="data['debit_credit'] == 1">
<thead>
<tr>
<th>Name</th>
<th class="text-right">Debit</th>
<th class="text-right">Credit</th>
<th class="text-right">Balance</th>
<th><span>Name</span></th>
<th class="text-right"><span>Debit</span></th>
<th class="text-right"><span>Credit</span></th>
<th class="text-right"><span>Balance</span></th>
</tr>
</thead>
<tbody>
@@ -59,8 +59,8 @@
<table class="table table-sm" t-if="not data['enable_filter'] and not data['debit_credit']">
<thead>
<tr>
<th>Name</th>
<th class="text-right">Balance</th>
<th><span>Name</span></th>
<th class="text-right"><span>Balance</span></th>
</tr>
</thead>
<tbody>
@@ -82,8 +82,8 @@
<table class="table table-sm" t-if="data['enable_filter'] == 1 and not data['debit_credit']">
<thead>
<tr>
<th>Name</th>
<th class="text-right">Balance</th>
<th><span>Name</span></th>
<th class="text-right"><span>Balance</span></th>
<th class="text-right"><span t-esc="data['label_filter']"/></th>
</tr>
</thead>
+7 -7
View File
@@ -62,22 +62,22 @@
<thead>
<tr>
<t t-set="colspan" t-value="6"/>
<th>Description</th>
<th class="d-none">Source Document</th>
<th class="text-right">Quantity</th>
<th class="text-right d-none d-md-table-cell">Unit Price</th>
<th><span>Description</span></th>
<th class="d-none"><span>Source Document</span></th>
<th class="text-right"><span>Quantity</span></th>
<th class="text-right d-none d-md-table-cell"><span>Unit Price</span></th>
<th t-if="display_discount" class="text-right d-none d-md-table-cell">
<span>Disc.(%)</span>
<t t-set="colspan" t-value="colspan+1"/>
</th>
<th class="text-right d-none d-md-table-cell">Taxes</th>
<th class="text-right d-none d-md-table-cell"><span>Taxes</span></th>
<th t-if="display_taxamount and type_is_out" class="text-right d-none d-md-table-cell">
<span>Tax Amount</span>
<t t-set="colspan" t-value="colspan+1"/>
</th>
<th class="text-right">
<t groups="account.group_show_line_subtotals_tax_excluded">Amount</t>
<t groups="account.group_show_line_subtotals_tax_included">Total Price</t>
<span groups="account.group_show_line_subtotals_tax_excluded">Amount</span>
<span groups="account.group_show_line_subtotals_tax_included">Total Price</span>
</th>
</tr>
</thead>
@@ -19,35 +19,33 @@
<table class="table table-sm">
<thead>
<tr>
<th>Date</th>
<th>Responsible</th>
<th>Description</th>
<th><span>Date</span></th>
<th><span>Responsible</span></th>
<th><span>Description</span></th>
<th t-if="show_task"><t t-if="show_project">Project - </t>Task</th>
<th class="text-right">Time</th>
<th class="text-right"><span>Time</span></th>
</tr>
</thead>
<tbody>
<t t-foreach="docs" t-as="l">
<tr>
<td>
<span t-field="l.date"/>
</td>
<td>
<span t-field="l.user_id.partner_id.name"/>
</td>
<td >
<span t-field="l.name" t-options="{'widget': 'text'}"/>
</td>
<td t-if="show_task or show_project">
<t t-if="show_project"><span t-field="l.project_id.name"/></t>
<t t-if="show_project and l.task_id"> - </t>
<t t-if="l.task_id"><span t-field="l.task_id.name"/></t>
</td>
<td class="text-right">
<tr t-foreach="docs" t-as="l">
<td>
<span t-field="l.date"/>
</td>
<td>
<span t-field="l.user_id.partner_id.name"/>
</td>
<td >
<span t-field="l.name" t-options="{'widget': 'text'}"/>
</td>
<td t-if="show_task">
<t t-if="show_project"><span t-field="l.project_id.name"/></t>
<t t-if="show_project and l.task_id"> - </t>
<t t-if="l.task_id"><span t-field="l.task_id.name"/></t>
</td>
<td class="text-right">
<span t-field="l.unit_amount" t-options="{'widget': 'float_time'}"/>
</td>
</tr>
</t>
</td>
</tr>
<tr>
<td />
<td />
@@ -34,8 +34,7 @@
</td>
<td class="text-right" colspan="2">
<strong>
<span t-esc="sum(line.price for line in lines)"/>
<span t-field="user.company_id.currency_id.symbol"/>
<span t-esc="sum(line.price for line in lines)" t-options="{'widget': 'monetary', 'display_currency': user.company_id.currency_id}"/>
</strong>
</td>
</tr>
@@ -3,18 +3,18 @@
<data>
<template id="report_irmodulereference">
<t t-call="web.html_container">
<t t-foreach="docs" t-as="o">
<t t-foreach="docs" t-as="o">
<t t-call="web.internal_layout">
<div class="page">
<h3 class="text-center">Introspection report on objects</h3>
<table class="table table-bordered mt32">
<thead>
<tr>
<th class="text-center">Module</th>
<th class="text-center">Name</th>
<th class="text-center">Version</th>
<th class="text-center">Directory</th>
<th class="text-center">Web</th>
<th class="text-center"><span>Module</span></th>
<th class="text-center"><span>Name</span></th>
<th class="text-center"><span>Version</span></th>
<th class="text-center"><span>Directory</span></th>
<th class="text-center"><span>Web</span></th>
</tr>
</thead>
<tbody>
@@ -49,7 +49,7 @@
<table t-foreach="findobj(o)" t-as="obj" class="table table-sm mt16 mb32">
<tr>
<th colspan="2">Object: <span t-esc="obj.model"/></th>
<th colspan="2"><span>Object:</span> <span t-esc="obj.model"/></th>
</tr>
<tr t-foreach="findfields(obj.model, o)" t-as="field">
<td class="col-3"><t t-esc="field[0]"/></td>