From faefdc22e52775cfafe62dd89270f043f3a37350 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 28 Feb 2010 09:02:14 +0100
Subject: [PATCH] merge

bzr revid: fp@tinyerp.com-20100228080214-zhgkweltq2lv75xy
---
 bin/addons/base/base_update.xml |  2 +-
 bin/addons/base/res/res_user.py |  2 +-
 bin/osv/orm.py                  |  2 +-
 bin/tools/convert.py            | 19 +------------------
 4 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index a033724b3d3..2f20199a4d8 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -121,7 +121,7 @@
                         <page string="Roles">
                             <field colspan="4" nolabel="1" name="roles_id"/>
                         </page>
-                        <page string="Accepted Companies">
+                        <page string="Companies">
                             <field colspan="4" nolabel="1" name="company_ids" select="1"/>
                         </page>
                     </notebook>
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index eb4ca575391..ff61b9ec6fa 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -188,7 +188,7 @@ class users(osv.osv):
         'rules_id': fields.many2many('ir.rule.group', 'user_rule_group_rel', 'user_id', 'rule_group_id', 'Rules'),
         'company_id': fields.many2one('res.company', 'Company', required=True,
             help="The company this user is currently working for."),
-        'company_ids':fields.many2many('res.company','res_company_users_rel','user_id','cid','Accepted Companies'),
+        'company_ids':fields.many2many('res.company','res_company_users_rel','user_id','cid','Companies'),
         'context_lang': fields.selection(_lang_get, 'Language', required=True,
             help="Sets the language for the user's user interface, when UI "
                  "translations are available"),
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 47112ddff7d..e5ac1ba77a3 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1901,7 +1901,7 @@ class orm(orm_template):
                    d['__domain'] = [(groupby,'>=',alldata[d['id']][groupby] and datetime.datetime.strptime(alldata[d['id']][groupby][:7] + '-01','%Y-%m-%d').strftime('%Y-%m-%d') or False),\
                                     (groupby,'<=',alldata[d['id']][groupby] and datetime.datetime.strptime(alldata[d['id']][groupby][:7] + '-' + str(days),'%Y-%m-%d').strftime('%Y-%m-%d') or False)] + domain
                 elif fget[groupby]['type'] == 'many2one':
-                    d[groupby] = d[groupby] and d[groupby][1] or ''
+                    d[groupby] = d[groupby] and ((type(d[groupby])==type(1)) and d[groupby] or d[groupby][1])  or ''
 
             del alldata[d['id']][groupby]
             d.update(alldata[d['id']])
diff --git a/bin/tools/convert.py b/bin/tools/convert.py
index 4314651d084..cc5b5bdc5df 100644
--- a/bin/tools/convert.py
+++ b/bin/tools/convert.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
+
 import cStringIO
 import csv
 import logging
@@ -62,7 +63,6 @@ def _eval_xml(self,node, pool, cr, uid, idref, context=None):
                 f_search = node.get("search",'').encode('utf-8')
                 f_use = node.get("use",'id').encode('ascii')
                 f_name = node.get("name",'').encode('utf-8')
-
                 q = eval(f_search, idref)
                 ids = pool.get(f_model).search(cr, uid, q)
                 if f_use != 'id':
@@ -190,7 +190,6 @@ class assertion_report(object):
         return res
 
 class xml_import(object):
-
     @staticmethod
     def nodeattr2bool(node, attr, default=False):
         if not node.get(attr):
@@ -866,19 +865,3 @@ def convert_xml_import(cr, module, xmlfile, idref=None, mode='init', noupdate=Fa
     obj.parse(doc.getroot())
     return True
 
-def convert_xml_export(res):
-    uid=1
-    pool=pooler.get_pool(cr.dbname)
-    cr=pooler.db.cursor()
-    idref = {}
-    page = etree.Element ( 'terp' )
-    doc = etree.ElementTree ( page )
-    data = etree.SubElement ( page, 'data' )
-    text_node = etree.SubElement ( page, 'text' )
-    text_node.text = 'Some textual content.'
-    cr.commit()
-    cr.close()
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-