diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml index 991e084039b..946c776a28b 100644 --- a/addons/account/res_config_view.xml +++ b/addons/account/res_config_view.xml @@ -116,7 +116,7 @@ + sequence="14" action="action_account_config"/> diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py index 82fe6ca3601..e425344e380 100644 --- a/addons/base_setup/__init__.py +++ b/addons/base_setup/__init__.py @@ -20,5 +20,6 @@ ############################################################################## import base_setup +import res_config # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py index 093f2f492ff..343ca8cb286 100644 --- a/addons/base_setup/__openerp__.py +++ b/addons/base_setup/__openerp__.py @@ -36,7 +36,7 @@ Shows you a list of applications features to install from. 'website': 'http://www.openerp.com', 'depends': ['base'], 'init_xml': [], - 'update_xml': ['security/ir.model.access.csv', 'base_setup_views.xml' ], + 'update_xml': ['security/ir.model.access.csv', 'base_setup_views.xml', 'res_config_view.xml'], 'demo_xml': [], 'installable': True, 'auto_install': True, diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py index a3effd98148..6d23ed9bd9a 100644 --- a/addons/base_setup/base_setup.py +++ b/addons/base_setup/base_setup.py @@ -18,7 +18,6 @@ # along with this program. If not, see . # ############################################################################## -import pytz import simplejson import cgi @@ -75,61 +74,6 @@ class product_installer(osv.osv_memory): if val.customers == 'import': return {'type': 'ir.actions.act_window'} -# Define users preferences for new users (ir.values) - -def _lang_get(self, cr, uid, context=None): - obj = self.pool.get('res.lang') - ids = obj.search(cr, uid, [('translatable','=',True)]) - res = obj.read(cr, uid, ids, ['code', 'name'], context=context) - res = [(r['code'], r['name']) for r in res] - return res - -def _tz_get(self,cr,uid, context=None): - return [(x, x) for x in pytz.all_timezones] - -class user_preferences_config(osv.osv_memory): - _name = 'user.preferences.config' - _inherit = 'res.config' - _columns = { - 'context_tz': fields.selection(_tz_get, 'Timezone', size=64, - help="Set default for new user's timezone, used to perform timezone conversions " - "between the server and the client."), - 'context_lang': fields.selection(_lang_get, 'Language', required=True, - help="Sets default language for the all user interface, when UI " - "translations are available. If you want to Add new Language, you can add it from 'Load an Official Translation' wizard from 'Administration' menu."), - 'view': fields.selection([('simple','Simplified'), - ('extended','Extended')], - 'Interface', required=True, help= "If you use OpenERP for the first time we strongly advise you to select the simplified interface, which has less features but is easier. You can always switch later from the user preferences." ), - 'menu_tips': fields.boolean('Display Tips', help="Check out this box if you want to always display tips on each menu action"), - - } - _defaults={ - 'view' : lambda self,cr,uid,*args: self.pool.get('res.users').browse(cr, uid, uid).view or 'simple', - 'context_lang' : 'en_US', - 'menu_tips' : True - } - - def default_get(self, cr, uid, fields, context=None): - if context is None: - context = {} - res = super(user_preferences_config, self).default_get(cr, uid, fields, context=context) - res_default = self.pool.get('ir.values').get(cr, uid, 'default', False, ['res.users']) - for id, field, value in res_default: - res.update({field: value}) - return res - - def execute(self, cr, uid, ids, context=None): - user_obj = self.pool.get('res.users') - user_ids = user_obj.search(cr, uid, [], context=context) - for o in self.browse(cr, uid, ids, context=context): - user_obj.write(cr , uid, user_ids ,{'context_tz' : o.context_tz, 'context_lang' : o.context_lang, 'view' : o.view, 'menu_tips' : o.menu_tips}, context=context) - ir_values_obj = self.pool.get('ir.values') - ir_values_obj.set(cr, uid, 'default', False, 'context_tz', ['res.users'], o.context_tz) - ir_values_obj.set(cr, uid, 'default', False, 'context_lang', ['res.users'], o.context_lang) - ir_values_obj.set(cr, uid, 'default', False, 'view', ['res.users'], o.view) - ir_values_obj.set(cr, uid, 'default', False, 'menu_tips', ['res.users'], o.menu_tips) - return {} - # Specify Your Terminology class specify_partner_terminology(osv.osv_memory): diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml index 40e88c604ef..f0d86128b57 100644 --- a/addons/base_setup/base_setup_views.xml +++ b/addons/base_setup/base_setup_views.xml @@ -1,69 +1,6 @@ - - - Set default users preferences - user.preferences.config - form - - - -
- Define Users's Preferences -
- - Define Users's Preferences - - - This will set the default preferences for new users and update all existing ones. Afterwards, users are free to change those values on their own user preference form. - - - - 12 - - - - - - - - - - - - - - Define default users preferences - ir.actions.act_window - user.preferences.config - form - - form - new - - - - - once - - - - - Create Additional Users - ir.actions.act_window - res.users - form - tree,form - - - - - - 1000 - - - Specify Your Terminology @@ -110,23 +47,6 @@ --> - - - Set Company Header and Footer - ir.actions.act_window - res.company - - form - form - {'res_id': user.company_id.id} - Fill in your company data (address, logo, bank accounts) so that it's printed on your reports. You can click on the button 'Preview Header' in order to check the header/footer of PDF documents. - - - - - 1 - - sale settings sale.config.settings diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py new file mode 100644 index 00000000000..92914f8f7a3 --- /dev/null +++ b/addons/base_setup/res_config.py @@ -0,0 +1,40 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Business Applications +# Copyright (C) 2004-2012 OpenERP S.A. (). +# +# 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, fields + +class base_config_settings(osv.osv_memory): + _name = 'base.config.settings' + _inherit = 'res.config.settings' + _columns = { + 'module_multi_company': fields.boolean('Multi Company', + help="""Work in multi-company environments, with appropriate security access between companies. + This installs the module multi_company."""), + 'module_portal': fields.boolean('Portal', + help="""Define a portal for your customers or suppliers. The portal is a group of + external users that has specific access rights and rules. + This installs the module portal."""), + 'module_share': fields.boolean('Share', + help="""Share OpenERP documents (records) with external users. + This installs the module share."""), + } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml new file mode 100644 index 00000000000..f9c851a3002 --- /dev/null +++ b/addons/base_setup/res_config_view.xml @@ -0,0 +1,41 @@ + + + + + General Settings + base.config.settings + form + +
+
+
+ + + + + +