From dfe472f3ac0fdd5d452693f32281010ccbb449e9 Mon Sep 17 00:00:00 2001 From: Chris Biersbach Date: Mon, 1 Oct 2012 10:56:39 +0200 Subject: [PATCH] [FIX] fixed some.rml files, updated some .sxw files bzr revid: cbi@openerp.com-20121001085639-cbwbx7pqtqaw41vf --- addons/account/report/account_aged_partner_balance.rml | 3 ++- addons/account/report/account_balance.rml | 8 +++++--- addons/account/report/account_general_journal.rml | 4 ++-- .../account/report/account_general_ledger_landscape.rml | 8 +++++--- addons/account/report/account_journal.rml | 4 ++-- addons/account/report/account_journal_sale_purchase.rml | 4 ++-- addons/account_payment/report/order.rml | 6 +++--- addons/stock/report/picking.rml | 9 ++++++--- 8 files changed, 27 insertions(+), 19 deletions(-) diff --git a/addons/account/report/account_aged_partner_balance.rml b/addons/account/report/account_aged_partner_balance.rml index 787c7789495..a5211729579 100644 --- a/addons/account/report/account_aged_partner_balance.rml +++ b/addons/account/report/account_aged_partner_balance.rml @@ -166,7 +166,8 @@ Partners - [[ data['form']['direction_selection'] == 'future' and translate('Due') or translate('Not due') ]] + Due[[ data['form']['direction_selection'] == 'future' and ' ' or removeParentNode('para') + Not due[[ data['form']['direction_selection'] == 'past' 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 6a6375438ca..f532d7eb1d0 100644 --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -211,8 +211,8 @@ - [[ data['model']=='account.account' and 'Company'or removeParentNode('para') ]] - [[ data['model']=='ir.ui.menu' and translate('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 +233,9 @@ [[ get_fiscalyear(data) or '' ]] - [[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' and translate('With movements')) or translate('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') [[ not has_filter(data) 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 69cd931d29b..3c96f2e04af 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 translate('Company') or removeParentNode('para') ]] - [[ data['model']=='ir.ui.menu' and translate('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 8a6be8c4d46..35a6217db81 100644 --- a/addons/account/report/account_general_ledger_landscape.rml +++ b/addons/account/report/account_general_ledger_landscape.rml @@ -360,8 +360,8 @@ - [[ data['model']=='account.account' and translate('Company') or removeParentNode('para') ]] - [[ data['model']=='ir.ui.menu' and translate('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 +395,9 @@ [[', '.join([ lt or '' for lt in get_journal(data) ]) ]] - [[ (data['form']['display_account']=='all' and translate('All')) or (data['form']['display_account']=='movement' and translate('With movements')) or translate('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.rml b/addons/account/report/account_journal.rml index 407cc04c92d..117ff368bef 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 translate('Company') or removeParentNode('para') ]] - [[ data['model']=='ir.ui.menu' and translate('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 diff --git a/addons/account/report/account_journal_sale_purchase.rml b/addons/account/report/account_journal_sale_purchase.rml index 1b9c027fcea..a3fd8f0e97d 100644 --- a/addons/account/report/account_journal_sale_purchase.rml +++ b/addons/account/report/account_journal_sale_purchase.rml @@ -186,8 +186,8 @@ - [[ data['model']=='account.journal.period'and translate('Company') or removeParentNode('para') ]] - [[ data['model']=='ir.ui.menu' and translate('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 diff --git a/addons/account_payment/report/order.rml b/addons/account_payment/report/order.rml index 208b340ef46..e93474827fa 100644 --- a/addons/account_payment/report/order.rml +++ b/addons/account_payment/report/order.rml @@ -205,9 +205,9 @@ [[get_account_name(o.mode.bank_id.id)]] - [[ o.date_prefered == 'now' and translate('Now') or removeParentNode('para') ]] - [[ o.date_prefered == 'due' and translate('Due date') or removeParentNode('para') ]] - [[ o.date_prefered == 'fixed' and translate('Fixed date') or removeParentNode('para') ]] + Now[[ o.date_prefered == 'now' and ' ' or removeParentNode('para') ]] + Due date[[ o.date_prefered == 'due' and ' ' or removeParentNode('para') ]] + Fixed date[[ o.date_prefered == 'fixed' and ' ' or removeParentNode('para') ]] [[ o.user_id and o.user_id.company_id and o.user_id.company_id.currency_id and o.user_id.company_id.currency_id.name or '' ]] diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml index ea86e6ef6d3..7966d6efc6c 100644 --- a/addons/stock/report/picking.rml +++ b/addons/stock/report/picking.rml @@ -262,7 +262,9 @@ [[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]] - [[ move_lines.state == 'confirmed' and translate('Waiting Availability') or move_lines.state == 'done' and translate('Done') or move_lines.state == 'assigned' and translate('Available')]] + Waiting Availability[[ move_lines.state == 'confirmed' and ' ' or removeParentNode('para') ]] + Done[[ move_lines.state == 'done' and ' ' or removeParentNode('para') ]] + Available[[ move_lines.state == 'assigned' and ' ' or removeParentNode('para') ]] [[ (move_lines.location_id and move_lines.location_id.name) or '' ]] @@ -273,7 +275,7 @@ - [[ ([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting' )]) and translate('Non Assigned Products:') or removeParentNode('para') ]] + Non Assigned Products:[[ ([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting' )]) and ' ' or removeParentNode('para') ]]
[[ repeatIn([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting')],'move_lines') ]] @@ -287,7 +289,8 @@ [[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]] - [[ move_lines.state == 'draft' and translate('New') or move_lines.state == 'waiting' and translate('Waiting Another Move') ]] + New[[ move_lines.state == 'draft' and ' ' or removeParentNode('para') ]] + Waiting Another Move[[ move_lines.state == 'waiting' and ' ' or removeParentNode('para') ]] [[ (move_lines.location_id and move_lines.location_id.name) or '' ]]