merge

bzr revid: fp@tinyerp.com-20090512135728-c3kx94s5q0a2b8ev

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
 
 

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'),

bin/addons/base/res/partner/partner_demo.xml

@@ -102,7 +102,6 @@
             <field name="name">Bank Wealthy and sons</field>
         </record>
         <record id="res_partner_3" model="res.partner">
-            <field name="lang">en_US</field>
             <field name="name">China Export</field>
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
         </record>

bin/addons/base/res/partner/partner_view.xml

@@ -229,7 +229,7 @@
                         <field name="ref" select="1"/>
                         <field name="customer" select="1"/>
                         <field domain="[('domain', '=', 'partner')]" name="title"/>
-                        <field name="lang" select="2"/>
+                        <field name="lang" select="2" widget="selection"/>
                         <field name="supplier" select="2"/>
                     </group>
                     <notebook colspan="4">

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