From fc57fe8d7dd0c553f20bc76af7f08df0d396150b Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Fri, 1 Oct 2010 16:44:55 +0530 Subject: [PATCH 1/2] [IMP] account_*: Remove group Administration/Configuration for accounting menues bzr revid: psi@tinyerp.co.in-20101001111455-88me8sklhwpzrnte --- addons/account/account_menuitem.xml | 18 +++++----- addons/account/account_view.xml | 2 +- addons/account/board_account_view.xml | 2 +- addons/account/security/account_security.xml | 34 +++++++++---------- .../wizard/account_move_journal_view.xml | 6 ++-- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml index ecce5df944f..c04da9dec65 100644 --- a/addons/account/account_menuitem.xml +++ b/addons/account/account_menuitem.xml @@ -3,17 +3,17 @@ - - + + - + - + - - + + @@ -24,12 +24,12 @@ - + + groups="group_account_user,group_account_manager"/> - + diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 79c3826cd65..8fca640bdf7 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1146,7 +1146,7 @@ id="menu_action_account_moves_all" parent="account.menu_finance_entries" sequence="1" - groups="group_account_user,group_account_manager,base.group_system" + groups="group_account_user,group_account_manager" /> diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml index e8aecb2033c..5ae2890fd20 100644 --- a/addons/account/board_account_view.xml +++ b/addons/account/board_account_view.xml @@ -49,7 +49,7 @@ - + diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml index de2fa4e91ef..37bb5297cb1 100644 --- a/addons/account/security/account_security.xml +++ b/addons/account/security/account_security.xml @@ -18,7 +18,7 @@ - + @@ -42,27 +42,27 @@ - + - + - + - + - + - + @@ -70,7 +70,7 @@ - + @@ -82,15 +82,15 @@ - + - + - + @@ -98,27 +98,27 @@ - + - + - + - + - + - + diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml index e2541d6d73d..5f5d404139a 100644 --- a/addons/account/wizard/account_move_journal_view.xml +++ b/addons/account/wizard/account_move_journal_view.xml @@ -21,7 +21,7 @@ {'journal_type':'sale','view_mode':False} new - + @@ -46,7 +46,7 @@ parent="menu_finance_payables" icon="STOCK_JUSTIFY_FILL" sequence="16" - groups="group_account_user,group_account_manager,base.group_system"/> + groups="group_account_user,group_account_manager"/> @@ -73,7 +73,7 @@ id="menu_action_account_moves_bank" parent="account.menu_finance_bank_and_cash" sequence="16" - groups="group_account_user,group_account_manager,base.group_system" + groups="group_account_user,group_account_manager" /> From 18ef31c26f96a5ae5caeb89efa9822456746648a Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Fri, 1 Oct 2010 16:52:06 +0530 Subject: [PATCH 2/2] [REM] Account: Remove query_line arguement from wizard methods bzr revid: mra@mra-laptop-20101001112206-orqbdit5iaprmwq2 --- .../wizard/account_report_account_balance.py | 4 ++-- .../wizard/account_report_aged_partner_balance.py | 6 +++--- .../account/wizard/account_report_balance_sheet.py | 4 ++-- .../wizard/account_report_central_journal.py | 4 ++-- addons/account/wizard/account_report_common.py | 13 ++++++------- .../account/wizard/account_report_common_account.py | 2 +- .../account/wizard/account_report_common_journal.py | 2 +- .../account/wizard/account_report_common_partner.py | 2 +- .../wizard/account_report_general_journal.py | 4 ++-- .../account/wizard/account_report_general_ledger.py | 4 ++-- .../wizard/account_report_partner_balance.py | 4 ++-- .../account/wizard/account_report_partner_ledger.py | 4 ++-- .../account/wizard/account_report_print_journal.py | 4 ++-- addons/account/wizard/account_report_profit_loss.py | 4 ++-- 14 files changed, 30 insertions(+), 31 deletions(-) diff --git a/addons/account/wizard/account_report_account_balance.py b/addons/account/wizard/account_report_account_balance.py index ed37395acb5..475a7da5a74 100644 --- a/addons/account/wizard/account_report_account_balance.py +++ b/addons/account/wizard/account_report_account_balance.py @@ -49,8 +49,8 @@ class account_balance_report(osv.osv_memory): res['arch'] = etree.tostring(doc) return res - def _print_report(self, cr, uid, ids, data, query_line, context=None): - data = self.pre_print_report(cr, uid, ids, data, query_line, context=context) + def _print_report(self, cr, uid, ids, data, context=None): + data = self.pre_print_report(cr, uid, ids, data, context=context) data['form'].update(self.read(cr, uid, ids, ['target_move'])[0]) return {'type': 'ir.actions.report.xml', 'report_name': 'account.account.balance', 'datas': data} diff --git a/addons/account/wizard/account_report_aged_partner_balance.py b/addons/account/wizard/account_report_aged_partner_balance.py index 10548095131..f421f3735fa 100644 --- a/addons/account/wizard/account_report_aged_partner_balance.py +++ b/addons/account/wizard/account_report_aged_partner_balance.py @@ -55,12 +55,12 @@ class account_aged_trial_balance(osv.osv_memory): res['arch'] = etree.tostring(doc) return res - def _print_report(self, cr, uid, ids, data, query_line, context=None): + def _print_report(self, cr, uid, ids, data, context=None): res = {} if context is None: context = {} - data = self.pre_print_report(cr, uid, ids, data, query_line, context=context) + data = self.pre_print_report(cr, uid, ids, data, context=context) data['form'].update(self.read(cr, uid, ids, ['period_length', 'direction_selection'])[0]) period_length = data['form']['period_length'] @@ -70,7 +70,7 @@ class account_aged_trial_balance(osv.osv_memory): raise osv.except_osv(_('UserError'), _('Enter a Start date !')) start = datetime.strptime(data['form']['date_from'], "%Y-%m-%d") - + if data['form']['direction_selection'] == 'past': for i in range(5)[::-1]: stop = start - relativedelta(days=period_length) diff --git a/addons/account/wizard/account_report_balance_sheet.py b/addons/account/wizard/account_report_balance_sheet.py index e3131e813c4..df6d58c9ae7 100644 --- a/addons/account/wizard/account_report_balance_sheet.py +++ b/addons/account/wizard/account_report_balance_sheet.py @@ -57,10 +57,10 @@ class account_bs_report(osv.osv_memory): res['arch'] = etree.tostring(doc) return res - def _print_report(self, cr, uid, ids, data, query_line, context=None): + def _print_report(self, cr, uid, ids, data, context=None): if context is None: context = {} - data = self.pre_print_report(cr, uid, ids, data, query_line, context=context) + data = self.pre_print_report(cr, uid, ids, data, context=context) account = self.pool.get('account.account').browse(cr, uid, data['form']['chart_account_id']) if not account.company_id.property_reserve_and_surplus_account: raise osv.except_osv(_('Warning'),_('Please define the Reserve and Profit/Loss account for current user company !')) diff --git a/addons/account/wizard/account_report_central_journal.py b/addons/account/wizard/account_report_central_journal.py index e762e6d0591..0b402ae5f3d 100644 --- a/addons/account/wizard/account_report_central_journal.py +++ b/addons/account/wizard/account_report_central_journal.py @@ -25,8 +25,8 @@ class account_central_journal(osv.osv_memory): _description = 'Account Central Journal' _inherit = "account.common.journal.report" - def _print_report(self, cr, uid, ids, data, query_line, context=None): - data = self.pre_print_report(cr, uid, ids, data, query_line, context=context) + def _print_report(self, cr, uid, ids, data, context=None): + data = self.pre_print_report(cr, uid, ids, data, context=context) return { 'type': 'ir.actions.report.xml', 'report_name': 'account.central.journal', diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py index ff15585e655..307c50673ca 100644 --- a/addons/account/wizard/account_report_common.py +++ b/addons/account/wizard/account_report_common.py @@ -63,10 +63,10 @@ class account_common_report(osv.osv_memory): if filter == 'filter_period' and fiscalyear_id: start_period = end_period = False cr.execute(''' - SELECT * FROM (SELECT p.id - FROM account_period p - LEFT JOIN account_fiscalyear f ON (p.fiscalyear_id = f.id) - WHERE f.id = %s + SELECT * FROM (SELECT p.id + FROM account_period p + LEFT JOIN account_fiscalyear f ON (p.fiscalyear_id = f.id) + WHERE f.id = %s ORDER BY p.date_start ASC LIMIT 1) AS period_start UNION @@ -134,7 +134,7 @@ class account_common_report(osv.osv_memory): result_initial_bal['date_to'] = (datetime.datetime.strptime(fiscal_date_start, "%Y-%m-%d") + timedelta(days=-1)).strftime('%Y-%m-%d') return result, result_initial_bal - def _print_report(self, cr, uid, ids, data, query_line, context=None): + def _print_report(self, cr, uid, ids, data, context=None): raise (_('Error'), _('not implemented')) def check_report(self, cr, uid, ids, context=None): @@ -146,11 +146,10 @@ class account_common_report(osv.osv_memory): data['model'] = context.get('active_model', 'ir.ui.menu') data['form'] = self.read(cr, uid, ids, ['date_from', 'date_to', 'fiscalyear_id', 'journal_ids', 'period_from', 'period_to', 'filter', 'chart_account_id'])[0] used_context, used_context_initial_bal = self._build_contexts(cr, uid, ids, data, context=context) - query_line = obj_move._query_get(cr, uid, obj='l', context=used_context) data['form']['periods'] = used_context.get('periods', False) and used_context['periods'] or [] data['form']['used_context'] = used_context data['form']['used_context_initial_bal'] = used_context_initial_bal - return self._print_report(cr, uid, ids, data, query_line, context=context) + return self._print_report(cr, uid, ids, data, context=context) account_common_report() diff --git a/addons/account/wizard/account_report_common_account.py b/addons/account/wizard/account_report_common_account.py index 4f84d8f3264..794406854a7 100644 --- a/addons/account/wizard/account_report_common_account.py +++ b/addons/account/wizard/account_report_common_account.py @@ -35,7 +35,7 @@ class account_common_account_report(osv.osv_memory): 'display_account': 'bal_all', } - def pre_print_report(self, cr, uid, ids, data, query_line, context=None): + def pre_print_report(self, cr, uid, ids, data, context=None): if context is None: context = {} data['form'].update(self.read(cr, uid, ids, ['display_account'])[0]) diff --git a/addons/account/wizard/account_report_common_journal.py b/addons/account/wizard/account_report_common_journal.py index 44ee8448316..9ec12b16177 100644 --- a/addons/account/wizard/account_report_common_journal.py +++ b/addons/account/wizard/account_report_common_journal.py @@ -38,7 +38,7 @@ class account_common_journal_report(osv.osv_memory): result['periods'] = map(lambda x: x[0], cr.fetchall()) return result - def pre_print_report(self, cr, uid, ids, data, query_line, context=None): + def pre_print_report(self, cr, uid, ids, data, context=None): if context is None: context = {} data['form'].update(self.read(cr, uid, ids, ['amount_currency'])[0]) diff --git a/addons/account/wizard/account_report_common_partner.py b/addons/account/wizard/account_report_common_partner.py index 64bbde2cdd3..35ece1c0b02 100644 --- a/addons/account/wizard/account_report_common_partner.py +++ b/addons/account/wizard/account_report_common_partner.py @@ -39,7 +39,7 @@ class account_common_partner_report(osv.osv_memory): 'target_move': 'all' } - def pre_print_report(self, cr, uid, ids, data, query_line, context=None): + def pre_print_report(self, cr, uid, ids, data, context=None): if context is None: context = {} data['form'].update(self.read(cr, uid, ids, ['result_selection', 'target_move'])[0]) diff --git a/addons/account/wizard/account_report_general_journal.py b/addons/account/wizard/account_report_general_journal.py index 67eea1e2c89..af091d9bc08 100644 --- a/addons/account/wizard/account_report_general_journal.py +++ b/addons/account/wizard/account_report_general_journal.py @@ -26,8 +26,8 @@ class account_general_journal(osv.osv_memory): _name = 'account.general.journal' _description = 'Account General Journal' - def _print_report(self, cr, uid, ids, data, query_line, context=None): - data = self.pre_print_report(cr, uid, ids, data, query_line, context=context) + def _print_report(self, cr, uid, ids, data, context=None): + data = self.pre_print_report(cr, uid, ids, data, context=context) return {'type': 'ir.actions.report.xml', 'report_name': 'account.general.journal', 'datas': data} account_general_journal() diff --git a/addons/account/wizard/account_report_general_ledger.py b/addons/account/wizard/account_report_general_ledger.py index ada80db1762..0ba3cd00684 100644 --- a/addons/account/wizard/account_report_general_ledger.py +++ b/addons/account/wizard/account_report_general_ledger.py @@ -49,10 +49,10 @@ class account_report_general_ledger(osv.osv_memory): res['value'] = {'initial_balance': False} return res - def _print_report(self, cr, uid, ids, data, query_line, context=None): + def _print_report(self, cr, uid, ids, data, context=None): if context is None: context = {} - data = self.pre_print_report(cr, uid, ids, data, query_line, context=context) + data = self.pre_print_report(cr, uid, ids, data, context=context) data['form'].update(self.read(cr, uid, ids, ['landscape', 'initial_balance', 'amount_currency', 'sortby', 'target_move'])[0]) if not data['form']['fiscalyear_id']:# GTK client problem onchange does not consider in save record data['form'].update({'initial_balance': False}) diff --git a/addons/account/wizard/account_report_partner_balance.py b/addons/account/wizard/account_report_partner_balance.py index 744e8bf5fc1..43081b046ba 100644 --- a/addons/account/wizard/account_report_partner_balance.py +++ b/addons/account/wizard/account_report_partner_balance.py @@ -40,10 +40,10 @@ class account_partner_balance(osv.osv_memory): 'display_partner': 'non-zero_balance', } - def _print_report(self, cr, uid, ids, data, query_line, context=None): + def _print_report(self, cr, uid, ids, data, context=None): if context is None: context = {} - data = self.pre_print_report(cr, uid, ids, data, query_line, context=context) + data = self.pre_print_report(cr, uid, ids, data, context=context) data['form'].update(self.read(cr, uid, ids, ['display_partner'])[0]) return { 'type': 'ir.actions.report.xml', diff --git a/addons/account/wizard/account_report_partner_ledger.py b/addons/account/wizard/account_report_partner_ledger.py index e0e3778966b..1a09a6344f4 100644 --- a/addons/account/wizard/account_report_partner_ledger.py +++ b/addons/account/wizard/account_report_partner_ledger.py @@ -43,10 +43,10 @@ class account_partner_ledger(osv.osv_memory): 'page_split': False, } - def _print_report(self, cr, uid, ids, data, query_line, context=None): + def _print_report(self, cr, uid, ids, data, context=None): if context is None: context = {} - data = self.pre_print_report(cr, uid, ids, data, query_line, context=context) + data = self.pre_print_report(cr, uid, ids, data, context=context) data['form'].update(self.read(cr, uid, ids, ['initial_balance', 'reconcil', 'page_split', 'amount_currency'])[0]) if data['form']['page_split']: return { diff --git a/addons/account/wizard/account_report_print_journal.py b/addons/account/wizard/account_report_print_journal.py index 096678860ac..f264524dc4b 100644 --- a/addons/account/wizard/account_report_print_journal.py +++ b/addons/account/wizard/account_report_print_journal.py @@ -38,10 +38,10 @@ class account_print_journal(osv.osv_memory): 'target_move': 'all' } - def _print_report(self, cr, uid, ids, data, query_line, context=None): + def _print_report(self, cr, uid, ids, data, context=None): if context is None: context = {} - data = self.pre_print_report(cr, uid, ids, data, query_line, context=context) + data = self.pre_print_report(cr, uid, ids, data, context=context) data['form'].update(self.read(cr, uid, ids, ['sort_selection','target_move'])[0]) return {'type': 'ir.actions.report.xml', 'report_name': 'account.journal.period.print', 'datas': data} diff --git a/addons/account/wizard/account_report_profit_loss.py b/addons/account/wizard/account_report_profit_loss.py index fd73571d7f5..bc36e233685 100644 --- a/addons/account/wizard/account_report_profit_loss.py +++ b/addons/account/wizard/account_report_profit_loss.py @@ -50,10 +50,10 @@ class account_pl_report(osv.osv_memory): res['arch'] = etree.tostring(doc) return res - def _print_report(self, cr, uid, ids, data, query_line, context=None): + def _print_report(self, cr, uid, ids, data, context=None): if context is None: context = {} - data = self.pre_print_report(cr, uid, ids, data, query_line, context=context) + data = self.pre_print_report(cr, uid, ids, data, context=context) data['form'].update(self.read(cr, uid, ids, ['display_type'])[0]) if data['form']['display_type']: return {