From 1aeb8968fe0dd84f119753fcb01cc77f3f5e31b6 Mon Sep 17 00:00:00 2001 From: Guewen Baconnier Date: Mon, 13 Jan 2014 10:33:02 +0100 Subject: [PATCH] [CHG] allows to select all the journal types in the Journals report, remove the second menu (it was hidden because the action had the same name --- .../report_menus.xml | 11 ++++++---- .../wizard/print_journal.py | 20 ------------------- .../wizard/print_journal_view.xml | 11 ---------- 3 files changed, 7 insertions(+), 35 deletions(-) diff --git a/account_financial_report_webkit/report_menus.xml b/account_financial_report_webkit/report_menus.xml index aeb9e0e4..22b86f8b 100644 --- a/account_financial_report_webkit/report_menus.xml +++ b/account_financial_report_webkit/report_menus.xml @@ -26,10 +26,13 @@ parent="account.menu_journals_report" action="action_account_print_journal_menu_webkit" groups="account.group_account_manager,account.group_account_user" id="account.menu_account_print_journal"/> - + + + base.group_no_one + diff --git a/account_financial_report_webkit/wizard/print_journal.py b/account_financial_report_webkit/wizard/print_journal.py index dfb514c5..c669308e 100644 --- a/account_financial_report_webkit/wizard/print_journal.py +++ b/account_financial_report_webkit/wizard/print_journal.py @@ -105,26 +105,6 @@ class AccountReportPrintJournalWizard(orm.TransientModel): res['value'] = {'period_from': start_period, 'period_to': end_period, 'date_from': False, 'date_to': False} return res - def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): - ''' - used to set the domain on 'journal_ids' field: we exclude or only propose the journals of type - sale/purchase (+refund) accordingly to the presence of the key 'sale_purchase_only' in the context. - ''' - if context is None: - context = {} - res = super(AccountReportPrintJournalWizard, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu) - doc = etree.XML(res['arch']) - - if context.get('sale_purchase_only'): - domain = "[('type', 'in', ('sale','purchase','sale_refund','purchase_refund'))]" - else: - domain = "[('type', 'not in', ('sale','purchase','sale_refund','purchase_refund'))]" - nodes = doc.xpath("//field[@name='journal_ids']") - for node in nodes: - node.set('domain', domain) - res['arch'] = etree.tostring(doc) - return res - def _print_report(self, cursor, uid, ids, data, context=None): context = context or {} # we update form with display account value diff --git a/account_financial_report_webkit/wizard/print_journal_view.xml b/account_financial_report_webkit/wizard/print_journal_view.xml index dfe8719b..5f8f9d35 100644 --- a/account_financial_report_webkit/wizard/print_journal_view.xml +++ b/account_financial_report_webkit/wizard/print_journal_view.xml @@ -86,16 +86,5 @@ account.journal.period - - Journals - ir.actions.act_window - print.journal.webkit - form - form - - {'sale_purchase_only':True} - new - -