diff options
| author | Simon Lejeune <sle@openerp.com> | 2014-04-08 17:08:19 +0200 |
|---|---|---|
| committer | Simon Lejeune <sle@openerp.com> | 2014-04-08 17:08:19 +0200 |
| commit | 6febd153e22bbc8c3bb841b9fb069514794eeaec (patch) | |
| tree | 4baac3a0ad5795703cf01ba7b18ac5d814a190cb | |
| parent | faa4c255421a886f3eccb7c257210bafde42b696 (diff) | |
[FIX] journal report: pass correct args to display_currency
bzr revid: sle@openerp.com-20140408150819-fcuve94ecyrqf17k
| -rw-r--r-- | addons/account/views/report_generaljournal.xml | 8 | ||||
| -rw-r--r-- | addons/account/views/report_journal.xml | 4 | ||||
| -rw-r--r-- | addons/account/views/report_salepurchasejournal.xml | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/addons/account/views/report_generaljournal.xml b/addons/account/views/report_generaljournal.xml index 2dd07cf87fd..062c9ec2554 100644 --- a/addons/account/views/report_generaljournal.xml +++ b/addons/account/views/report_generaljournal.xml @@ -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']"/> diff --git a/addons/account/views/report_journal.xml b/addons/account/views/report_journal.xml index a9cd56b4109..0771b5f5fe9 100644 --- a/addons/account/views/report_journal.xml +++ b/addons/account/views/report_journal.xml @@ -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> diff --git a/addons/account/views/report_salepurchasejournal.xml b/addons/account/views/report_salepurchasejournal.xml index a6441122125..f1d8724f285 100644 --- a/addons/account/views/report_salepurchasejournal.xml +++ b/addons/account/views/report_salepurchasejournal.xml @@ -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> |