Merge lp:~openerp-commiter/openobject-server/5.0-opw-4592-dhs into lp:openobject-server/5.0

[Dhruti Shastri(OpenERP)]

[Jay Vora (Serpent Consulting Services) (jayvora)]

Dhruti,

Kindly by the next time, take care of those unnecessary whitespaces.

Thanks.

=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2011-02-04 09:32:33 +0000
+++ bin/osv/orm.py	2011-03-30 04:57:36 +0000
@@ -388,7 +388,7 @@
                 #setting value to let the problem NOT occur next time
                 elif k in cols:
                     vals['select_level'] = cols[k]['select_level']
-            
+
             if k not in cols:
                 cr.execute('select nextval(%s)', ('ir_model_fields_id_seq',))
                 id = cr.fetchone()[0]
@@ -468,10 +468,10 @@
                 return 0.0
             elif field_type == 'integer':
                 return 0
-            elif field_type == 'boolean':   
-                return False                                
+            elif field_type == 'boolean':
+                return False
             return ''
-        
+
         def selection_field(in_field):
             col_obj = self.pool.get(in_field.keys()[0])
             if f[i] in col_obj._columns.keys():
@@ -479,20 +479,20 @@
             elif f[i] in col_obj._inherits.keys():
                 selection_field(col_obj._inherits)
             else:
-                return False    
-           
+                return False
+
         lines = []
         data = map(lambda x: '', range(len(fields)))
         done = []
         for fpos in range(len(fields)):
-            f = fields[fpos]            
+            f = fields[fpos]
             if f:
                 r = row
                 i = 0
                 while i < len(f):
                     if f[i] == 'db_id':
-                        r = r['id']                        
-                    elif f[i] == 'id':                        
+                        r = r['id']
+                    elif f[i] == 'id':
                         model_data = self.pool.get('ir.model.data')
                         data_ids = model_data.search(cr, uid, [('model','=',r._table_name),('res_id','=',r['id'])])
                         if len(data_ids):
@@ -506,7 +506,7 @@
                     else:
                         r = r[f[i]]
                         # To display external name of selection field when its exported
-                        if not context.get('import_comp',False):# Allow external name only if its not import compatible 
+                        if not context.get('import_comp',False):# Allow external name only if its not import compatible
                             cols = False
                             if f[i] in self._columns.keys():
                                 cols = self._columns[f[i]]
@@ -518,11 +518,11 @@
                                     r = [x[1] for x in sel_list if r==x[0]]
                                     r = r and r[0] or False
                     if not r:
-                        if f[i] in self._columns: 
+                        if f[i] in self._columns:
                             r = check_type(self._columns[f[i]]._type)
                         elif f[i] in self._inherit_fields:
-                            r = check_type(self._inherit_fields[f[i]][2]._type)                        
-                        data[fpos] = r                        
+                            r = check_type(self._inherit_fields[f[i]][2]._type)
+                        data[fpos] = r
                         break
                     if isinstance(r, (browse_record_list, list)):
                         first = True
@@ -531,10 +531,10 @@
                         if fields2 in done:
                             if [x for x in fields2 if x]:
                                 break
-                        done.append(fields2)                        
+                        done.append(fields2)
                         for row2 in r:
                             lines2 = self.__export_row(cr, uid, row2, fields2,
-                                    context)                            
+                                    context)
                             if first:
                                 for fpos2 in range(len(fields)):
                                     if lines2 and lines2[0][fpos2]:
@@ -542,17 +542,19 @@
                                 if not data[fpos]:
                                     dt = ''
                                     for rr in r :
-                                        if isinstance(rr.name, browse_record):
-                                            rr = rr.name
-                                        rr_name = self.pool.get(rr._table_name).name_get(cr, uid, [rr.id], context=context)
-                                        rr_name = rr_name and rr_name[0] and rr_name[0][1] or ''
+                                        rr_name = ''
+                                        if rr.name:
+                                            if isinstance(rr.name, browse_record):
+                                                rr = rr.name
+                                            rr_name = self.pool.get(rr._table_name).name_get(cr, uid, [rr.id], context=context)
+                                            rr_name = rr_name and rr_name[0] and rr_name[0][1] or ''
                                         dt += tools.ustr(rr_name or '') + ','
                                     data[fpos] = dt[:-1]
                                     break
                                 lines += lines2[1:]
                                 first = False
                             else:
-                                lines += lines2                            
+                                lines += lines2
                         break
                     i += 1
                 if i == len(f):
@@ -565,14 +567,14 @@
     def export_data(self, cr, uid, ids, fields_to_export, context=None):
         if not context:
             context = {}
-        imp_comp = context.get('import_comp',False)        
+        imp_comp = context.get('import_comp',False)
         cols = self._columns.copy()
         for f in self._inherit_fields:
-            cols.update({f: self._inherit_fields[f][2]})        
+            cols.update({f: self._inherit_fields[f][2]})
         fields_to_export = map(lambda x: x.split('/'), fields_to_export)
-        fields_export = fields_to_export+[]        
-        warning = ''  
-        warning_fields = []      
+        fields_export = fields_to_export+[]
+        warning = ''
+        warning_fields = []
         for field in fields_export:
             if imp_comp and len(field)>1:
                 warning_fields.append('/'.join(map(lambda x:x in cols and cols[x].string or x,field)))
@@ -580,11 +582,11 @@
                 if imp_comp and cols.get(field and field[0],False):
                     if ((isinstance(cols[field[0]], fields.function) and not cols[field[0]].store) \
                                      or isinstance(cols[field[0]], fields.related)\
-                                     or isinstance(cols[field[0]], fields.one2many)):                        
+                                     or isinstance(cols[field[0]], fields.one2many)):
                         warning_fields.append('/'.join(map(lambda x:x in cols and cols[x].string or x,field)))
         datas = []
         if imp_comp and len(warning_fields):
-            warning = 'Following columns cannot be exported since you select to be import compatible.\n%s' %('\n'.join(warning_fields))        
+            warning = 'Following columns cannot be exported since you select to be import compatible.\n%s' %('\n'.join(warning_fields))
             cr.rollback()
             return {'warning' : warning}
         for row in self.browse(cr, uid, ids, context):
@@ -597,14 +599,14 @@
         fields = map(lambda x: x.split('/'), fields)
         logger = netsvc.Logger()
         ir_model_data_obj = self.pool.get('ir.model.data')
-        
+
         def _check_db_id(self, model_name, db_id):
             obj_model = self.pool.get(model_name)
             ids = obj_model.search(cr, uid, [('id','=',int(db_id))])
             if not len(ids):
                 raise Exception(_("Database ID doesn't exist: %s : %s") %(model_name, db_id))
             return True
-            
+
         def process_liness(self, datas, prefix, current_module, model_name, fields_def, position=0):
             line = datas[position]
             row = {}
@@ -624,25 +626,25 @@
                     raise Exception(_('Please check that all your lines have %d columns.') % (len(fields),))
                 if not line[i]:
                     continue
-                    
+
                 field = fields[i]
                 if prefix and not prefix[0] in field:
                     continue
-                
+
                 if (len(field)==len(prefix)+1) and field[len(prefix)].endswith(':db_id'):
                         # Database ID
                         res = False
                         if line[i]:
                             field_name = field[0].split(':')[0]
-                            model_rel =  fields_def[field_name]['relation']                            
-                            
+                            model_rel =  fields_def[field_name]['relation']
+
                             if fields_def[field[len(prefix)][:-6]]['type']=='many2many':
                                 res_id = []
                                 for db_id in line[i].split(config.get('csv_internal_sep')):
                                     try:
                                         _check_db_id(self, model_rel, db_id)
                                         res_id.append(db_id)
-                                    except Exception,e:                                    
+                                    except Exception,e:
                                         warning += [tools.exception_to_unicode(e)]
                                         logger.notifyChannel("import", netsvc.LOG_ERROR,
                                                   tools.exception_to_unicode(e))
@@ -652,10 +654,10 @@
                                 try:
                                     _check_db_id(self, model_rel, line[i])
                                     res = line[i]
-                                except Exception,e:                                    
+                                except Exception,e:
                                     warning += [tools.exception_to_unicode(e)]
                                     logger.notifyChannel("import", netsvc.LOG_ERROR,
-                                              tools.exception_to_unicode(e))                        
+                                              tools.exception_to_unicode(e))
                         row[field_name] = res or False
                         continue
 
@@ -668,7 +670,7 @@
                                 if '.' in word:
                                     module, xml_id = word.rsplit('.', 1)
                                 else:
-                                    module, xml_id = current_module, word                                
+                                    module, xml_id = current_module, word
                                 id = ir_model_data_obj._get_id(cr, uid, module,
                                         xml_id)
                                 res_id2 = ir_model_data_obj.read(cr, uid, [id],
@@ -681,7 +683,7 @@
                             if '.' in line[i]:
                                 module, xml_id = line[i].rsplit('.', 1)
                             else:
-                                module, xml_id = current_module, line[i]                            
+                                module, xml_id = current_module, line[i]
 
                             record_id = ir_model_data_obj._get_id(cr, uid, module, xml_id)
                             ir_model_data = ir_model_data_obj.read(cr, uid, [record_id], ['res_id'])
@@ -699,31 +701,31 @@
                     continue
                 if (len(field) == len(prefix)+1) and \
                         (prefix == field[0:len(prefix)]):
-                    if field[len(prefix)] == "id":  
-                        # XML ID                         
-                        db_id = False                 
-                        is_xml_id = data_id = line[i] 
+                    if field[len(prefix)] == "id":
+                        # XML ID
+                        db_id = False
+                        is_xml_id = data_id = line[i]
                         d =  data_id.split('.')
                         module = len(d)>1 and d[0] or ''
-                        name = len(d)>1 and d[1] or d[0] 
-                        data_ids = ir_model_data_obj.search(cr, uid, [('module','=',module),('model','=',model_name),('name','=',name)])                    
+                        name = len(d)>1 and d[1] or d[0]
+                        data_ids = ir_model_data_obj.search(cr, uid, [('module','=',module),('model','=',model_name),('name','=',name)])
                         if len(data_ids):
-                            d = ir_model_data_obj.read(cr, uid, data_ids, ['res_id'])[0]                                                
-                            db_id = d['res_id']                       
+                            d = ir_model_data_obj.read(cr, uid, data_ids, ['res_id'])[0]
+                            db_id = d['res_id']
                         if is_db_id and not db_id:
-                           data_ids = ir_model_data_obj.search(cr, uid, [('module','=',module),('model','=',model_name),('res_id','=',is_db_id)])                     
+                           data_ids = ir_model_data_obj.search(cr, uid, [('module','=',module),('model','=',model_name),('res_id','=',is_db_id)])
                            if not len(data_ids):
-                               ir_model_data_obj.create(cr, uid, {'module':module, 'model':model_name, 'name':name, 'res_id':is_db_id}) 
-                               db_id = is_db_id 
-                        if is_db_id and int(db_id) != int(is_db_id):                        
+                               ir_model_data_obj.create(cr, uid, {'module':module, 'model':model_name, 'name':name, 'res_id':is_db_id})
+                               db_id = is_db_id
+                        if is_db_id and int(db_id) != int(is_db_id):
                             warning += [_("Id is not the same than existing one: %s")%(is_db_id)]
                             logger.notifyChannel("import", netsvc.LOG_ERROR,
                                     _("Id is not the same than existing one: %s")%(is_db_id))
                         continue
 
                     if field[len(prefix)] == "db_id":
-                        # Database ID                        
-                        try:                            
+                        # Database ID
+                        try:
                             _check_db_id(self, model_name, line[i])
                             data_res_id = is_db_id = int(line[i])
                         except Exception,e:
@@ -733,19 +735,19 @@
                             continue
                         data_ids = ir_model_data_obj.search(cr, uid, [('model','=',model_name),('res_id','=',line[i])])
                         if len(data_ids):
-                            d = ir_model_data_obj.read(cr, uid, data_ids, ['name','module'])[0]                                                
-                            data_id = d['name']       
+                            d = ir_model_data_obj.read(cr, uid, data_ids, ['name','module'])[0]
+                            data_id = d['name']
                             if d['module']:
                                 data_id = '%s.%s'%(d['module'],d['name'])
                             else:
                                 data_id = d['name']
                         if is_xml_id and not data_id:
-                            data_id = is_xml_id                                     
-                        if is_xml_id and is_xml_id!=data_id:  
+                            data_id = is_xml_id
+                        if is_xml_id and is_xml_id!=data_id:
                             warning += [_("Id is not the same than existing one: %s")%(line[i])]
                             logger.notifyChannel("import", netsvc.LOG_ERROR,
                                     _("Id is not the same than existing one: %s")%(line[i]))
-                                                           
+
                         continue
                     if fields_def[field[len(prefix)]]['type'] == 'integer':
                         res = line[i] and int(line[i])
@@ -769,9 +771,9 @@
                             logger.notifyChannel("import", netsvc.LOG_WARNING,
                                     _("key '%s' not found in selection field '%s'") % \
                                             (line[i], field[len(prefix)]))
-                            
+
                             warning += [_("Key/value '%s' not found in selection field '%s'")%(line[i],field[len(prefix)])]
-                            
+
                     elif fields_def[field[len(prefix)]]['type']=='many2one':
                         res = False
                         if line[i]:
@@ -814,13 +816,13 @@
                 relation_obj = self.pool.get(fields_def[field]['relation'])
                 newfd = relation_obj.fields_get(
                         cr, uid, context=context)
-                res = process_liness(self, datas, prefix + [field], current_module, relation_obj._name, newfd, position)                              
-                (newrow, max2, w2, translate2, data_id2, data_res_id2) = res                  
+                res = process_liness(self, datas, prefix + [field], current_module, relation_obj._name, newfd, position)
+                (newrow, max2, w2, translate2, data_id2, data_res_id2) = res
                 nbrmax = max(nbrmax, max2)
-                warning = warning + w2         
-                reduce(lambda x, y: x and y, newrow)       
+                warning = warning + w2
+                reduce(lambda x, y: x and y, newrow)
                 row[field] = newrow and (reduce(lambda x, y: x or y, newrow.values()) and \
-                        [(0, 0, newrow)]) or []                
+                        [(0, 0, newrow)]) or []
                 i = max2
                 while (position+i)<len(datas):
                     ok = True
@@ -835,7 +837,7 @@
                             self, datas, prefix+[field], current_module, relation_obj._name, newfd, position+i)
                     warning = warning+w2
                     if newrow and reduce(lambda x, y: x or y, newrow.values()):
-                        row[field].append((0, 0, newrow))                    
+                        row[field].append((0, 0, newrow))
                     i += max2
                     nbrmax = max(nbrmax, i)
 
@@ -884,7 +886,7 @@
                     return (-1, res, 'Line ' + str(counter) +' : ' + msg, '' )
                 #Raising Uncaught exception
                 return (-1, res, 'Line ' + str(counter) +' : ' + str(e), '' )
-            
+
             for lang in translate:
                 context2 = context.copy()
                 context2['lang'] = lang
@@ -1130,15 +1132,15 @@
             if user != 1:   # admin user has all roles
                 user_roles = usersobj.read(cr, user, [user], ['roles_id'])[0]['roles_id']
                 # TODO handle the case of more than one workflow for a model
-                cr.execute("""SELECT DISTINCT t.role_id 
-                                FROM wkf 
-                          INNER JOIN wkf_activity a ON a.wkf_id = wkf.id 
+                cr.execute("""SELECT DISTINCT t.role_id
+                                FROM wkf
+                          INNER JOIN wkf_activity a ON a.wkf_id = wkf.id
                           INNER JOIN wkf_transition t ON (t.act_to = a.id)
                                WHERE wkf.osv = %s
                                  AND t.signal = %s
                            """, (self._name, button.get('name'),))
                 roles = cr.fetchall()
-                
+
                 # draft -> valid = signal_next (role X)
                 # draft -> cancel = signal_cancel (no role)
                 #
@@ -1147,13 +1149,13 @@
                 #
                 # running -> done = signal_next (role Z)
                 # running -> cancel = signal_cancel (role Z)
-                # As we don't know the object state, in this scenario, 
+                # As we don't know the object state, in this scenario,
                 #   the button "signal_cancel" will be always shown as there is no restriction to cancel in draft
                 #   the button "signal_next" will be show if the user has any of the roles (X Y or Z)
                 # The verification will be made later in workflow process...
                 if roles:
                     can_click = any((not role) or rolesobj.check(cr, user, user_roles, role) for (role,) in roles)
-            
+
             button.set('readonly', str(int(not can_click)))
 
         arch = etree.tostring(node, encoding="utf-8").replace('\t', '')
@@ -1665,7 +1667,7 @@
     def _check_removed_columns(self, cr, log=False):
         # nothing to check in memory...
         pass
-    
+
     def exists(self, cr, uid, id, context=None):
         return id in self.datas
 
@@ -1804,12 +1806,12 @@
 
                 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]
@@ -1916,7 +1918,7 @@
                                             field_size = (65535 * f.digits[0]) + f.digits[0] + f.digits[1]
                                             if field_size != f_pg_size:
                                                 field_size_change = True
-                                                
+
                                     if f_pg_type != f_obj_type or field_size_change:
                                         if f_pg_type != f_obj_type:
                                             logger.notifyChannel('orm', netsvc.LOG_INFO, "column '%s' in table '%s' changed type to %s." % (k, self._table, c[1]))
@@ -2004,11 +2006,11 @@
             create = not bool(cr.fetchone())
 
         cr.commit()     # start a new transaction
-        
+
         store_fncts = self.pool._store_function.get(self._name, [])
         #if any field is changed from function to storable, we need to remove its entry from store_function
         remove_stores = []
-        
+
         for record in store_fncts:
             if record[0] == self._name and (self._columns.get(record[1],False) or self._inherit_fields.get(record[1],False)):
                 if (not isinstance(self._columns[record[1]],fields.function)) or (record[1] in self._inherit_fields and not isinstance(self._inherit_fields[record[1]][2],fields.function)):
@@ -2018,7 +2020,7 @@
             store_fncts.remove(stores)
 
         self.pool._store_function[self._name] = store_fncts
-        
+
         for (key, con, _) in self._sql_constraints:
             conname = '%s_%s' % (self._table, key)
             cr.execute("SELECT conname FROM pg_constraint where conname=%s", (conname,))
@@ -2306,7 +2308,7 @@
                 res.extend(cr.dictfetchall())
         else:
             res = map(lambda x: {'id': x}, ids)
-        
+
 #        if not res:
 #            res = map(lambda x: {'id': x}, ids)
 #            for record in res:
@@ -2321,7 +2323,7 @@
 #                    if ftype in ('one2many', 'many2many'):
 #                        field_val = []
 #                    record.update({f:field_val})
-        
+
         for f in fields_pre:
             if f == self.CONCURRENCY_CHECK_FIELD:
                 continue
@@ -2481,8 +2483,8 @@
         self.pool.get('ir.model.access').check(cr, uid, self._name, 'unlink', context=context)
 
         properties = self.pool.get('ir.property')
-        domain = [('res_id', '=', False), 
-                  ('value', 'in', ['%s,%s' % (self._name, i) for i in ids]), 
+        domain = [('res_id', '=', False),
+                  ('value', 'in', ['%s,%s' % (self._name, i) for i in ids]),
                  ]
         if properties.search(cr, uid, domain, context=context):
             raise except_orm(_('Error'), _('Unable to delete this document because it is used as a default property'))
@@ -2717,10 +2719,10 @@
                     cr.execute('SELECT parent_left, parent_right FROM "%s" WHERE id=%%s' % (self._table,), (id,))
                     pleft, pright = cr.fetchone()
                     distance = pright - pleft + 1
-                                                
+
                     cr.execute('SELECT parent_right, id FROM "%s" WHERE %s ORDER BY %s' % (self._table, clause, order), params)
                     parents = cr.fetchall()
-                    
+
                     # Find Position of the element
                     position = None
                     for (parent_pright, parent_id) in parents:
@@ -2760,7 +2762,7 @@
                     done[key][id] = True
                     todo.append(id)
             self.pool.get(object)._store_set_values(cr, user, todo, fields_to_recompute, context)
-            
+
         wf_service = netsvc.LocalService("workflow")
         for id in ids:
             wf_service.trg_write(user, self._name, id, cr)
@@ -2843,15 +2845,15 @@
             upd0 += ','+self._inherits[table]
             upd1 += ',%s'
             upd2.append(record_id)
-        
-        #Start : Set bool fields to be False if they are not touched(to make search more powerful) 
+
+        #Start : Set bool fields to be False if they are not touched(to make search more powerful)
         bool_fields = [x for x in self._columns.keys() if self._columns[x]._type=='boolean']
-        
+
         for bool_field in bool_fields:
             if bool_field not in vals:
                 vals[bool_field] = False
         #End
-        
+
         for field in vals:
             if field in self._columns:
                 if self._columns[field]._classic_write:
@@ -2909,13 +2911,13 @@
                 cr.execute('update '+self._table+' set parent_left=parent_left+2 where parent_left>%s', (pleft,))
                 cr.execute('update '+self._table+' set parent_right=parent_right+2 where parent_right>%s', (pleft,))
                 cr.execute('update '+self._table+' set parent_left=%s,parent_right=%s where id=%s', (pleft+1,pleft+2,id_new))
-                
+
         # default element in context must be removed when call a one2many or many2many
         rel_context = context.copy()
         for c in context.items():
             if c[0].startswith('default_'):
                 del rel_context[c[0]]
-        
+
         result = []
         for field in upd_todo:
             result += self._columns[field].set(cr, self, id_new, field, vals[field], user, rel_context) or []