diff --git a/openerp/netsvc.py b/openerp/netsvc.py
index ca08a362771..53750ed84da 100644
--- a/openerp/netsvc.py
+++ b/openerp/netsvc.py
@@ -84,12 +84,12 @@ class Service(object):
             cls._services.pop(name)
 
 def LocalService(name):
-  # Special case for addons support, will be removed in a few days when addons
-  # are updated to directly use openerp.osv.osv.service.
-  if name == 'object_proxy':
-      return openerp.osv.osv.service
+    # Special case for addons support, will be removed in a few days when addons
+    # are updated to directly use openerp.osv.osv.service.
+    if name == 'object_proxy':
+        return openerp.osv.osv.service
 
-  return Service._services[name]
+    return Service._services[name]
 
 class ExportService(object):
     """ Proxy for exported services.
@@ -198,9 +198,9 @@ def init_logger():
 # server intended to test it.
 def init_alternative_logger():
     class H(logging.Handler):
-      def emit(self, record):
-        if record.levelno > 20:
-          print record.levelno, record.pathname, record.msg
+        def emit(self, record):
+            if record.levelno > 20:
+                print record.levelno, record.pathname, record.msg
     handler = H()
     logger = logging.getLogger()
     logger.handlers = []
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 1c12fab27c9..f2686708436 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -98,10 +98,10 @@ def transfer_node_to_modifiers(node, modifiers, context=None, in_tree_view=False
 
     if node.get('states'):
         if 'invisible' in modifiers and isinstance(modifiers['invisible'], list):
-             # TODO combine with AND or OR, use implicit AND for now.
-             modifiers['invisible'].append(('state', 'not in', node.get('states').split(',')))
+            # TODO combine with AND or OR, use implicit AND for now.
+            modifiers['invisible'].append(('state', 'not in', node.get('states').split(',')))
         else:
-             modifiers['invisible'] = [('state', 'not in', node.get('states').split(','))]
+            modifiers['invisible'] = [('state', 'not in', node.get('states').split(','))]
 
     for a in ('invisible', 'readonly', 'required'):
         if node.get(a):
@@ -894,8 +894,8 @@ class BaseModel(object):
                         for c in cls.__dict__.get(s, []):
                             exist = False
                             for c2 in range(len(new)):
-                                 #For _constraints, we should check field and methods as well
-                                 if new[c2][2]==c[2] and (new[c2][0] == c[0] \
+                                #For _constraints, we should check field and methods as well
+                                if new[c2][2]==c[2] and (new[c2][0] == c[0] \
                                         or getattr(new[c2][0],'__name__', True) == \
                                             getattr(c[0],'__name__', False)):
                                     # If new class defines a constraint with
@@ -2690,7 +2690,7 @@ class BaseModel(object):
         elif val in dict(self._columns[field].selection(self, cr, uid, context=context)):
             return
         raise except_orm(_('ValidateError'),
-			_('The value "%s" for the field "%s.%s" is not in the selection') % (value, self._table, field))
+                         _('The value "%s" for the field "%s.%s" is not in the selection') % (value, self._table, field))
 
     def _check_removed_columns(self, cr, log=False):
         # iterate on the database columns to drop the NOT NULL constraints
diff --git a/openerp/service/netrpc_server.py b/openerp/service/netrpc_server.py
index f86d6d21273..efe26906720 100644
--- a/openerp/service/netrpc_server.py
+++ b/openerp/service/netrpc_server.py
@@ -125,9 +125,9 @@ class TinySocketServerThread(threading.Thread,netsvc.Server):
                 ct.start()
                 lt = len(self.threads)
                 if (lt > 10) and (lt % 10 == 0):
-                     # Not many threads should be serving at the same time, so log
-                     # their abuse.
-                     netsvc.Logger().notifyChannel("web-services", netsvc.LOG_DEBUG,
+                    # Not many threads should be serving at the same time, so log
+                    # their abuse.
+                    netsvc.Logger().notifyChannel("web-services", netsvc.LOG_DEBUG,
                         "Netrpc: %d threads" % len(self.threads))
             self.socket.close()
         except Exception, e:
diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py
index 1bda0230c89..8c3db0e88af 100644
--- a/openerp/service/web_services.py
+++ b/openerp/service/web_services.py
@@ -521,11 +521,11 @@ GNU Public Licence.
                      'OS Name : %s\n' \
                      %(platform.platform(), platform.os.name)
         if os.name == 'posix':
-          if platform.system() == 'Linux':
-             lsbinfo = os.popen('lsb_release -a').read()
-             environment += '%s'%(lsbinfo)
-          else:
-             environment += 'Your System is not lsb compliant\n'
+            if platform.system() == 'Linux':
+                lsbinfo = os.popen('lsb_release -a').read()
+                environment += '%s'%(lsbinfo)
+            else:
+                environment += 'Your System is not lsb compliant\n'
         environment += 'Operating System Release : %s\n' \
                     'Operating System Version : %s\n' \
                     'Operating System Architecture : %s\n' \
diff --git a/openerp/tests/test_xmlrpc.py b/openerp/tests/test_xmlrpc.py
index 954d3447360..ca0ae454437 100644
--- a/openerp/tests/test_xmlrpc.py
+++ b/openerp/tests/test_xmlrpc.py
@@ -19,8 +19,8 @@ ADMIN_USER_ID = common.ADMIN_USER_ID
 ADMIN_PASSWORD = common.ADMIN_PASSWORD
 
 def setUpModule():
-  common.start_openerp()
-  common.create_xmlrpc_proxies()
+    common.start_openerp()
+    common.create_xmlrpc_proxies()
 
 tearDownModule = common.tearDownModule