diff --git a/addons/account/report/account_aged_partner_balance.py b/addons/account/report/account_aged_partner_balance.py
index 897b8366b7a..3b000e40592 100644
--- a/addons/account/report/account_aged_partner_balance.py
+++ b/addons/account/report/account_aged_partner_balance.py
@@ -366,12 +366,13 @@ class aged_trial_report(report_sxw.rml_parse, common_report_header):
return period or 0.0
def _get_partners(self,data):
+ # TODO: deprecated, to remove in trunk
if data['form']['result_selection'] == 'customer':
- return 'Receivable Accounts'
+ return self._translate('Receivable Accounts')
elif data['form']['result_selection'] == 'supplier':
- return 'Payable Accounts'
+ return self._translate('Payable Accounts')
elif data['form']['result_selection'] == 'customer_supplier':
- return 'Receivable and Payable Accounts'
+ return self._translate('Receivable and Payable Accounts')
return ''
report_sxw.report_sxw('report.account.aged_trial_balance', 'res.partner',
diff --git a/addons/account/report/account_aged_partner_balance.rml b/addons/account/report/account_aged_partner_balance.rml
index fb79ab0d199..5b5404e9c86 100644
--- a/addons/account/report/account_aged_partner_balance.rml
+++ b/addons/account/report/account_aged_partner_balance.rml
@@ -147,7 +147,9 @@
[[ data['form']['period_length'] ]]
- [[ get_partners(data) ]]
+ Receivable Accounts[[ data['form']['result_selection'] == 'customer' or removeParentNode('para') ]]
+ Payable Accounts[[ data['form']['result_selection'] == 'supplier' or removeParentNode('para') ]]
+ Receivable and Payable Accounts[[ data['form']['result_selection'] == 'customer_supplier' or removeParentNode('para') ]]
|
[[ data['form']['direction_selection'] ]]
@@ -166,7 +168,8 @@
Partners
|
- [[ data['form']['direction_selection'] == 'future' and 'Due' or 'Not due' ]]
+ Due[[ data['form']['direction_selection'] == 'future' and ' ' or removeParentNode('para') ]]
+ Not due[[ data['form']['direction_selection'] != 'future' and ' ' or removeParentNode('para') ]]
|
[[ data['form']['4']['name'] ]]
diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml
index 88980a9cd97..6ddfc238bff 100644
--- a/addons/account/report/account_balance.rml
+++ b/addons/account/report/account_balance.rml
@@ -211,8 +211,10 @@
- | [[ data['model']=='account.account' and 'Company'or removeParentNode('para') ]]
- [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]] |
+
+ Company[[ data['model']=='account.account' and ' ' or removeParentNode('para') ]]
+ Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]
+ |
Fiscal Year
|
@@ -233,7 +235,11 @@
[[ get_fiscalyear(data) or '' ]]
|
- [[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']] |
+
+ All[[ data['form']['display_account']=='all' and ' ' or removeParentNode('para') ]]
+ With movements[[ data['form']['display_account']=='movement' and ' ' or removeParentNode('para') ]]
+ With balance is not equal to 0[[ data['form']['display_account']=='not_zero' and ' ' or removeParentNode('para') ]]
+ |
[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]]
[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
diff --git a/addons/account/report/account_general_journal.rml b/addons/account/report/account_general_journal.rml
index 4ad086d6bd4..dce30e59918 100644
--- a/addons/account/report/account_general_journal.rml
+++ b/addons/account/report/account_general_journal.rml
@@ -220,8 +220,8 @@
- | [[ data['model']=='account.journal.period' and 'Company' or removeParentNode('para') ]]
- [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]] |
+ Company[[ data['model']=='account.journal.period' and ' ' or removeParentNode('para') ]]
+ Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]] |
Fiscal Year |
Journals |
Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]] |
diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml
index 7ae5db98f20..c5d24343148 100644
--- a/addons/account/report/account_general_ledger_landscape.rml
+++ b/addons/account/report/account_general_ledger_landscape.rml
@@ -360,9 +360,8 @@
|
- [[ data['model']=='account.account' and 'Company' or removeParentNode('para') ]]
- [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]
- |
+ Company[[ data['model']=='account.account' and ' ' or removeParentNode('para') ]]
+ Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]
Fiscal Year
|
@@ -395,7 +394,9 @@
[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]
- [[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']]
+ All[[ data['form']['display_account']=='all' and ' ' or removeParentNode('para') ]]
+ With movements[[ data['form']['display_account']=='movement' and ' ' or removeParentNode('para') ]]
+ With balance is not equal to 0[[ data['form']['display_account']=='not_zero' and ' ' or removeParentNode('para') ]]
|
[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]]
diff --git a/addons/account/report/account_journal.py b/addons/account/report/account_journal.py
index 769a8335f55..97e19be4b0c 100644
--- a/addons/account/report/account_journal.py
+++ b/addons/account/report/account_journal.py
@@ -189,11 +189,12 @@ class journal_print(report_sxw.rml_parse, common_report_header):
return data['form']['amount_currency']
def _get_sortby(self, data):
+ # TODO: deprecated, to remove in trunk
if self.sort_selection == 'date':
- return 'Date'
+ return self._translate('Date')
elif self.sort_selection == 'ref':
- return 'Reference Number'
- return 'Date'
+ return self._translate('Reference Number')
+ return self._translate('Date')
report_sxw.report_sxw('report.account.journal.period.print', 'account.journal.period', 'addons/account/report/account_journal.rml', parser=journal_print, header='external')
report_sxw.report_sxw('report.account.journal.period.print.sale.purchase', 'account.journal.period', 'addons/account/report/account_journal_sale_purchase.rml', parser=journal_print, header='external')
diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml
index fb203d4e664..6d606ed1937 100644
--- a/addons/account/report/account_journal.rml
+++ b/addons/account/report/account_journal.rml
@@ -186,8 +186,8 @@
- | [[ data['model']=='account.journal.period'and 'Company' or removeParentNode('para') ]]
- [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]] |
+ Company[[ data['model']=='account.journal.period'and ' ' or removeParentNode('para') ]]
+ Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]] |
Fiscal Year |
Journal |
Period |
@@ -199,8 +199,10 @@
[[ get_fiscalyear(data) or '' ]] |
[[ o.journal_id.name ]] |
[[ o.period_id.name ]] |
- [[ get_sortby(data) ]] |
- [[ get_target_move(data) ]] |
+
+ Date[[ data['form'].get('sort_selection', 'date') == 'date' and ' ' or removeParentNode('para') ]]
+ Reference Number[[ data['form'].get('sort_selection', 'date') == 'ref' and ' ' or removeParentNode('para') ]]
+ |
diff --git a/addons/account/report/account_partner_ledger.py b/addons/account/report/account_partner_ledger.py
index 21c1ee3d846..d21323e02fc 100644
--- a/addons/account/report/account_partner_ledger.py
+++ b/addons/account/report/account_partner_ledger.py
@@ -267,12 +267,13 @@ class third_party_ledger(report_sxw.rml_parse, common_report_header):
return result_tmp + result_init
def _get_partners(self):
+ # TODO: deprecated, to remove in trunk
if self.result_selection == 'customer':
- return 'Receivable Accounts'
+ return _('Receivable Accounts')
elif self.result_selection == 'supplier':
- return 'Payable Accounts'
+ return _('Payable Accounts')
elif self.result_selection == 'customer_supplier':
- return 'Receivable and Payable Accounts'
+ return _('Receivable and Payable Accounts')
return ''
def _sum_currency_amount_account(self, account, form):
diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml
index 0d7122369c6..48ed6d4afe3 100644
--- a/addons/account/report/account_partner_ledger.rml
+++ b/addons/account/report/account_partner_ledger.rml
@@ -423,7 +423,9 @@
|
- [[ get_partners() ]]
+ Receivable Accounts[[ data['form'].get('result_selection', 'customer') == 'customer' or removeParentNode('para') ]]
+ Payable Accounts[[ data['form'].get('result_selection', 'customer') == 'supplier' or removeParentNode('para') ]]
+ Receivable and Payable Accounts[[ data['form'].get('result_selection', 'customer') == 'customer_supplier' or removeParentNode('para') ]]
|
[[ get_target_move(data) ]]
diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index 52a35327845..229ef3e4167 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -175,7 +175,7 @@ class account_common_report(osv.osv_memory):
data['form'][field] = data['form'][field][0]
used_context = self._build_contexts(cr, uid, ids, data, context=context)
data['form']['periods'] = used_context.get('periods', False) and used_context['periods'] or []
- data['form']['used_context'] = used_context
+ data['form']['used_context'] = dict(used_context, lang=context.get('lang', 'en_US'))
return self._print_report(cr, uid, ids, data, context=context)
account_common_report()
| | |