diff --git a/bin/__init__.py b/bin/__init__.py
index de486a209aa..664926ad2a9 100644
--- a/bin/__init__.py
+++ b/bin/__init__.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -28,3 +29,6 @@
 #
 ###############################################################################
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index a28c87d1c34..2bad1c22886 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be)
@@ -352,3 +353,6 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
         pooler.restart_pool(cr.dbname)
     cr.close()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/__init__.py b/bin/addons/base/__init__.py
index f58d386b150..daf086338b0 100644
--- a/bin/addons/base/__init__.py
+++ b/bin/addons/base/__init__.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -31,3 +32,6 @@ import ir
 import module
 import res
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/__terp__.py b/bin/addons/base/__terp__.py
index 8903596f5db..e810228ac5f 100644
--- a/bin/addons/base/__terp__.py
+++ b/bin/addons/base/__terp__.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -67,3 +68,6 @@
     "active": True,
     "installable": True,
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/ir/__init__.py b/bin/addons/base/ir/__init__.py
index 2d76ec54675..2d8e697adeb 100644
--- a/bin/addons/base/ir/__init__.py
+++ b/bin/addons/base/ir/__init__.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -42,3 +43,6 @@ import ir_exports
 import workflow
 import ir_rule
 import wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 9e5f6435408..a12eabe2911 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -337,3 +338,6 @@ class act_window_close(osv.osv):
     }
 act_window_close()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/ir/ir_attachment.py b/bin/addons/base/ir/ir_attachment.py
index f4e931826b1..26bc0b7bf15 100644
--- a/bin/addons/base/ir/ir_attachment.py
+++ b/bin/addons/base/ir/ir_attachment.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -43,3 +44,6 @@ class ir_attachment(osv.osv):
     }
 ir_attachment()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/ir/ir_board.py b/bin/addons/base/ir/ir_board.py
index f8bf28a4fe1..b948626fac5 100644
--- a/bin/addons/base/ir/ir_board.py
+++ b/bin/addons/base/ir/ir_board.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -39,3 +40,6 @@ class board(osv.osv):
         'name': fields.char('Board', size=64),
     }
 board()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/ir/ir_cron.py b/bin/addons/base/ir/ir_cron.py
index d04251ae4d3..eb9fc99c1c3 100644
--- a/bin/addons/base/ir/ir_cron.py
+++ b/bin/addons/base/ir/ir_cron.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -129,3 +130,6 @@ class ir_cron(osv.osv, netsvc.Agent):
         if not check:
             self.setAlarm(self._poolJobs, int(time.time())+next_wait, [db_name])
 ir_cron()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/ir/ir_default.py b/bin/addons/base/ir/ir_default.py
index dccb410f7ce..4d9809cfe57 100644
--- a/bin/addons/base/ir/ir_default.py
+++ b/bin/addons/base/ir/ir_default.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -53,3 +54,6 @@ class ir_default(osv.osv):
     }
 ir_default()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/ir/ir_exports.py b/bin/addons/base/ir/ir_exports.py
index 5b2cb625d3d..3e3de615158 100644
--- a/bin/addons/base/ir/ir_exports.py
+++ b/bin/addons/base/ir/ir_exports.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -48,3 +49,6 @@ class ir_exports_line(osv.osv):
         'export_id': fields.many2one('ir.exports', 'Exportation', select=True, ondelete='cascade'),
     }
 ir_exports_line()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/ir/ir_fields_description.py b/bin/addons/base/ir/ir_fields_description.py
index 86159aac5d8..21f923c8227 100644
--- a/bin/addons/base/ir/ir_fields_description.py
+++ b/bin/addons/base/ir/ir_fields_description.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -31,3 +32,6 @@ from osv import fields,osv
 import ir
 
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index 5d971e079e7..da4b192aaa2 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -429,3 +430,6 @@ class ir_model_data(osv.osv):
         return True
 ir_model_data()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/ir/ir_report_custom.py b/bin/addons/base/ir/ir_report_custom.py
index cc8b3acc7e5..7c0f33809ba 100644
--- a/bin/addons/base/ir/ir_report_custom.py
+++ b/bin/addons/base/ir/ir_report_custom.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -207,3 +208,6 @@ class report_custom_fields(osv.osv):
     onchange_field_child2 = get_field_child_onchange_method(2)  
 report_custom_fields()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/ir/ir_rule.py b/bin/addons/base/ir/ir_rule.py
index bdd5312f291..f63a6cc3193 100644
--- a/bin/addons/base/ir/ir_rule.py
+++ b/bin/addons/base/ir/ir_rule.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -238,3 +239,6 @@ class ir_rule(osv.osv):
         return res
 
 ir_rule()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/ir/ir_sequence.py b/bin/addons/base/ir/ir_sequence.py
index 7eff555ab10..ffd431e8a31 100644
--- a/bin/addons/base/ir/ir_sequence.py
+++ b/bin/addons/base/ir/ir_sequence.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -80,3 +81,6 @@ class ir_sequence(osv.osv):
         return self.get_id(cr, uid, code, test='code=%s')
 ir_sequence()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/ir/ir_translation.py b/bin/addons/base/ir/ir_translation.py
index bda2654b033..a74aa627e7e 100644
--- a/bin/addons/base/ir/ir_translation.py
+++ b/bin/addons/base/ir/ir_translation.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -160,3 +161,6 @@ class ir_translation(osv.osv, Cacheable):
                 context=context)
 
 ir_translation()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/ir/ir_ui_menu.py b/bin/addons/base/ir/ir_ui_menu.py
index 2fa9268776c..a94454b1a9b 100644
--- a/bin/addons/base/ir/ir_ui_menu.py
+++ b/bin/addons/base/ir/ir_ui_menu.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -208,3 +209,6 @@ class ir_ui_menu(osv.osv):
 ir_ui_menu()
 
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/ir/ir_ui_view.py b/bin/addons/base/ir/ir_ui_view.py
index 75d93f04d3a..e99e7b4abbd 100644
--- a/bin/addons/base/ir/ir_ui_view.py
+++ b/bin/addons/base/ir/ir_ui_view.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -120,3 +121,6 @@ class view_sc(osv.osv):
         'user_id': lambda obj, cr, uid, context: uid,
     }
 view_sc()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/ir/ir_values.py b/bin/addons/base/ir/ir_values.py
index 2681e562ec7..1fd086eb117 100644
--- a/bin/addons/base/ir/ir_values.py
+++ b/bin/addons/base/ir/ir_values.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -250,3 +251,6 @@ class ir_values(osv.osv):
 ir_values()
 
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/ir/wizard/__init__.py b/bin/addons/base/ir/wizard/__init__.py
index d8489e733bf..f8806ffa1a5 100644
--- a/bin/addons/base/ir/wizard/__init__.py
+++ b/bin/addons/base/ir/wizard/__init__.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -27,3 +28,6 @@
 #
 ##############################################################################
 import wizard_menu
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/ir/wizard/wizard_menu.py b/bin/addons/base/ir/wizard/wizard_menu.py
index 32d25e3c849..4260c1d2289 100644
--- a/bin/addons/base/ir/wizard/wizard_menu.py
+++ b/bin/addons/base/ir/wizard/wizard_menu.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -84,3 +85,6 @@ class wizard_model_menu_line(osv.osv_memory):
     }
 wizard_model_menu_line()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/ir/workflow/__init__.py b/bin/addons/base/ir/workflow/__init__.py
index b1ae54cc412..961ccd9b039 100644
--- a/bin/addons/base/ir/workflow/__init__.py
+++ b/bin/addons/base/ir/workflow/__init__.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -27,3 +28,6 @@
 ###############################################################################
 import workflow
 import print_instance
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/ir/workflow/print_instance.py b/bin/addons/base/ir/workflow/print_instance.py
index 428df57ac0e..350366c9544 100644
--- a/bin/addons/base/ir/workflow/print_instance.py
+++ b/bin/addons/base/ir/workflow/print_instance.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -206,3 +207,6 @@ class report_graph(report.interface.report_int):
         return (self.obj.get(), 'pdf')
 
 report_graph('report.workflow.instance.graph', 'ir.workflow')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/ir/workflow/workflow.py b/bin/addons/base/ir/workflow/workflow.py
index 24a8e315570..6f74c7512c5 100644
--- a/bin/addons/base/ir/workflow/workflow.py
+++ b/bin/addons/base/ir/workflow/workflow.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -186,3 +187,6 @@ class wkf_triggers(osv.osv):
             cr.commit()
 wkf_triggers()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/module/__init__.py b/bin/addons/base/module/__init__.py
index 6642b9aabde..08c2fb5917f 100644
--- a/bin/addons/base/module/__init__.py
+++ b/bin/addons/base/module/__init__.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -30,3 +31,6 @@
 import module
 import wizard
 import report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index 76ead57fdbd..548d2c65f10 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -651,3 +652,6 @@ module_configuration()
 
 
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/module/report/__init__.py b/bin/addons/base/module/report/__init__.py
index 1b35cd4b9ae..1617a75382f 100644
--- a/bin/addons/base/module/report/__init__.py
+++ b/bin/addons/base/module/report/__init__.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -28,3 +29,6 @@
 ##############################################################################
 
 import ir_module_reference_print
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/module/report/ir_module_reference_print.py b/bin/addons/base/module/report/ir_module_reference_print.py
index 57ffc71bdc4..83a42826bd9 100644
--- a/bin/addons/base/module/report/ir_module_reference_print.py
+++ b/bin/addons/base/module/report/ir_module_reference_print.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -61,3 +62,6 @@ report_sxw.report_sxw('report.ir.module.reference', 'ir.module.module',
         'addons/base/module/report/ir_module_reference.rml',
         parser=ir_module_reference_print, header=False)
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/module/wizard/__init__.py b/bin/addons/base/module/wizard/__init__.py
index ea99fb2eff8..beeb3e778c8 100644
--- a/bin/addons/base/module/wizard/__init__.py
+++ b/bin/addons/base/module/wizard/__init__.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -34,3 +35,6 @@ import add_new
 import wizard_export_lang
 import wizard_import_lang
 import wizard_module_import
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/module/wizard/add_new.py b/bin/addons/base/module/wizard/add_new.py
index 39465dff970..7be53d22cf6 100644
--- a/bin/addons/base/module/wizard/add_new.py
+++ b/bin/addons/base/module/wizard/add_new.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be)
@@ -94,3 +95,6 @@ class wizard_install_module(wizard.interface):
     }
 wizard_install_module('module.module.scan')
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/module/wizard/wizard_export_lang.py b/bin/addons/base/module/wizard/wizard_export_lang.py
index 3a4a4e82ae9..f5df07532df 100644
--- a/bin/addons/base/module/wizard/wizard_export_lang.py
+++ b/bin/addons/base/module/wizard/wizard_export_lang.py
@@ -1,4 +1,4 @@
-# -*- coding: iso-8859-1 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -151,3 +151,6 @@ class wizard_export_lang(osv.osv_memory):
             }
     _defaults = { 'state': lambda *a: 'choose', }
 wizard_export_lang()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/module/wizard/wizard_import_lang.py b/bin/addons/base/module/wizard/wizard_import_lang.py
index df0bee1310c..f8a41dedafc 100644
--- a/bin/addons/base/module/wizard/wizard_import_lang.py
+++ b/bin/addons/base/module/wizard/wizard_import_lang.py
@@ -1,4 +1,4 @@
-# -*- coding: iso-8859-1 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -86,3 +86,6 @@ class wizard_import_lang(wizard.interface):
         },
     }
 wizard_import_lang('module.lang.import')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/module/wizard/wizard_module_import.py b/bin/addons/base/module/wizard/wizard_module_import.py
index 394389dd68f..c79c2b05980 100644
--- a/bin/addons/base/module/wizard/wizard_module_import.py
+++ b/bin/addons/base/module/wizard/wizard_module_import.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -119,3 +120,6 @@ class move_module_wizard(wizard.interface):
         },
     }
 move_module_wizard('base.module.import')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/module/wizard/wizard_module_lang_install.py b/bin/addons/base/module/wizard/wizard_module_lang_install.py
index 95064b0d043..5be3bc076cd 100644
--- a/bin/addons/base/module/wizard/wizard_module_lang_install.py
+++ b/bin/addons/base/module/wizard/wizard_module_lang_install.py
@@ -1,4 +1,4 @@
-# -*- coding: iso-8859-1 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -89,3 +89,6 @@ class wizard_lang_install(wizard.interface):
     }
 wizard_lang_install('module.lang.install')
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/module/wizard/wizard_module_upgrade.py b/bin/addons/base/module/wizard/wizard_module_upgrade.py
index 482f2bb048e..c9cf6042108 100644
--- a/bin/addons/base/module/wizard/wizard_module_upgrade.py
+++ b/bin/addons/base/module/wizard/wizard_module_upgrade.py
@@ -1,4 +1,4 @@
-# -*- coding: iso-8859-1 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -153,3 +153,6 @@ class wizard_info_get(wizard.interface):
     }
 wizard_info_get('module.upgrade')
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/module/wizard/wizard_update_module.py b/bin/addons/base/module/wizard/wizard_update_module.py
index 924fec3eb46..961a2db9663 100644
--- a/bin/addons/base/module/wizard/wizard_update_module.py
+++ b/bin/addons/base/module/wizard/wizard_update_module.py
@@ -1,4 +1,4 @@
-# -*- coding: iso-8859-1 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -101,3 +101,6 @@ class wizard_update_module(wizard.interface):
     }
 wizard_update_module('module.module.update')
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/res/__init__.py b/bin/addons/base/res/__init__.py
index a3e4f4de518..9d1e7dffcb2 100644
--- a/bin/addons/base/res/__init__.py
+++ b/bin/addons/base/res/__init__.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -40,3 +41,6 @@ import res_request
 
 
 import ir_property
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/res/bank.py b/bin/addons/base/res/bank.py
index dcae2f90b57..aa44e9ec32c 100644
--- a/bin/addons/base/res/bank.py
+++ b/bin/addons/base/res/bank.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -56,3 +57,6 @@ class Bank(osv.osv):
     }
 
 Bank()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/res/country.py b/bin/addons/base/res/country.py
index 603ee6fb5f4..cc94d2bd585 100644
--- a/bin/addons/base/res/country.py
+++ b/bin/addons/base/res/country.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -105,3 +106,6 @@ class CountryState(osv.osv):
 CountryState()
 
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/res/ir_property.py b/bin/addons/base/res/ir_property.py
index 57f5c54db83..bea7c9cba15 100644
--- a/bin/addons/base/res/ir_property.py
+++ b/bin/addons/base/res/ir_property.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -83,3 +84,6 @@ class ir_property(osv.osv):
 ir_property()
 
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/res/partner/__init__.py b/bin/addons/base/res/partner/__init__.py
index e2e05d907e8..f8b82909563 100644
--- a/bin/addons/base/res/partner/__init__.py
+++ b/bin/addons/base/res/partner/__init__.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -36,3 +37,6 @@ import wizard
 import report
 
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/res/partner/crm.py b/bin/addons/base/res/partner/crm.py
index 3fecb9a3388..d3fdf8bc9ae 100644
--- a/bin/addons/base/res/partner/crm.py
+++ b/bin/addons/base/res/partner/crm.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -104,3 +105,6 @@ class res_partner_event_type(osv.osv):
 res_partner_event_type()
 
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py
index c0edc509da2..3cac309de11 100644
--- a/bin/addons/base/res/partner/partner.py
+++ b/bin/addons/base/res/partner/partner.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -432,4 +433,6 @@ class res_partner_bank(osv.osv):
 res_partner_bank()
 
 
-# vim:noexpandtab:
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/res/partner/report/__init__.py b/bin/addons/base/res/partner/report/__init__.py
index 143ddc63253..6dc12900577 100644
--- a/bin/addons/base/res/partner/report/__init__.py
+++ b/bin/addons/base/res/partner/report/__init__.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -31,3 +32,6 @@
 #report_sxw.report_sxw('report.partner.list', 'res.partner', 'addons/base/res/partner/report/partner_list.rml')
 
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/res/partner/wizard/__init__.py b/bin/addons/base/res/partner/wizard/__init__.py
index 4877f9e5e4d..a6509c6e658 100644
--- a/bin/addons/base/res/partner/wizard/__init__.py
+++ b/bin/addons/base/res/partner/wizard/__init__.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -31,3 +32,6 @@ import wizard_sms
 import wizard_spam
 import wizard_clear_ids
 import wizard_ean_check
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/res/partner/wizard/wizard_clear_ids.py b/bin/addons/base/res/partner/wizard/wizard_clear_ids.py
index 457add8f688..dffcebc7def 100644
--- a/bin/addons/base/res/partner/wizard/wizard_clear_ids.py
+++ b/bin/addons/base/res/partner/wizard/wizard_clear_ids.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -44,3 +45,6 @@ class wizard_clear_ids(wizard.interface):
     }
 wizard_clear_ids('res.partner.clear_ids')
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/res/partner/wizard/wizard_ean_check.py b/bin/addons/base/res/partner/wizard/wizard_ean_check.py
index 52af65e528f..ef2a42b0ed3 100644
--- a/bin/addons/base/res/partner/wizard/wizard_ean_check.py
+++ b/bin/addons/base/res/partner/wizard/wizard_ean_check.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -101,3 +102,6 @@ class wiz_ean_check(wizard.interface):
     }
 
 wiz_ean_check('res.partner.ean13')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/res/partner/wizard/wizard_sms.py b/bin/addons/base/res/partner/wizard/wizard_sms.py
index fbd671e9764..069dfd99177 100644
--- a/bin/addons/base/res/partner/wizard/wizard_sms.py
+++ b/bin/addons/base/res/partner/wizard/wizard_sms.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -77,3 +78,6 @@ class part_sms(wizard.interface):
 part_sms('res.partner.sms_send')
 
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/res/partner/wizard/wizard_spam.py b/bin/addons/base/res/partner/wizard/wizard_spam.py
index c5353021264..ef47f04e42b 100644
--- a/bin/addons/base/res/partner/wizard/wizard_spam.py
+++ b/bin/addons/base/res/partner/wizard/wizard_spam.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -78,3 +79,6 @@ class part_email(wizard.interface):
         }
     }
 part_email('res.partner.spam_send')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/res/res_company.py b/bin/addons/base/res/res_company.py
index 1c5776dda88..90cb69185a5 100644
--- a/bin/addons/base/res/res_company.py
+++ b/bin/addons/base/res/res_company.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -180,3 +181,6 @@ class res_company(osv.osv):
 
 res_company()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/res/res_currency.py b/bin/addons/base/res/res_currency.py
index 6f6a84cb0d1..05541689154 100644
--- a/bin/addons/base/res/res_currency.py
+++ b/bin/addons/base/res/res_currency.py
@@ -126,3 +126,6 @@ class res_currency_rate(osv.osv):
     }
     _order = "name desc"
 res_currency_rate()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/res/res_lang.py b/bin/addons/base/res/res_lang.py
index 7ef19b65078..3d09a57695c 100644
--- a/bin/addons/base/res/res_lang.py
+++ b/bin/addons/base/res/res_lang.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -46,3 +47,6 @@ class lang(osv.osv):
 
 lang()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/res/res_request.py b/bin/addons/base/res/res_request.py
index 539449246cc..9fe5e21266e 100644
--- a/bin/addons/base/res/res_request.py
+++ b/bin/addons/base/res/res_request.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -125,3 +126,6 @@ class res_request_history(osv.osv):
     }
 res_request_history()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 4b856dff182..9bbbab6cd32 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -273,3 +274,6 @@ class res_config_view(osv.osv_memory):
 res_config_view()
 
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/addons/module_graph.py b/bin/addons/module_graph.py
index a853eb8aa1f..1942c95ca2b 100644
--- a/bin/addons/module_graph.py
+++ b/bin/addons/module_graph.py
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be)
@@ -55,3 +56,6 @@ while len(modules):
                     modules.append(name)
                 print '\t%s -> %s;' % (f, name)
 print '}'
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/ir/__init__.py b/bin/ir/__init__.py
index 078562798f7..ecde78b457b 100644
--- a/bin/ir/__init__.py
+++ b/bin/ir/__init__.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -28,3 +29,6 @@
 
 
 from ir import *
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/ir/ir.py b/bin/ir/ir.py
index d745ee3b33a..11fdcf31437 100644
--- a/bin/ir/ir.py
+++ b/bin/ir/ir.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -42,3 +43,6 @@ def ir_get(cr, uid, key, key2, models, meta=False, context={}, res_id_req=False)
     obj = pooler.get_pool(cr.dbname).get('ir.values')
     res = obj.get(cr, uid, key, key2, models, meta=meta, context=context, res_id_req=res_id_req)
     return res
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/netsvc.py b/bin/netsvc.py
index b6cc5d06ff9..df47a56a853 100644
--- a/bin/netsvc.py
+++ b/bin/netsvc.py
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -405,6 +406,8 @@ class TinySocketServerThread(threading.Thread):
         except:
             return False
 
-# vim:noexpandtab:
 
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/osv/__init__.py b/bin/osv/__init__.py
index 48509be9df8..01f6a2704a4 100644
--- a/bin/osv/__init__.py
+++ b/bin/osv/__init__.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -29,3 +30,6 @@
 import osv
 import fields
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index ab10cf9ade5..6983fa2292b 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 # -*- encoding: iso-8859-1 -*-
 ##############################################################################
 #
@@ -676,3 +677,6 @@ class property(function):
     def restart(self):
         self.field_id = {}
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 26fad04a900..ac60adb0888 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -2611,4 +2611,6 @@ class orm(orm_template):
                     return False
         return True
 
-# vim:noexpandtab:ts=4
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/osv/osv.py b/bin/osv/osv.py
index 63cc52408b8..369f006c9df 100644
--- a/bin/osv/osv.py
+++ b/bin/osv/osv.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -335,7 +336,6 @@ class cacheable_osv(osv, Cacheable):
 
 #cacheable_osv = osv
 
-# vim:noexpandtab:
 
 #class FakePool(object):
 #   def __init__(self, module):
@@ -357,3 +357,6 @@ class cacheable_osv(osv, Cacheable):
 
 #       return fake_class()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/pooler.py b/bin/pooler.py
index 52b9305b801..4f47a1f158b 100644
--- a/bin/pooler.py
+++ b/bin/pooler.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -98,3 +99,6 @@ def init():
 #   db = get_db_only(tools.config['db_name'])
     sql_db.init()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/release.py b/bin/release.py
index 2f47bf03036..0b802fc27ca 100644
--- a/bin/release.py
+++ b/bin/release.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -46,3 +47,6 @@ url = 'http://www.tinyerp.com'
 author = 'Tiny.be'
 author_email = 'info@tiny.be'
 license = 'GPL-2'
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/report/__init__.py b/bin/report/__init__.py
index cdd8fae06a3..adbe1d7ee74 100644
--- a/bin/report/__init__.py
+++ b/bin/report/__init__.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -37,3 +38,6 @@ import pychart
 import report_sxw
 
 import printscreen
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/report/common.py b/bin/report/common.py
index b8cc3593761..5497a272dea 100644
--- a/bin/report/common.py
+++ b/bin/report/common.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -31,3 +32,6 @@ pageSize = {
     'A4': (210,297),
     'A5': (148.5,105)
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/report/custom.py b/bin/report/custom.py
index ed072e330d2..cbba739e002 100644
--- a/bin/report/custom.py
+++ b/bin/report/custom.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -661,3 +662,6 @@ class report_custom(report_int):
         return True
 report_custom('report.custom')
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/report/int_to_text.py b/bin/report/int_to_text.py
index e867ed6085d..d16250f36b0 100644
--- a/bin/report/int_to_text.py
+++ b/bin/report/int_to_text.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -80,3 +81,6 @@ def int_to_text(i):
 if __name__=='__main__':
     for i in range(1,999999,139):
         print int_to_text(i)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/report/interface.py b/bin/report/interface.py
index 0ed5b73a07c..900d6a5e07e 100644
--- a/bin/report/interface.py
+++ b/bin/report/interface.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -230,3 +231,6 @@ def register_all(db):
                     opj('addons',r['report_xml']),
                     r['report_xsl'] and opj('addons',r['report_xsl']))
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/report/misc.py b/bin/report/misc.py
index a5926d65e28..a7d5c6e4f02 100644
--- a/bin/report/misc.py
+++ b/bin/report/misc.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -39,3 +40,6 @@ def choice_colors(n):
 
 if __name__=='__main__':
     print choice_colors(10)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/report/print_fnc.py b/bin/report/print_fnc.py
index 081222b758d..4c39153a0ff 100644
--- a/bin/report/print_fnc.py
+++ b/bin/report/print_fnc.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -40,3 +41,6 @@ def print_fnc(fnc, arg):
     if fnc in functions:
         return functions[fnc](arg)
     return ''
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/report/print_xml.py b/bin/report/print_xml.py
index 3be8b5419c4..0dd51f8f738 100644
--- a/bin/report/print_xml.py
+++ b/bin/report/print_xml.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -362,3 +363,6 @@ class document(object):
         self.doc = None
         self.dom = None
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/report/printscreen/__init__.py b/bin/report/printscreen/__init__.py
index a711d128e54..dfce9799c11 100644
--- a/bin/report/printscreen/__init__.py
+++ b/bin/report/printscreen/__init__.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -30,3 +31,6 @@
 import ps_list
 import ps_form
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/report/printscreen/ps_form.py b/bin/report/printscreen/ps_form.py
index f7bf398e61e..ceba82c0dde 100644
--- a/bin/report/printscreen/ps_form.py
+++ b/bin/report/printscreen/ps_form.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -160,3 +161,6 @@ class report_printscreen_list(report_int):
         return True
 report_printscreen_list('report.printscreen.form')
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/report/printscreen/ps_list.py b/bin/report/printscreen/ps_list.py
index a355be15679..f6323a410b6 100644
--- a/bin/report/printscreen/ps_list.py
+++ b/bin/report/printscreen/ps_list.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -203,3 +204,6 @@ class report_printscreen_list(report_int):
         return True
 report_printscreen_list('report.printscreen.list')
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/report/render/__init__.py b/bin/report/render/__init__.py
index 263bc3c3e13..f3c4035367f 100644
--- a/bin/report/render/__init__.py
+++ b/bin/report/render/__init__.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -36,3 +37,6 @@ try:
     import Image
 except:
     print 'WARNING; Python Imaging not installed, you can use only .JPG pictures !'
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/report/render/render.py b/bin/report/render/render.py
index ea03b3cfc32..6568ff1774a 100644
--- a/bin/report/render/render.py
+++ b/bin/report/render/render.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -79,3 +80,6 @@ if __name__=='__main__':
         time.sleep(1)
     print 'done!'
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/report/render/rml.py b/bin/report/render/rml.py
index b497fb7b4f7..f8b59bdb686 100644
--- a/bin/report/render/rml.py
+++ b/bin/report/render/rml.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -49,3 +50,6 @@ class rml2html(render.render):
     
     def _render(self):
         return htmlizer.parseString(self.xml)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/report/render/rml2html/__init__.py b/bin/report/render/rml2html/__init__.py
index 8b4b5c9d6e7..c9b686ae78b 100644
--- a/bin/report/render/rml2html/__init__.py
+++ b/bin/report/render/rml2html/__init__.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -43,3 +44,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 from rml2html import parseString
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/report/render/rml2html/rml2html.py b/bin/report/render/rml2html/rml2html.py
index 898d5c19ac9..79406aa90da 100644
--- a/bin/report/render/rml2html/rml2html.py
+++ b/bin/report/render/rml2html/rml2html.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -26,7 +27,6 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 ###############################################################################
 #!/usr/bin/python
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2005, Fabien Pinckaers, UCL, FSA
 #
@@ -390,3 +390,6 @@ if __name__=="__main__":
     else:
         print 'Usage: trml2pdf input.rml >output.pdf'
         print 'Try \'trml2pdf --help\' for more information.'
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/report/render/rml2html/utils.py b/bin/report/render/rml2html/utils.py
index 2cef5ce80b2..cac8c656964 100644
--- a/bin/report/render/rml2html/utils.py
+++ b/bin/report/render/rml2html/utils.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -92,3 +93,6 @@ def attr_get(node, attrs, dict={}):
             elif dict[key]=='int':
                 res[key] = int(node.getAttribute(key))
     return res
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/report/render/rml2pdf/__init__.py b/bin/report/render/rml2pdf/__init__.py
index c1bd24aeef0..35192f03d12 100644
--- a/bin/report/render/rml2pdf/__init__.py
+++ b/bin/report/render/rml2pdf/__init__.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -45,3 +46,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 from trml2pdf import parseString
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/report/render/rml2pdf/color.py b/bin/report/render/rml2pdf/color.py
index 6cb772999a2..c6d04707da6 100644
--- a/bin/report/render/rml2pdf/color.py
+++ b/bin/report/render/rml2pdf/color.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -61,3 +62,6 @@ def get(col_str):
     if res:
         return tuple([ float(int(res.group(i),16))/255 for i in range(1,4)])
     return colors.red
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index 555a2769e04..e90e91b58aa 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -26,7 +27,6 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 ###############################################################################
 #!/usr/bin/python
-# -*- coding: utf-8 -*-
 
 # trml2pdf - An RML to PDF converter
 # Copyright (C) 2003, Fabien Pinckaers, UCL, FSA
@@ -805,3 +805,6 @@ if __name__=="__main__":
     else:
         print 'Usage: trml2pdf input.rml >output.pdf'
         print 'Try \'trml2pdf --help\' for more information.'
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/report/render/rml2pdf/utils.py b/bin/report/render/rml2pdf/utils.py
index 5ee7997a5e5..f7eaa0e3531 100644
--- a/bin/report/render/rml2pdf/utils.py
+++ b/bin/report/render/rml2pdf/utils.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -92,3 +93,6 @@ def attr_get(node, attrs, dict={}):
             elif dict[key]=='int':
                 res[key] = int(node.getAttribute(key))
     return res
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/report/render/simple.py b/bin/report/render/simple.py
index a3a642a6119..6939301a3d8 100644
--- a/bin/report/render/simple.py
+++ b/bin/report/render/simple.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -89,3 +90,6 @@ if __name__=='__main__':
         </author-list>
     </test>''')
     print s.render()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py
index 13a3ca02f3b..76a50b95737 100644
--- a/bin/report/report_sxw.py
+++ b/bin/report/report_sxw.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -659,3 +660,6 @@ class report_sxw(report_rml):
         return (pdf, report_type)
 
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/service/__init__.py b/bin/service/__init__.py
index d90d720770f..4703a8aa3ee 100644
--- a/bin/service/__init__.py
+++ b/bin/service/__init__.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -28,3 +29,6 @@
 
 import web_services
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/service/security.py b/bin/service/security.py
index 629f27b050d..7e8ace1b140 100644
--- a/bin/service/security.py
+++ b/bin/service/security.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -73,3 +74,6 @@ def access(db, uid, passwd, sec_level, ids):
     if not res:
         raise Exception('Bad username or password')
     return res[0]
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/service/web_services.py b/bin/service/web_services.py
index 7d431a76a6d..ada35fd0626 100644
--- a/bin/service/web_services.py
+++ b/bin/service/web_services.py
@@ -512,4 +512,6 @@ class report_spool(netsvc.Service):
 
 report_spool()
 
-# vim:noexpandtab
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/sql_db.py b/bin/sql_db.py
index e089280a24f..98cd44fb985 100644
--- a/bin/sql_db.py
+++ b/bin/sql_db.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -154,3 +155,6 @@ psycopg.register_type(psycopg.new_type((1082,), "date", lambda x:x))
 psycopg.register_type(psycopg.new_type((1083,), "time", lambda x:x))
 psycopg.register_type(psycopg.new_type((1114,), "datetime", lambda x:x))
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/ssl/SecureXMLRPCServer.py b/bin/ssl/SecureXMLRPCServer.py
index 22eefa7f4c2..689715d70ea 100644
--- a/bin/ssl/SecureXMLRPCServer.py
+++ b/bin/ssl/SecureXMLRPCServer.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -138,3 +139,6 @@ class SecureXMLRPCServer(SimpleXMLRPCServer.SimpleXMLRPCServer, SecureTCPServer)
         self.instance = None
         SecureTCPServer.__init__(self, addr, requestHandler)
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/ssl/__init__.py b/bin/ssl/__init__.py
index d371304aaa5..59a5c766abe 100644
--- a/bin/ssl/__init__.py
+++ b/bin/ssl/__init__.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -28,3 +29,6 @@
 
 
 import SecureXMLRPCServer
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/tiny_socket.py b/bin/tiny_socket.py
index 843565406c7..076155748d3 100644
--- a/bin/tiny_socket.py
+++ b/bin/tiny_socket.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -88,3 +89,6 @@ class mysocket:
             raise res[0]
         else:
             return res[0]
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/tinyerp-server.py b/bin/tinyerp-server.py
old mode 100644
new mode 100755
index bd08be09346..3bef58fb0c9
--- a/bin/tinyerp-server.py
+++ b/bin/tinyerp-server.py
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -275,3 +276,6 @@ if tools.config['xmlrpc']:
 
 while True:
     time.sleep(1)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/tools/__init__.py b/bin/tools/__init__.py
index 6fb398d4aee..6a3022006fc 100644
--- a/bin/tools/__init__.py
+++ b/bin/tools/__init__.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -30,3 +31,6 @@ from misc import *
 from convert import *
 from translate import *
 from graph import graph
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/tools/amount_to_text.py b/bin/tools/amount_to_text.py
index ae4ff453161..a8afcfc9f1e 100644
--- a/bin/tools/amount_to_text.py
+++ b/bin/tools/amount_to_text.py
@@ -1,4 +1,4 @@
-# -*- coding: iso8859-1 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -211,3 +211,6 @@ if __name__=='__main__':
     else:
         print amount_to_text(int(argv[1]), lang)
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/tools/config.py b/bin/tools/config.py
index 5b279a9eed2..5f48ecc2e57 100644
--- a/bin/tools/config.py
+++ b/bin/tools/config.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -237,3 +238,6 @@ class configmanager(object):
 config = configmanager()
 
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/tools/convert.py b/bin/tools/convert.py
index 3157505325f..bca44cb349f 100644
--- a/bin/tools/convert.py
+++ b/bin/tools/convert.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -778,3 +779,6 @@ def convert_xml_export(res):
     cr.commit()
     cr.close()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/tools/decimal.py b/bin/tools/decimal.py
index 677d26bb323..ba2a6578455 100644
--- a/bin/tools/decimal.py
+++ b/bin/tools/decimal.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 # Copyright (c) 2004 Python Software Foundation.
 # All rights reserved.
 
@@ -3077,3 +3078,6 @@ def _string2exact(s):
 if __name__ == '__main__':
     import doctest, sys
     doctest.testmod(sys.modules[__name__])
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/tools/graph.py b/bin/tools/graph.py
index 697bbd936d8..f07f8d5aa0d 100644
--- a/bin/tools/graph.py
+++ b/bin/tools/graph.py
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -331,3 +332,6 @@ if __name__=='__main__':
 
     img.save("graph.png", "PNG")
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/tools/import_email.py b/bin/tools/import_email.py
index e31d8e13800..e85a90f7ae8 100644
--- a/bin/tools/import_email.py
+++ b/bin/tools/import_email.py
@@ -171,3 +171,6 @@ if __name__ == '__main__':
     dispatcher = CommandDispatcher(ReceiverEmail2Event(rpc_dispatcher))
     parser = EmailParser(['To', 'Cc', 'From'], dispatcher)
     parser.parse(email.message_from_file(sys.stdin))
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index 457d22596d9..3afe99ed2e2 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -1,4 +1,4 @@
-# -*- coding: utf8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -641,4 +641,6 @@ if __name__ == '__main__':
     doctest.testmod()
 
 
-# vim:noexpandtab
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/tools/threadinglocal.py b/bin/tools/threadinglocal.py
index 512891b6a81..e268e874b45 100644
--- a/bin/tools/threadinglocal.py
+++ b/bin/tools/threadinglocal.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 #Copyright (c) 2004-2005, CherryPy Team (team@cherrypy.org)
 #All rights reserved.
 #
@@ -263,3 +264,6 @@ class local(_localbase):
     __del__ = __del__()
 
 from threading import currentThread, enumerate, RLock
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/tools/translate.py b/bin/tools/translate.py
index 8b9409dad1a..49bc774a230 100644
--- a/bin/tools/translate.py
+++ b/bin/tools/translate.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -537,3 +538,6 @@ def trans_load_data(db_name, fileobj, fileformat, lang, strict=False, lang_name=
     except IOError:
         logger.notifyChannel("init", netsvc.LOG_ERROR, "couldn't read file")
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/tools/upgrade.py b/bin/tools/upgrade.py
index 2d9c39ece2c..7f56126ddc4 100644
--- a/bin/tools/upgrade.py
+++ b/bin/tools/upgrade.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -93,3 +94,6 @@ def upgrade():
     cr.close()
     return (toinit, toupdate)
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/wizard/__init__.py b/bin/wizard/__init__.py
index adeaee803d0..6aaa289359f 100644
--- a/bin/wizard/__init__.py
+++ b/bin/wizard/__init__.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -176,3 +177,6 @@ class interface(netsvc.Service):
         finally:
             cr.close()
         return res
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/workflow/__init__.py b/bin/workflow/__init__.py
index d72cdadba4f..8651478dda2 100644
--- a/bin/workflow/__init__.py
+++ b/bin/workflow/__init__.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -28,3 +29,6 @@
 
 import wkf_service
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/workflow/common.py b/bin/workflow/common.py
index 9eba6b62926..21c3edd2ee7 100644
--- a/bin/workflow/common.py
+++ b/bin/workflow/common.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be)
@@ -29,3 +30,6 @@ class except_wkf(Exception):
     def __init__(self, name, value):
         self.name = name
         self.value = value
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/workflow/instance.py b/bin/workflow/instance.py
index 82071e462f7..dedc7bb1102 100644
--- a/bin/workflow/instance.py
+++ b/bin/workflow/instance.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -84,3 +85,6 @@ def _update_end(cr, inst_id, ident):
                 validate(cr, i[0], (ident[0],i[1],i[2]), 'subflow.'+act_name[0])
     return ok
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/workflow/wkf_expr.py b/bin/workflow/wkf_expr.py
index dca3e666efe..73573a231d2 100644
--- a/bin/workflow/wkf_expr.py
+++ b/bin/workflow/wkf_expr.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -108,3 +109,6 @@ def check(cr, workitem, ident, transition, signal):
     ok = ok and _eval_expr(cr, ident, workitem, transition['condition'])
     return ok
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/workflow/wkf_logs.py b/bin/workflow/wkf_logs.py
index f8d68c1f37a..24134965d55 100644
--- a/bin/workflow/wkf_logs.py
+++ b/bin/workflow/wkf_logs.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -33,3 +34,6 @@
 def log(cr,ident,act_id,info=''):
     pass
     #cr.execute('insert into wkf_logs (res_type, res_id, uid, act_id, time, info) values (%s,%d,%d,%d,current_time,%s)', (ident[1],int(ident[2]),int(ident[0]),int(act_id),info))
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/workflow/wkf_service.py b/bin/workflow/wkf_service.py
index e980c47af90..89901de69db 100644
--- a/bin/workflow/wkf_service.py
+++ b/bin/workflow/wkf_service.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -110,3 +111,6 @@ class workflow_service(netsvc.Service):
                     # redirect all those workitems to the wkf instance of the new resource
                     cr.execute('update wkf_workitem set subflow_id=%d where id=%d', (new_id[0], item_id))
 workflow_service()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/bin/workflow/workitem.py b/bin/workflow/workitem.py
index 54076a9e729..e1cf07ae5c5 100644
--- a/bin/workflow/workitem.py
+++ b/bin/workflow/workitem.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -193,3 +194,6 @@ def _join_test(cr, trans_id, inst_id, ident, stack):
             for (id,) in trans_ids:
                 cr.execute('delete from wkf_witm_trans where trans_id=%d and inst_id=%d', (id,inst_id))
             create(cr, [activity], inst_id, ident, stack)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/doc/migrate/3.3.0-3.4.0/post.py b/doc/migrate/3.3.0-3.4.0/post.py
index 6983bfad519..b1a4c68ba7f 100644
--- a/doc/migrate/3.3.0-3.4.0/post.py
+++ b/doc/migrate/3.3.0-3.4.0/post.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -149,3 +150,6 @@ cr.commit()
 
 cr.close()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/doc/migrate/3.3.0-3.4.0/pre.py b/doc/migrate/3.3.0-3.4.0/pre.py
index df8e4a7d487..5168ef940c9 100644
--- a/doc/migrate/3.3.0-3.4.0/pre.py
+++ b/doc/migrate/3.3.0-3.4.0/pre.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -115,3 +116,6 @@ for line in (
 
 cr.commit()
 cr.close()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/doc/migrate/3.4.0-4.0.0/post-tiny.py b/doc/migrate/3.4.0-4.0.0/post-tiny.py
index 5c3646de8a0..59835fb1956 100644
--- a/doc/migrate/3.4.0-4.0.0/post-tiny.py
+++ b/doc/migrate/3.4.0-4.0.0/post-tiny.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -90,3 +91,6 @@ cr.commit()
 
 cr.close()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/doc/migrate/3.4.0-4.0.0/post.py b/doc/migrate/3.4.0-4.0.0/post.py
index c90da55750a..f8518810c44 100644
--- a/doc/migrate/3.4.0-4.0.0/post.py
+++ b/doc/migrate/3.4.0-4.0.0/post.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -119,3 +120,6 @@ EXAMPLE:
 
 cr.close()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/doc/migrate/3.4.0-4.0.0/pre-tiny.py b/doc/migrate/3.4.0-4.0.0/pre-tiny.py
index c76e3520f5b..e011d0b451b 100644
--- a/doc/migrate/3.4.0-4.0.0/pre-tiny.py
+++ b/doc/migrate/3.4.0-4.0.0/pre-tiny.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -148,3 +149,6 @@ for line in (
 
 cr.commit()
 cr.close()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/doc/migrate/3.4.0-4.0.0/pre.py b/doc/migrate/3.4.0-4.0.0/pre.py
index ceb3683d1bc..8a520232e74 100644
--- a/doc/migrate/3.4.0-4.0.0/pre.py
+++ b/doc/migrate/3.4.0-4.0.0/pre.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -130,3 +131,6 @@ for line in (
 
 cr.commit()
 cr.close()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/doc/migrate/4.0.0-4.2.0/pre.py b/doc/migrate/4.0.0-4.2.0/pre.py
index e3f6d4905c3..06c6a2b9a68 100644
--- a/doc/migrate/4.0.0-4.2.0/pre.py
+++ b/doc/migrate/4.0.0-4.2.0/pre.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -251,3 +251,6 @@ if not cr.fetchall():
 cr.commit()
 
 cr.close
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/doc/migrate/4.0.0-4.2.0/tiny/pre-tiny.py b/doc/migrate/4.0.0-4.2.0/tiny/pre-tiny.py
index b63fff6dda6..14163694001 100644
--- a/doc/migrate/4.0.0-4.2.0/tiny/pre-tiny.py
+++ b/doc/migrate/4.0.0-4.2.0/tiny/pre-tiny.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -192,3 +192,6 @@ if not cr.fetchall():
 cr.commit()
 
 cr.close
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/doc/migrate/4.2.0-4.4.0/pre.py b/doc/migrate/4.2.0-4.4.0/pre.py
index 8d0ad4243a0..86affd40261 100644
--- a/doc/migrate/4.2.0-4.4.0/pre.py
+++ b/doc/migrate/4.2.0-4.4.0/pre.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -115,3 +115,6 @@ cr.commit()
 
 
 cr.close()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/doc/tests/check_profile_l10n_all.py b/doc/tests/check_profile_l10n_all.py
index d53d911adb8..d8d7cf05e4f 100644
--- a/doc/tests/check_profile_l10n_all.py
+++ b/doc/tests/check_profile_l10n_all.py
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
@@ -123,3 +124,6 @@ for demo in demos:
 
 
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/setup.py b/setup.py
index 2c8923f4f3b..a781f7a0c5c 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,5 @@
-# -*- coding: utf-8 -*-
 #!/usr/bin/env python
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -187,4 +187,6 @@ setup(name             = name,
       options = options,
       )
 
-# vim:expandtab:tw=80
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/win32/TinyERPServerService.py b/win32/TinyERPServerService.py
index ca07917ac94..1a2b208417b 100644
--- a/win32/TinyERPServerService.py
+++ b/win32/TinyERPServerService.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -105,3 +106,6 @@ class TinyERPServerService(win32serviceutil.ServiceFramework):
 if __name__=='__main__':
     # Do with the service whatever option is passed in the command line
     win32serviceutil.HandleCommandLine(TinyERPServerService)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/win32/setup.py b/win32/setup.py
index dfb78784b72..69be7ac30df 100644
--- a/win32/setup.py
+++ b/win32/setup.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
@@ -36,3 +37,6 @@ setup(service=["TinyERPServerService"],
                                      "FixTk"],
                          "compressed": 1}}
       )
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+