From a62aacaf7cc2d428f1b941a9546efeeb2ec807c9 Mon Sep 17 00:00:00 2001 From: "Rucha (Open ERP)" Date: Fri, 24 Jun 2011 19:08:00 +0530 Subject: [PATCH 1/4] [IMP]: base_setup: Added context to open company wizard with data filled bzr revid: rpa@tinyerp.com-20110624133800-q3owydbtbwz54e7d --- addons/base_setup/base_setup_todo.xml | 1 + addons/base_setup/todo.py | 140 +++----------------------- 2 files changed, 17 insertions(+), 124 deletions(-) diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml index 7ea8e9e3a05..6408cc08bba 100644 --- a/addons/base_setup/base_setup_todo.xml +++ b/addons/base_setup/base_setup_todo.xml @@ -8,6 +8,7 @@ form form + {'res_id': 1} diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py index 5cf3eb0c43c..3fa590bc9b5 100644 --- a/addons/base_setup/todo.py +++ b/addons/base_setup/todo.py @@ -18,10 +18,8 @@ # along with this program. If not, see . # ############################################################################## -from operator import itemgetter -from osv import osv, fields -import netsvc +from osv import osv import tools class base_setup_company(osv.osv_memory): @@ -29,131 +27,25 @@ class base_setup_company(osv.osv_memory): """ _name = 'base.setup.company' _inherit = 'res.config' - logger = netsvc.Logger() - - def _get_all(self, cr, uid, model, context=None): - models = self.pool.get(model) - all_model_ids = models.search(cr, uid, []) - - output = [(False, '')] - output.extend( - sorted([(o.id, o.name) - for o in models.browse(cr, uid, all_model_ids, - context=context)], - key=itemgetter(1))) - return output - - def _get_all_states(self, cr, uid, context=None): - return self._get_all( - cr, uid, 'res.country.state', context=context) - def _get_all_countries(self, cr, uid, context=None): - return self._get_all(cr, uid, 'res.country', context=context) - - def _show_company_data(self, cr, uid, context=None): - # We only want to show the default company data in demo mode, otherwise users tend to forget - # to fill in the real company data in their production databases - return self.pool.get('ir.model.data').get_object(cr, uid, 'base', 'module_meta_information').demo - - - def default_get(self, cr, uid, fields_list=None, context=None): - """ get default company if any, and the various other fields - from the company's fields - """ - defaults = super(base_setup_company, self)\ - .default_get(cr, uid, fields_list=fields_list, context=context) - companies = self.pool.get('res.company') - company_id = companies.search(cr, uid, [], limit=1, order="id") - if not company_id or 'company_id' not in fields_list: - return defaults - company = companies.browse(cr, uid, company_id[0], context=context) - defaults['company_id'] = company.id - - if not self._show_company_data(cr, uid, context=context): - return defaults - - defaults['currency'] = company.currency_id.id - for field in ['name','rml_header1','rml_footer1','rml_footer2']: - defaults[field] = company[field] - - if company.partner_id.address: - address = company.partner_id.address[0] - for field in ['street','street2','zip','city','email','phone']: - defaults[field] = address[field] - for field in ['country_id','state_id']: - if address[field]: - defaults[field] = address[field].id - - return defaults - - _columns = { - 'company_id':fields.many2one('res.company', 'Company'), - 'name':fields.char('Company Name', size=64, required=True), - 'street':fields.char('Street', size=128), - 'street2':fields.char('Street 2', size=128), - 'zip':fields.char('Zip Code', size=24), - 'city':fields.char('City', size=128), - 'state_id':fields.selection(_get_all_states, 'Fed. State'), - 'country_id':fields.selection(_get_all_countries, 'Country'), - 'email':fields.char('E-mail', size=64), - 'phone':fields.char('Phone', size=64), - 'currency':fields.many2one('res.currency', 'Currency', required=True), - 'rml_header1':fields.char('Report Header', size=200, - help='''This sentence will appear at the top right corner of your reports. -We suggest you to put a slogan here: -"Open Source Business Solutions".'''), - 'rml_footer1':fields.char('Report Footer 1', size=200, - help='''This sentence will appear at the bottom of your reports. -We suggest you to write legal sentences here: -Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07'''), - 'rml_footer2':fields.char('Report Footer 2', size=200, - help='''This sentence will appear at the bottom of your reports. -We suggest you to put bank information here: -IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701'''), - 'account_no':fields.char('Bank Account No', size=64), - 'website': fields.char('Company Website', size=64, help="Example: http://openerp.com"), - } def execute(self, cr, uid, ids, context=None): - assert len(ids) == 1, "We should only get one object from the form" - payload = self.browse(cr, uid, ids[0], context=context) - if not getattr(payload, 'company_id', None): - raise ValueError('Case where no default main company is setup ' - 'not handled yet') - company = payload.company_id - company.write({ - 'name':payload.name, - 'rml_header1':payload.rml_header1, - 'rml_footer1':payload.rml_footer1, - 'rml_footer2':payload.rml_footer2, - 'currency_id':payload.currency.id, - 'account_no':payload.account_no, - }) - - company.partner_id.write({ - 'name':payload.name, - 'website':payload.website, - }) - - address_data = { - 'name':payload.name, - 'street':payload.street, - 'street2':payload.street2, - 'zip':payload.zip, - 'city':payload.city, - 'email':payload.email, - 'phone':payload.phone, - 'country_id':int(payload.country_id), - 'state_id':int(payload.state_id), + 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' } - if company.partner_id.address: - company.partner_id.address[0].write( - address_data) - else: - self.pool.get('res.partner.address').create(cr, uid, - dict(address_data, - partner_id=int(company.partner_id)), - context=context) base_setup_company() class res_currency(osv.osv): From 111aaad609ade44cac0ee5a0dbd426b825678d7a Mon Sep 17 00:00:00 2001 From: "Rucha (Open ERP)" Date: Mon, 27 Jun 2011 11:43:40 +0530 Subject: [PATCH 2/4] [REM]: base_setup: Removed unused code, cleaned code bzr revid: rpa@tinyerp.com-20110627061340-yk7f5shyzj1qvcrj --- addons/base_setup/__init__.py | 1 - addons/base_setup/__openerp__.py | 1 - addons/base_setup/base_setup_installer.xml | 75 ++++++++++++++-------- addons/base_setup/base_setup_todo.xml | 23 ------- addons/base_setup/installer.py | 20 ++++++ addons/base_setup/todo.py | 68 -------------------- 6 files changed, 67 insertions(+), 121 deletions(-) delete mode 100644 addons/base_setup/base_setup_todo.xml delete mode 100644 addons/base_setup/todo.py 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: From d5f84bcceffd0708f9d2dc61fdebc802345e0ebb Mon Sep 17 00:00:00 2001 From: "Rucha (Open ERP)" Date: Tue, 28 Jun 2011 15:25:16 +0530 Subject: [PATCH 3/4] [REM]: base_setup: Moved name_get of res.currency at server side bzr revid: rpa@tinyerp.com-20110628095516-nb986uegxx0w6w5p --- addons/base_setup/installer.py | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py index 8473214d20f..56a61eecc3b 100644 --- a/addons/base_setup/installer.py +++ b/addons/base_setup/installer.py @@ -320,22 +320,4 @@ 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: From 216bc993ad3a5744852498972f0bedcc29372cd3 Mon Sep 17 00:00:00 2001 From: "Rucha (Open ERP)" Date: Tue, 28 Jun 2011 17:31:11 +0530 Subject: [PATCH 4/4] [IMP]: base_setup: Instead of putting static id to open company put res.company_id.id (improved code in launch to eval user) bzr revid: rpa@tinyerp.com-20110628120111-rg56qruod14kgfgt --- addons/base_setup/base_setup_installer.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml index 96ccb8aedcd..1e01cd3ed51 100644 --- a/addons/base_setup/base_setup_installer.xml +++ b/addons/base_setup/base_setup_installer.xml @@ -311,7 +311,7 @@ form form - {'res_id': 1} + {'res_id': user.company_id.id}