diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py index 9ed5ec84535..2dab90b90b2 100644 --- a/addons/base_setup/__init__.py +++ b/addons/base_setup/__init__.py @@ -20,7 +20,6 @@ ############################################################################## import installer -import todo import wizard import os import base64 diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py index b3b93c21bb7..39a417460b0 100644 --- a/addons/base_setup/__openerp__.py +++ b/addons/base_setup/__openerp__.py @@ -39,7 +39,6 @@ It also helps to easily configure your company. 'update_xml': ['security/ir.model.access.csv', 'wizard/res_company_logo_view.xml', 'base_setup_installer.xml', - 'base_setup_todo.xml', ], 'demo_xml': ['base_setup_demo.xml'], 'installable': True, diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml index ba1b1ad665c..96ccb8aedcd 100644 --- a/addons/base_setup/base_setup_installer.xml +++ b/addons/base_setup/base_setup_installer.xml @@ -1,6 +1,6 @@ - + base.setup.installer.view base.setup.installer @@ -24,7 +24,7 @@ Install Applications - + @@ -44,18 +44,18 @@ - - - - - + + + + + - - - - - + + + + + @@ -77,7 +77,7 @@ 2 normal_recurring - + @@ -111,7 +111,7 @@ - + Migrate data from another application ir.actions.act_window @@ -121,16 +121,16 @@ form new - + normal skip - + - + Import or create customers ir.actions.act_window @@ -149,7 +149,7 @@ current skip - + @@ -196,16 +196,16 @@ - + normal skip - + - + Create New User's Login ir.actions.act_window @@ -214,7 +214,7 @@ form - + @@ -225,7 +225,7 @@ 1000 cancel - + - + + @@ -295,13 +295,32 @@ - + normal skip - - + + + + + Company Configuration + ir.actions.act_window + res.company + + form + form + {'res_id': 1} + + + + + + 1 + normal + skip + + diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml deleted file mode 100644 index 6408cc08bba..00000000000 --- a/addons/base_setup/base_setup_todo.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - Company Configuration - ir.actions.act_window - res.company - - form - form - {'res_id': 1} - - - - - - 1 - normal - skip - - - - diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py index 325edac8fd3..8473214d20f 100644 --- a/addons/base_setup/installer.py +++ b/addons/base_setup/installer.py @@ -22,6 +22,7 @@ from osv import fields, osv import pooler import pytz from tools.translate import _ +import tools class base_setup_installer(osv.osv_memory): _name = 'base.setup.installer' @@ -318,4 +319,23 @@ class specify_partner_terminology(osv.osv_memory): specify_partner_terminology() + +# this code is needed to be moved in main currency class +class res_currency(osv.osv): + _inherit = 'res.currency' + + def name_get(self, cr, uid, ids, context=None): + if context is None: + context = {} +# We can use the following line,if we want to restrict this name_get for company setup only +# But, its better to show currencies as name(Code). + if not len(ids): + return [] + if isinstance(ids, (int, long)): + ids = [ids] + reads = self.read(cr, uid, ids, ['name','symbol'], context, load='_classic_write') + return [(x['id'], tools.ustr(x['name']) + (x['symbol'] and (' (' + tools.ustr(x['symbol']) + ')') or '')) for x in reads] + +res_currency() + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py deleted file mode 100644 index 3fa590bc9b5..00000000000 --- a/addons/base_setup/todo.py +++ /dev/null @@ -1,68 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -from osv import osv -import tools - -class base_setup_company(osv.osv_memory): - """ - """ - _name = 'base.setup.company' - _inherit = 'res.config' - - def execute(self, cr, uid, ids, context=None): - ir_pool = self.pool.get('ir.model.data') - model, company_view_form = ir_pool.get_object_reference(cr, uid, 'base', 'view_company_form') - model, company_view_tree = ir_pool.get_object_reference(cr, uid, 'base', 'view_company_tree') - company_id = self.pool.get('res.users')._get_company(cr, uid, context=context) - return { - 'name': _('Configure Company'), - 'view_type': 'form', - 'view_mode': 'form,tree', - 'res_model': 'crm.lead', - 'domain': [('id', '=', company_id)], - 'res_id': company_id, - 'view_id': False, - 'views': [(company_view_form, 'form'), - (company_view_tree, 'tree')], - 'type': 'ir.actions.act_window' - } - -base_setup_company() - -class res_currency(osv.osv): - _inherit = 'res.currency' - - def name_get(self, cr, uid, ids, context=None): - if context is None: - context = {} -# We can use the following line,if we want to restrict this name_get for company setup only -# But, its better to show currencies as name(Code). - if not len(ids): - return [] - if isinstance(ids, (int, long)): - ids = [ids] - reads = self.read(cr, uid, ids, ['name','symbol'], context, load='_classic_write') - return [(x['id'], tools.ustr(x['name']) + (x['symbol'] and (' (' + tools.ustr(x['symbol']) + ')') or '')) for x in reads] - -res_currency() - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: