[FIX] journal report: pass correct args to display_currency
bzr revid: sle@openerp.com-20140408150819-fcuve94ecyrqf17k
This commit is contained in:
parent
faa4c25542
commit
6febd153e2
|
@ -53,7 +53,7 @@
|
|||
<th>Debit</th>
|
||||
<th>Credit</th>
|
||||
<th>Balance</th>
|
||||
<th t-if="display_currency">Currency</th>
|
||||
<th t-if="display_currency(data)">Currency</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Total:</th>
|
||||
|
@ -61,7 +61,7 @@
|
|||
<th><span t-esc="formatLang(sum_debit())"/></th>
|
||||
<th><span t-esc="formatLang(sum_credit())"/></th>
|
||||
<th><span t-esc="formatLang(sum_credit() - sum_debit(), currency_obj=res_company.currency_id)"/></th>
|
||||
<th t-if="display_currency"></th>
|
||||
<th t-if="display_currency(data)"></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
@ -71,7 +71,7 @@
|
|||
<td><span t-esc="formatLang(sum_debit_period(o.id))"/></td>
|
||||
<td><span t-esc="formatLang(sum_credit_period(o.id))"/></td>
|
||||
<td><span t-esc="formatLang(sum_credit_period(o.id) - sum_debit_period(o.id), currency_obj=res_company.currency_id)"/></td>
|
||||
<td t-if="display_currency"></td>
|
||||
<td t-if="display_currency(data)"></td>
|
||||
</tr>
|
||||
<tr t-foreach="lines(o.id)" t-as="line">
|
||||
<td><span t-esc="line['code']"/></td>
|
||||
|
@ -80,7 +80,7 @@
|
|||
<td><span t-esc="line['credit']"/></td>
|
||||
<td><span t-esc="formatLang(line['credit'] - line['debit'], currency_obj=res_company.currency_id)"/></td>
|
||||
|
||||
<td t-if="display_currency">
|
||||
<td t-if="display_currency(data)">
|
||||
<t t-if="line['amount_currency']">
|
||||
<span t-esc="formatLang(line['amount_currency'])"/>
|
||||
<span t-esc="line['currency_code']"/>
|
||||
|
|
|
@ -48,7 +48,7 @@
|
|||
<th>Label</th>
|
||||
<th>Debit</th>
|
||||
<th>Credit</th>
|
||||
<th t-if="display_currency">Currency</th>
|
||||
<th t-if="display_currency(data)">Currency</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
@ -60,7 +60,7 @@
|
|||
<td><t t-esc="line.name[:35]"/></td>
|
||||
<td><t t-esc="formatLang(line.debit, currency_obj=res_company.currency_id)"/></td>
|
||||
<td><t t-esc="formatLang(line.credit, currency_obj=res_company.currency_id)"/></td>
|
||||
<td t-if="display_currency">
|
||||
<td t-if="display_currency(data)">
|
||||
<span t-esc="formatLang(line.amount_currency, currency_obj=line.currency_id) if line.amount_currency else ''"/>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
|
@ -49,7 +49,7 @@
|
|||
<th>Tax</th>
|
||||
<th>Debit</th>
|
||||
<th>Credit</th>
|
||||
<th t-if="display_currency">Currency</th>
|
||||
<th t-if="display_currency(data)">Currency</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
@ -62,7 +62,7 @@
|
|||
<td><span t-esc="line.tax_amount and formatLang(line.tax_amount, currency_obj=res_company.currency_id)"/></td>
|
||||
<td><span t-esc="formatLang(line.debit, currency_obj=res_company.currency_id)"/></td>
|
||||
<td><span t-esc="formatLang(line.credit, currency_obj=res_company.currency_id)"/></td>
|
||||
<td t-if="display_currency">
|
||||
<td t-if="display_currency(data)">
|
||||
<span t-esc="formatLang(line.amount_currency, currency_obj=line.currency_id) if line.amount_currency else ''"/>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
Loading…
Reference in New Issue