diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 73fa7fc1953..3eb53ff2aa7 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -94,30 +94,30 @@
@@ -158,15 +158,15 @@
-
+
-
-
+
+
-
+
@@ -238,8 +238,8 @@
-
-
+
+
@@ -256,11 +256,11 @@
-
+
-
+
@@ -268,27 +268,27 @@
@@ -301,14 +301,14 @@
-
+
-
-
+
+
-
+
@@ -457,7 +457,7 @@
form
@@ -539,7 +539,7 @@
-
+
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index e5ac1ba77a3..88058aa10c3 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -247,7 +247,7 @@ class browse_record(object):
new_data[n] = self._list_class([browse_record(self._cr, self._uid, id, self._table.pool.get(f._obj), self._cache, context=self._context, list_class=self._list_class, fields_process=self._fields_process) for id in data[n]], self._context)
else:
new_data[n] = data[n]
- self._data[data['id']].update(new_data)
+ self._data[data['id']].update(new_data)
if not name in self._data[self._id]:
#how did this happen?
self.logger.notifyChannel("browse_record", netsvc.LOG_ERROR,
@@ -1100,7 +1100,7 @@ class orm_template(object):
if column._domain and not isinstance(column._domain, (str, unicode)):
dom = column._domain
dom += eval(node.get('domain','[]'), {'uid':user, 'time':time})
- context.update(eval(node.get('context','{}')))
+ context.update(eval(node.get('context','{}')))
attrs['selection'] = self.pool.get(relation).name_search(cr, user, '', dom, context=context)
if (node.get('required') and not int(node.get('required'))) or not column.required:
attrs['selection'].append((False,''))
@@ -1836,7 +1836,7 @@ class orm(orm_template):
self.pool.get('ir.model.access').check(cr, uid, self._name, 'read', context=context)
if not fields:
fields = self._columns.keys()
-
+
(where_clause, where_params, tables) = self._where_calc(cr, uid, domain, context=context)
dom = self.pool.get('ir.rule').domain_get(cr, uid, self._name, context=context)
where_clause = where_clause + dom[0]
@@ -1844,10 +1844,10 @@ class orm(orm_template):
for t in dom[2]:
if t not in tables:
tables.append(t)
-
+
# Take care of adding join(s) if groupby is an '_inherits'ed field
- tables, where_clause = self._inherits_join_calc(groupby,tables,where_clause)
-
+ tables, where_clause = self._inherits_join_calc(groupby,tables,where_clause)
+
if len(where_clause):
where_clause = ' where '+string.join(where_clause, ' and ')
else:
@@ -1859,7 +1859,7 @@ class orm(orm_template):
float_int_fields = filter(lambda x: fget[x]['type'] in ('float','integer'), fields)
sum = {}
- group_by = groupby
+ group_by = groupby
if fget.get(groupby,False) and fget[groupby]['type'] in ('date','datetime'):
flist = "to_char(%s,'yyyy-mm') as %s "%(groupby,groupby)
groupby = "to_char(%s,'yyyy-mm')"%(groupby)
@@ -1876,7 +1876,7 @@ class orm(orm_template):
flist += ',avg('+f+') as '+f
else:
flist += ',sum('+f+') as '+f
-
+
cr.execute('select min(%s.id) as id,' % self._table + flist + ' from ' + ','.join(tables) + where_clause + ' group by '+ groupby + limit_str + offset_str, where_params)
alldata = {}
groupby = group_by
@@ -1909,10 +1909,10 @@ class orm(orm_template):
return data
def _inherits_join_calc(self, field, tables, where_clause):
- """ Adds missing table select and join clause(s) for reaching
+ """ Adds missing table select and join clause(s) for reaching
the field coming from an '_inherits' parent table.
@param tables: list of table._table names enclosed in double quotes as returned
- by _where_calc()
+ by _where_calc()
"""
current_table = self
while field in current_table._inherit_fields and not field in current_table._columns:
@@ -2053,12 +2053,12 @@ class orm(orm_template):
if isinstance(f, fields.one2many):
cr.execute("SELECT relname FROM pg_class WHERE relkind='r' AND relname=%s", (f._obj,))
-
+
if self.pool.get(f._obj):
if f._fields_id not in self.pool.get(f._obj)._columns.keys():
if not self.pool.get(f._obj)._inherits or (f._fields_id not in self.pool.get(f._obj)._inherit_fields.keys()):
raise except_orm('Programming Error', ("There is no reference field '%s' found for '%s'") % (f._fields_id,f._obj,))
-
+
if cr.fetchone():
cr.execute("SELECT count(1) as c FROM pg_class c,pg_attribute a WHERE c.relname=%s AND a.attname=%s AND c.oid=a.attrelid", (f._obj, f._fields_id))
res = cr.fetchone()[0]