From 111bec6d98db6954aeb99accb6751488e5ce957b Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Tue, 12 May 2009 09:57:47 +0200 Subject: [PATCH 1/2] [FIX] remove print. please use log-level=debug_rpc if you want track the rpc calls bzr revid: christophe@tinyerp.com-20090512075747-zvir83kpkzgie1pj --- bin/netsvc.py | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/netsvc.py b/bin/netsvc.py index a9a23e9e778..1a806d53766 100644 --- a/bin/netsvc.py +++ b/bin/netsvc.py @@ -232,7 +232,6 @@ class OpenERPDispatcher: self.log('service', service_name) self.log('method', method) self.log('params', params) - print "Terp Calling",service_name,method,params result = LocalService(service_name)(method, *params) self.log('result', result) return result From 454fac5991bfbda3dcc81651e483d905efdd9005 Mon Sep 17 00:00:00 2001 From: husen daudi Date: Tue, 12 May 2009 16:17:08 +0530 Subject: [PATCH 2/2] Changed lang from selection to many2one (ref:mpa) bzr revid: hda@hda-20090512104708-wo36wuanouglci8g --- bin/addons/base/res/__init__.py | 2 +- bin/addons/base/res/partner/partner.py | 9 +-------- bin/addons/base/res/partner/partner_demo.xml | 1 - bin/addons/base/res/partner/partner_view.xml | 2 +- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/bin/addons/base/res/__init__.py b/bin/addons/base/res/__init__.py index 91f47a8ba42..08dfa3f640d 100644 --- a/bin/addons/base/res/__init__.py +++ b/bin/addons/base/res/__init__.py @@ -24,11 +24,11 @@ import tools import country import bank +import res_lang import partner import res_currency import res_company import res_user -import res_lang import res_request diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py index 43b857c1cb6..72f06c0b2dd 100644 --- a/bin/addons/base/res/partner/partner.py +++ b/bin/addons/base/res/partner/partner.py @@ -118,13 +118,6 @@ def _partner_title_get(self, cr, uid, context={}): res = obj.read(cr, uid, ids, ['shortcut','name'], context) return [(r['shortcut'], r['name']) for r in res] -def _lang_get(self, cr, uid, context={}): - obj = self.pool.get('res.lang') - ids = obj.search(cr, uid, [], context=context) - res = obj.read(cr, uid, ids, ['code', 'name'], context) - return [(r['code'], r['name']) for r in res] + [('','')] - - class res_partner(osv.osv): _description='Partner' _name = "res.partner" @@ -136,7 +129,7 @@ class res_partner(osv.osv): 'parent_id': fields.many2one('res.partner','Main Company', select=2), 'child_ids': fields.one2many('res.partner', 'parent_id', 'Partner Ref.'), 'ref': fields.char('Code', size=64), - 'lang': fields.selection(_lang_get, 'Language', size=5, help="If the selected language is loaded in the system, all documents related to this partner will be printed in this language. If not, it will be english."), + 'lang': fields.many2one('res.lang', 'Language', help="If the selected language is loaded in the system, all documents related to this partner will be printed in this language. If not, it will be english."), 'user_id': fields.many2one('res.users', 'Dedicated Salesman', help='The internal user that is in charge of communicating with this partner if any.'), 'vat': fields.char('VAT',size=32 ,help="Value Added Tax number. Check the box if the partner is subjected to the VAT. Used by the VAT legal statement."), 'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'), diff --git a/bin/addons/base/res/partner/partner_demo.xml b/bin/addons/base/res/partner/partner_demo.xml index ced4f04ae99..731dda1187b 100644 --- a/bin/addons/base/res/partner/partner_demo.xml +++ b/bin/addons/base/res/partner/partner_demo.xml @@ -102,7 +102,6 @@ Bank Wealthy and sons - en_US China Export diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml index 127a44e4549..2a3796b127d 100644 --- a/bin/addons/base/res/partner/partner_view.xml +++ b/bin/addons/base/res/partner/partner_view.xml @@ -229,7 +229,7 @@ - +