summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorChristopheChauvet(syleam) <>2009-10-13 11:28:37 +0530
committerHDA (OpenERP) <hda@tinyerp.com>2009-10-13 11:28:37 +0530
commit41e8ed59efc26062da19b8eaf3f9e58489a00cb8 (patch)
treec9f9ea559e21c34ec6a7c68d533c712ef3b52d85 /addons
parentc6e7a0d8ee21c02cdbcfd584961640c6a0344e25 (diff)
changed encoding to coding in all py files
lp bug: https://launchpad.net/bugs/357182 fixed bzr revid: hda@tinyerp.com-20091013055837-3ntnbe8b938xmk97
Diffstat (limited to 'addons')
-rw-r--r--addons/account/account.py2
-rw-r--r--addons/account/account_analytic_line.py2
-rw-r--r--addons/account/account_bank_statement.py2
-rw-r--r--addons/account/account_move_line.py2
-rw-r--r--addons/account/invoice.py2
-rw-r--r--addons/account/partner.py2
-rw-r--r--addons/account/product.py2
-rw-r--r--addons/account/project/__init__.py2
-rw-r--r--addons/account/project/project.py2
-rw-r--r--addons/account/project/report/__init__.py2
-rw-r--r--addons/account/project/report/account_journal.py2
-rw-r--r--addons/account/project/report/analytic_balance.py2
-rw-r--r--addons/account/project/report/analytic_check.py2
-rw-r--r--addons/account/project/report/analytic_journal.py2
-rw-r--r--addons/account/project/report/cost_ledger.py2
-rw-r--r--addons/account/project/report/inverted_analytic_balance.py2
-rw-r--r--addons/account/project/report/quantity_cost_ledger.py2
-rw-r--r--addons/account/project/wizard/__init__.py2
-rw-r--r--addons/account/project/wizard/wizard_account_analytic_analytic_check.py2
-rw-r--r--addons/account/project/wizard/wizard_account_analytic_balance_report.py2
-rw-r--r--addons/account/project/wizard/wizard_account_analytic_cost_ledger_for_journal_report.py2
-rw-r--r--addons/account/project/wizard/wizard_account_analytic_cost_ledger_report.py2
-rw-r--r--addons/account/project/wizard/wizard_account_analytic_inverted_balance_report.py2
-rw-r--r--addons/account/project/wizard/wizard_account_analytic_journal_report.py2
-rw-r--r--addons/account/project/wizard/wizard_account_analytic_line.py2
-rw-r--r--addons/account/report/__init__.py2
-rw-r--r--addons/account/report/account_balance.py2
-rw-r--r--addons/account/report/account_journal.py2
-rw-r--r--addons/account/report/aged_trial_balance.py2
-rw-r--r--addons/account/report/central_journal.py2
-rw-r--r--addons/account/report/general_ledger.py2
-rw-r--r--addons/account/report/general_ledger_landscape.py2
-rw-r--r--addons/account/report/invoice.py2
-rw-r--r--addons/account/report/overdue.py2
-rwxr-xr-xaddons/account/report/partner_balance.py2
-rw-r--r--addons/account/report/rml_parse.py2
-rw-r--r--addons/account/report/tax_report.py2
-rw-r--r--addons/account/sequence.py2
-rw-r--r--addons/account/wizard/__init__.py2
-rw-r--r--addons/account/wizard/wizard_account_balance_report.py2
-rw-r--r--addons/account/wizard/wizard_account_chart.py2
-rw-r--r--addons/account/wizard/wizard_account_duplicate.py2
-rwxr-xr-xaddons/account/wizard/wizard_aged_trial_balance.py2
-rw-r--r--addons/account/wizard/wizard_automatic_reconcile.py2
-rw-r--r--addons/account/wizard/wizard_bank_reconcile.py2
-rw-r--r--addons/account/wizard/wizard_central_journal.py2
-rw-r--r--addons/account/wizard/wizard_fiscalyear_close.py2
-rw-r--r--addons/account/wizard/wizard_fiscalyear_close_state.py2
-rw-r--r--addons/account/wizard/wizard_general_journal.py2
-rw-r--r--addons/account/wizard/wizard_general_ledger_report.py2
-rw-r--r--addons/account/wizard/wizard_invoice_state.py2
-rw-r--r--addons/account/wizard/wizard_journal.py2
-rw-r--r--addons/account/wizard/wizard_journal_select.py2
-rw-r--r--addons/account/wizard/wizard_move_line_select.py2
-rw-r--r--addons/account/wizard/wizard_open_closed_fiscalyear.py2
-rw-r--r--addons/account/wizard/wizard_partner_balance_report.py2
-rw-r--r--addons/account/wizard/wizard_pay_invoice.py2
-rw-r--r--addons/account/wizard/wizard_period_close.py2
-rw-r--r--addons/account/wizard/wizard_print_journal.py2
-rw-r--r--addons/account/wizard/wizard_reconcile.py2
-rw-r--r--addons/account/wizard/wizard_reconcile_select.py2
-rw-r--r--addons/account/wizard/wizard_refund.py2
-rw-r--r--addons/account/wizard/wizard_state_open.py2
-rw-r--r--addons/account/wizard/wizard_statement_from_invoice.py2
-rw-r--r--addons/account/wizard/wizard_subscription_generate.py2
-rw-r--r--addons/account/wizard/wizard_unreconcile.py2
-rw-r--r--addons/account/wizard/wizard_unreconcile_select.py2
-rw-r--r--addons/account/wizard/wizard_use_model.py2
-rw-r--r--addons/account/wizard/wizard_validate_account_move.py2
-rwxr-xr-xaddons/account/wizard/wizard_vat.py2
-rw-r--r--addons/account_analytic_analysis/__init__.py2
-rw-r--r--addons/account_analytic_analysis/__terp__.py2
-rw-r--r--addons/account_analytic_analysis/account_analytic_analysis.py2
-rw-r--r--addons/account_analytic_default/__init__.py2
-rw-r--r--addons/account_analytic_default/__terp__.py2
-rw-r--r--addons/account_analytic_default/account_analytic_default.py2
-rw-r--r--addons/account_analytic_plans/__init__.py2
-rw-r--r--addons/account_analytic_plans/__terp__.py2
-rw-r--r--addons/account_analytic_plans/account_analytic_plans.py2
-rw-r--r--addons/account_analytic_plans/report/__init__.py2
-rw-r--r--addons/account_analytic_plans/report/crossovered_analytic.py2
-rw-r--r--addons/account_analytic_plans/wizard/__init__.py2
-rw-r--r--addons/account_analytic_plans/wizard/create_model.py2
-rw-r--r--addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py2
-rw-r--r--addons/account_balance/__init__.py2
-rw-r--r--addons/account_balance/__terp__.py2
-rw-r--r--addons/account_balance/account_move_line.py2
-rw-r--r--addons/account_balance/report/__init__.py2
-rw-r--r--addons/account_balance/report/account_balance.py2
-rw-r--r--addons/account_balance/wizard/__init__.py2
-rw-r--r--addons/account_balance/wizard/wizard_account_balance_report.py2
-rw-r--r--addons/account_budget/__init__.py2
-rw-r--r--addons/account_budget/__terp__.py2
-rw-r--r--addons/account_budget/crossovered_budget.py2
-rw-r--r--addons/account_budget/report/__init__.py2
-rw-r--r--addons/account_budget/report/analytic_account_budget_report.py2
-rw-r--r--addons/account_budget/report/budget_report.py2
-rw-r--r--addons/account_budget/report/crossovered_budget_report.py2
-rw-r--r--addons/account_budget/wizard/__init__.py2
-rw-r--r--addons/account_budget/wizard/wizard_analytic_account_budget.py2
-rw-r--r--addons/account_budget/wizard/wizard_budget_report.py2
-rw-r--r--addons/account_budget/wizard/wizard_budget_spread.py2
-rw-r--r--addons/account_budget/wizard/wizard_crossovered_budget_report.py2
-rw-r--r--addons/account_budget/wizard/wizard_crossovered_budget_summary_report.py2
-rw-r--r--addons/account_chart/__init__.py2
-rw-r--r--addons/account_chart/__terp__.py2
-rw-r--r--addons/account_date_check/__init__.py2
-rw-r--r--addons/account_date_check/__terp__.py2
-rw-r--r--addons/account_date_check/account_date_check.py2
-rw-r--r--addons/account_followup/__init__.py2
-rw-r--r--addons/account_followup/__terp__.py2
-rw-r--r--addons/account_followup/followup.py2
-rw-r--r--addons/account_followup/followup_report.py2
-rw-r--r--addons/account_followup/report/__init__.py2
-rw-r--r--addons/account_followup/report/report_followup_print.py2
-rw-r--r--addons/account_followup/wizard/__init__.py2
-rw-r--r--addons/account_followup/wizard/wizard_followup_print.py2
-rw-r--r--addons/account_invoice_layout/__init__.py2
-rw-r--r--addons/account_invoice_layout/__terp__.py2
-rw-r--r--addons/account_invoice_layout/account_invoice_layout.py2
-rw-r--r--addons/account_invoice_layout/report/__init__.py2
-rw-r--r--addons/account_invoice_layout/wizard/__init__.py2
-rw-r--r--addons/account_invoice_layout/wizard/invoice_special_message.py2
-rw-r--r--addons/account_payment/__init__.py2
-rw-r--r--addons/account_payment/__terp__.py2
-rw-r--r--addons/account_payment/account_invoice.py2
-rw-r--r--addons/account_payment/account_move_line.py2
-rw-r--r--addons/account_payment/payment.py2
-rw-r--r--addons/account_payment/report/__init__.py2
-rw-r--r--addons/account_payment/report/payment_order.py2
-rw-r--r--addons/account_payment/wizard/__init__.py2
-rw-r--r--addons/account_payment/wizard/wizard_pay.py2
-rw-r--r--addons/account_payment/wizard/wizard_payment_order.py2
-rw-r--r--addons/account_payment/wizard/wizard_populate_statement.py2
-rw-r--r--addons/account_report/__init__.py2
-rw-r--r--addons/account_report/__terp__.py2
-rw-r--r--addons/account_report/account.py2
-rw-r--r--addons/account_report/report/__init__.py2
-rw-r--r--addons/account_report/report/accounting_report.py2
-rw-r--r--addons/account_report/report/print_indicator.py4
-rw-r--r--addons/account_report/wizard/__init__.py2
-rw-r--r--addons/account_report/wizard/wizard_print_indicators.py2
-rw-r--r--addons/account_report/wizard/wizard_print_indicators_with_pdf.py2
-rw-r--r--addons/account_reporting/__init__.py2
-rw-r--r--addons/account_reporting/__terp__.py2
-rw-r--r--addons/account_reporting/account.py2
-rw-r--r--addons/account_reporting/report/__init__.py2
-rw-r--r--addons/account_reporting/report/account_report_bs.py2
-rw-r--r--addons/account_reporting/wizard/__init__.py2
-rw-r--r--addons/account_reporting/wizard/wizard_account_balance_report.py2
-rw-r--r--addons/account_tax_include/__init__.py2
-rw-r--r--addons/account_tax_include/__terp__.py2
-rw-r--r--addons/account_tax_include/invoice_tax_incl.py2
-rwxr-xr-xaddons/account_voucher/__init__.py2
-rwxr-xr-xaddons/account_voucher/__terp__.py2
-rwxr-xr-xaddons/account_voucher/voucher.py2
-rw-r--r--addons/analytic_journal_billing_rate/__init__.py2
-rw-r--r--addons/analytic_journal_billing_rate/__terp__.py2
-rw-r--r--addons/analytic_journal_billing_rate/analytic_journal_billing_rate.py2
-rw-r--r--addons/analytic_user_function/__init__.py2
-rw-r--r--addons/analytic_user_function/__terp__.py2
-rw-r--r--addons/analytic_user_function/analytic_user_function.py2
-rw-r--r--addons/auction/__init__.py2
-rw-r--r--addons/auction/__terp__.py2
-rw-r--r--addons/auction/report/__init__.py2
-rw-r--r--addons/auction/report/artists_lots.py2
-rw-r--r--addons/auction/report/auction_artists.py2
-rw-r--r--addons/auction/report/auction_bids.py2
-rw-r--r--addons/auction/report/auction_buyer_result.py2
-rw-r--r--addons/auction/report/auction_catelog.py2
-rw-r--r--addons/auction/report/auction_invoice.py2
-rw-r--r--addons/auction/report/auction_objects.py2
-rw-r--r--addons/auction/report/auction_result.py2
-rw-r--r--addons/auction/report/auction_total_rml.py2
-rw-r--r--addons/auction/report/bids_lots.py2
-rw-r--r--addons/auction/report/bids_phones_details.py2
-rw-r--r--addons/auction/report/buyer_form_report.py2
-rw-r--r--addons/auction/report/buyer_list.py2
-rw-r--r--addons/auction/report/catelogwithpictures.py2
-rw-r--r--addons/auction/report/deposit_seller.py2
-rw-r--r--addons/auction/report/huissier.py2
-rw-r--r--addons/auction/report/lots_list.py2
-rw-r--r--addons/auction/report/lots_list_inventory.py2
-rw-r--r--addons/auction/report/lots_list_landscape.py2
-rw-r--r--addons/auction/report/photo_shadow.py2
-rw-r--r--addons/auction/report/report_lot_bar_code.py2
-rw-r--r--addons/auction/report/seller_address.py2
-rw-r--r--addons/auction/report/seller_form_report.py2
-rw-r--r--addons/auction/report/total.py2
-rw-r--r--addons/auction/wizard/__init__.py2
-rw-r--r--addons/auction/wizard/auction_catalog_flagey.py2
-rw-r--r--addons/auction/wizard/auction_wizard_able_taken.py2
-rw-r--r--addons/auction/wizard/auction_wizard_enable_taken.py2
-rw-r--r--addons/auction/wizard/wizard_aie_send.py2
-rw-r--r--addons/auction/wizard/wizard_aie_send_result.py2
-rw-r--r--addons/auction/wizard/wizard_auction_invoice_buyer.py2
-rw-r--r--addons/auction/wizard/wizard_auction_journal.py2
-rw-r--r--addons/auction/wizard/wizard_emporte.py2
-rw-r--r--addons/auction/wizard/wizard_lot_date_move.py2
-rw-r--r--addons/auction/wizard/wizard_lots_buyer_map.py2
-rw-r--r--addons/auction/wizard/wizard_lots_cancel.py2
-rw-r--r--addons/auction/wizard/wizard_lots_invoice.py2
-rw-r--r--addons/auction/wizard/wizard_lots_numerotate.py2
-rw-r--r--addons/auction/wizard/wizard_lots_pay.py2
-rw-r--r--addons/auction/wizard/wizard_lots_sms.py2
-rw-r--r--addons/auction/wizard/wizard_pay.py2
-rw-r--r--addons/auction/wizard/wizard_payer.py2
-rw-r--r--addons/auction/wizard/wizard_transfer_unsold_object.py2
-rw-r--r--addons/audittrail/__init__.py2
-rw-r--r--addons/audittrail/__terp__.py2
-rw-r--r--addons/audittrail/audittrail.py2
-rw-r--r--addons/audittrail/wizard/__init__.py2
-rw-r--r--addons/audittrail/wizard/wizard_view_log.py2
-rw-r--r--addons/base_contact/__init__.py2
-rw-r--r--addons/base_contact/__terp__.py2
-rw-r--r--addons/base_contact/base_contact.py2
-rw-r--r--addons/base_iban/__init__.py2
-rw-r--r--addons/base_iban/__terp__.py2
-rw-r--r--addons/base_iban/base_iban.py2
-rw-r--r--addons/base_module_merge/__init__.py2
-rw-r--r--addons/base_module_merge/__terp__.py2
-rw-r--r--addons/base_module_merge/wizard/__init__.py2
-rw-r--r--addons/base_module_merge/wizard/base_module_merge.py2
-rw-r--r--addons/base_module_publish/__init__.py2
-rw-r--r--addons/base_module_publish/__terp__.py2
-rw-r--r--addons/base_module_publish/wizard/__init__.py2
-rw-r--r--addons/base_module_publish/wizard/base_module_publish.py2
-rw-r--r--addons/base_module_publish/wizard/base_module_publish_all.py2
-rw-r--r--addons/base_module_publish/wizard/module_zip.py2
-rw-r--r--addons/base_module_publish/wizard/wizard_module_export.py2
-rw-r--r--addons/base_module_record/__init__.py2
-rw-r--r--addons/base_module_record/__terp__.py2
-rw-r--r--addons/base_module_record/base_module_record.py2
-rw-r--r--addons/base_module_record/wizard/__init__.py2
-rw-r--r--addons/base_module_record/wizard/base_module_record_objects.py2
-rw-r--r--addons/base_module_record/wizard/base_module_save.py2
-rw-r--r--addons/base_report_creator/__init__.py2
-rw-r--r--addons/base_report_creator/__terp__.py2
-rw-r--r--addons/base_report_creator/base_report_creator.py2
-rw-r--r--addons/base_report_creator/wizard/__init__.py2
-rw-r--r--addons/base_report_creator/wizard/base_report_creator_open.py2
-rw-r--r--addons/base_report_creator/wizard/report_menu_create.py2
-rw-r--r--addons/base_report_creator/wizard/wiz_set_filter_fields.py2
-rw-r--r--addons/base_report_designer/__init__.py2
-rw-r--r--addons/base_report_designer/__terp__.py2
-rw-r--r--addons/base_report_designer/base_report_designer.py2
-rw-r--r--addons/base_report_designer/wizard/__init__.py2
-rw-r--r--addons/base_report_designer/wizard/base_report_designer_modify.py2
-rw-r--r--addons/base_report_designer/wizard/tiny_sxw2rml/__init__.py2
-rw-r--r--addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py2
-rw-r--r--addons/base_setup/__init__.py2
-rw-r--r--addons/base_setup/__terp__.py2
-rw-r--r--addons/base_setup/wizard/__init__.py2
-rw-r--r--addons/base_setup/wizard/wizard_base_setup.py2
-rw-r--r--addons/base_vat/__init__.py2
-rw-r--r--addons/base_vat/__terp__.py2
-rw-r--r--addons/base_vat/partner.py2
-rw-r--r--addons/board/__init__.py2
-rw-r--r--addons/board/__terp__.py2
-rw-r--r--addons/board/board.py2
-rw-r--r--addons/board/wizard/__init__.py2
-rw-r--r--addons/board/wizard/board_wizard.py2
-rw-r--r--addons/board_account/__init__.py2
-rw-r--r--addons/board_account/__terp__.py2
-rw-r--r--addons/board_association/__init__.py2
-rw-r--r--addons/board_association/__terp__.py2
-rw-r--r--addons/board_auction/__terp__.py2
-rw-r--r--addons/board_crm_configuration/__init__.py2
-rw-r--r--addons/board_crm_configuration/__terp__.py2
-rw-r--r--addons/board_document/__terp__.py2
-rw-r--r--addons/board_manufacturing/__init__.py2
-rw-r--r--addons/board_manufacturing/__terp__.py2
-rw-r--r--addons/board_project/__init__.py2
-rw-r--r--addons/board_project/__terp__.py2
-rw-r--r--addons/board_sale/__init__.py2
-rw-r--r--addons/board_sale/__terp__.py2
-rw-r--r--addons/crm/__init__.py2
-rw-r--r--addons/crm/__terp__.py2
-rw-r--r--addons/crm/crm.py2
-rw-r--r--addons/crm/crm_operators.py2
-rw-r--r--addons/crm/crm_segmentation.py2
-rw-r--r--addons/crm/report/__init__.py2
-rw-r--r--addons/crm/report/report_businessopp.py2
-rwxr-xr-xaddons/crm/scripts/openerp-mailgate/openerp-mailgate.py2
-rw-r--r--addons/crm/wizard/__init__.py2
-rw-r--r--addons/crm/wizard/crm_wizard.py2
-rw-r--r--addons/crm_configuration/__init__.py2
-rw-r--r--addons/crm_configuration/__terp__.py2
-rw-r--r--addons/crm_configuration/report/__init__.py2
-rw-r--r--addons/crm_configuration/report/crm_report.py2
-rw-r--r--addons/crm_configuration/wizard/__init__.py2
-rw-r--r--addons/crm_configuration/wizard/meeting_planify.py2
-rw-r--r--addons/crm_configuration/wizard/wizard_opportunity_set.py2
-rw-r--r--addons/crm_configuration/wizard/wizard_partner_create.py2
-rw-r--r--addons/crm_profiling/__init__.py2
-rw-r--r--addons/crm_profiling/__terp__.py2
-rw-r--r--addons/crm_profiling/crm_profiling.py2
-rw-r--r--addons/crm_profiling/wizard/__init__.py2
-rw-r--r--addons/crm_profiling/wizard/open_questionnaire.py2
-rw-r--r--addons/crm_vertical/__init__.py2
-rw-r--r--addons/crm_vertical/__terp__.py2
-rw-r--r--addons/crm_vertical/crm_vertical.py2
-rw-r--r--addons/delivery/__init__.py2
-rw-r--r--addons/delivery/__terp__.py2
-rw-r--r--addons/delivery/delivery.py2
-rw-r--r--addons/delivery/partner.py2
-rw-r--r--addons/delivery/sale.py2
-rw-r--r--addons/delivery/stock.py2
-rw-r--r--addons/delivery/wizard/__init__.py2
-rw-r--r--addons/delivery/wizard/delivery_sale_order.py2
-rw-r--r--addons/document/__init__.py2
-rw-r--r--addons/document/__terp__.py2
-rw-r--r--addons/document/content_index.py2
-rw-r--r--addons/document/document.py2
-rw-r--r--addons/document/ftpserver/__init__.py2
-rw-r--r--addons/document/ftpserver/authorizer.py2
-rw-r--r--addons/document/ftpserver/ftpserver.py2
-rw-r--r--addons/document/odt2txt.py2
-rw-r--r--addons/document_ics/__init__.py2
-rw-r--r--addons/document_ics/__terp__.py2
-rw-r--r--addons/document_ics/document.py2
-rw-r--r--addons/event/__init__.py2
-rw-r--r--addons/event/__terp__.py2
-rw-r--r--addons/event/event.py2
-rw-r--r--addons/event/wizard/__init__.py2
-rw-r--r--addons/event/wizard/confirm_registration.py2
-rw-r--r--addons/event/wizard/event_registration.py2
-rw-r--r--addons/event/wizard/event_registrations_partner.py2
-rw-r--r--addons/event/wizard/make_invoice.py2
-rw-r--r--addons/event_project/__init__.py2
-rw-r--r--addons/event_project/__terp__.py2
-rw-r--r--addons/event_project/event.py2
-rw-r--r--addons/event_project/wizard/__init__.py2
-rw-r--r--addons/event_project/wizard/event_task.py2
-rw-r--r--addons/event_project/wizard/project_wizard.py2
-rw-r--r--addons/google_map/__init__.py2
-rw-r--r--addons/google_map/__terp__.py2
-rw-r--r--addons/google_map/google_map.py2
-rw-r--r--addons/google_map/wizard/__init__.py2
-rw-r--r--addons/google_map/wizard/google_map_launch.py2
-rw-r--r--addons/hr/__init__.py2
-rw-r--r--addons/hr/__terp__.py2
-rw-r--r--addons/hr/hr.py2
-rw-r--r--addons/hr_attendance/__init__.py2
-rw-r--r--addons/hr_attendance/__terp__.py2
-rw-r--r--addons/hr_attendance/hr_attendance.py2
-rw-r--r--addons/hr_attendance/report/__init__.py2
-rw-r--r--addons/hr_attendance/report/attendance_errors.py2
-rw-r--r--addons/hr_attendance/report/bymonth.py2
-rw-r--r--addons/hr_attendance/wizard/__init__.py2
-rw-r--r--addons/hr_attendance/wizard/print_attendance_error.py2
-rw-r--r--addons/hr_attendance/wizard/print_bymonth.py2
-rw-r--r--addons/hr_attendance/wizard/print_byweek.py2
-rw-r--r--addons/hr_attendance/wizard/sign_in_out.py2
-rw-r--r--addons/hr_contract/__init__.py2
-rw-r--r--addons/hr_contract/__terp__.py2
-rw-r--r--addons/hr_contract/hr_contract.py2
-rw-r--r--addons/hr_expense/__init__.py2
-rw-r--r--addons/hr_expense/__terp__.py2
-rw-r--r--addons/hr_expense/hr_expense.py2
-rw-r--r--addons/hr_expense/report/__init__.py2
-rw-r--r--addons/hr_expense/report/expense.py2
-rw-r--r--addons/hr_holidays/__init__.py2
-rw-r--r--addons/hr_holidays/__terp__.py2
-rw-r--r--addons/hr_holidays/hr.py2
-rw-r--r--addons/hr_holidays/report/__init__.py2
-rw-r--r--addons/hr_holidays/report/holidays_summary_report.py2
-rw-r--r--addons/hr_holidays/wizard/__init__.py2
-rw-r--r--addons/hr_holidays/wizard/holidays_summary.py2
-rw-r--r--addons/hr_holidays/wizard/holidays_summary_employees.py2
-rw-r--r--addons/hr_timesheet/__init__.py2
-rw-r--r--addons/hr_timesheet/__terp__.py2
-rw-r--r--addons/hr_timesheet/hr_timesheet.py2
-rw-r--r--addons/hr_timesheet/report/__init__.py2
-rw-r--r--addons/hr_timesheet/report/user_timesheet.py2
-rw-r--r--addons/hr_timesheet/report/users_timesheet.py2
-rw-r--r--addons/hr_timesheet/wizard/__init__.py2
-rw-r--r--addons/hr_timesheet/wizard/sign_in_out.py2
-rw-r--r--addons/hr_timesheet/wizard/wizard_print_timesheet.py2
-rw-r--r--addons/hr_timesheet/wizard/wizard_print_timesheet_users.py2
-rw-r--r--addons/hr_timesheet_invoice/__init__.py2
-rw-r--r--addons/hr_timesheet_invoice/__terp__.py2
-rw-r--r--addons/hr_timesheet_invoice/hr_timesheet_invoice.py2
-rw-r--r--addons/hr_timesheet_invoice/report/__init__.py2
-rw-r--r--addons/hr_timesheet_invoice/report/account_analytic_profit.py2
-rw-r--r--addons/hr_timesheet_invoice/report/cost_ledger.py2
-rw-r--r--addons/hr_timesheet_invoice/wizard/__init__.py2
-rw-r--r--addons/hr_timesheet_invoice/wizard/account_analytic_profit.py2
-rw-r--r--addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py2
-rw-r--r--addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py2
-rw-r--r--addons/hr_timesheet_invoice/wizard/wizard_account_analytic_cost_ledger_report.py2
-rw-r--r--addons/hr_timesheet_sheet/__init__.py2
-rw-r--r--addons/hr_timesheet_sheet/__terp__.py2
-rw-r--r--addons/hr_timesheet_sheet/hr_timesheet_sheet.py2
-rw-r--r--addons/hr_timesheet_sheet/wizard/__init__.py2
-rw-r--r--addons/hr_timesheet_sheet/wizard/wizard_timesheet_current.py2
-rw-r--r--addons/hr_timesheet_sheet/wizard/wizard_timesheet_department.py2
-rw-r--r--addons/idea/__init__.py2
-rw-r--r--addons/idea/__terp__.py2
-rw-r--r--addons/l10n_be/__init__.py2
-rw-r--r--addons/l10n_be/__terp__.py2
-rw-r--r--addons/l10n_be/company.py2
-rw-r--r--addons/l10n_be/wizard/account_vat_declaration.py2
-rw-r--r--addons/l10n_be/wizard/partner_vat_listing.py2
-rwxr-xr-xaddons/l10n_ch/__init__.py2
-rwxr-xr-xaddons/l10n_ch/__terp__.py2
-rwxr-xr-xaddons/l10n_ch/company.py2
-rwxr-xr-xaddons/l10n_ch/dta.py2
-rwxr-xr-xaddons/l10n_ch/invoice.py2
-rwxr-xr-xaddons/l10n_ch/partner.py2
-rwxr-xr-xaddons/l10n_ch/payment.py2
-rwxr-xr-xaddons/l10n_ch/report/__init__.py2
-rwxr-xr-xaddons/l10n_ch/report/bvr.py2
-rwxr-xr-xaddons/l10n_ch/wizard/__init__.py2
-rwxr-xr-xaddons/l10n_ch/wizard/bvr_import.py2
-rwxr-xr-xaddons/l10n_ch/wizard/dta_wizard.py2
-rwxr-xr-xaddons/l10n_ch/wizard/journal_config.py2
-rwxr-xr-xaddons/l10n_ch/wizard/wizard_bvr.py2
-rw-r--r--addons/l10n_ch_chart_c2c_pcg/__terp__.py2
-rw-r--r--addons/l10n_chart_uk_minimal/__init__.py58
-rw-r--r--addons/l10n_chart_uk_minimal/__terp__.py2
-rw-r--r--addons/l10n_fr/__init__.py2
-rw-r--r--addons/l10n_fr/__terp__.py2
-rw-r--r--addons/l10n_fr/l10n_fr.py2
-rw-r--r--addons/l10n_fr/report/__init__.py2
-rw-r--r--addons/l10n_fr/report/base_report.py2
-rw-r--r--addons/l10n_fr/report/bilan.py2
-rw-r--r--addons/l10n_fr/report/cdr.py2
-rw-r--r--addons/l10n_fr/wizard/__init__.py2
-rw-r--r--addons/l10n_fr/wizard/bilan.py2
-rw-r--r--addons/l10n_fr/wizard/cdr.py2
-rw-r--r--addons/l10n_lu/__init__.py2
-rw-r--r--addons/l10n_lu/__terp__.py2
-rw-r--r--addons/l10n_lu/wizard/__init__.py2
-rw-r--r--addons/l10n_lu/wizard/pdf_ext.py2
-rw-r--r--addons/l10n_lu/wizard/print_vat.py2
-rw-r--r--addons/membership/__init__.py2
-rw-r--r--addons/membership/__terp__.py2
-rw-r--r--addons/membership/membership.py2
-rw-r--r--addons/membership/wizard/__init__.py2
-rw-r--r--addons/membership/wizard/invoice_membership.py2
-rw-r--r--addons/mrp/__init__.py2
-rw-r--r--addons/mrp/__terp__.py2
-rw-r--r--addons/mrp/company.py2
-rw-r--r--addons/mrp/mrp.py2
-rw-r--r--addons/mrp/report/__init__.py2
-rw-r--r--addons/mrp/report/order.py2
-rw-r--r--addons/mrp/report/price.py2
-rw-r--r--addons/mrp/report/workcenter_load.py2
-rw-r--r--addons/mrp/scripts/scheduler.py2
-rw-r--r--addons/mrp/wizard/__init__.py2
-rw-r--r--addons/mrp/wizard/make_procurement.py2
-rw-r--r--addons/mrp/wizard/wizard_change_production_qty.py2
-rw-r--r--addons/mrp/wizard/wizard_orderpoint_procurement.py2
-rw-r--r--addons/mrp/wizard/wizard_price.py2
-rw-r--r--addons/mrp/wizard/wizard_procurement.py2
-rw-r--r--addons/mrp/wizard/wizard_schedulers_all.py2
-rw-r--r--addons/mrp/wizard/wizard_track_prod.py2
-rw-r--r--addons/mrp/wizard/wizard_workcenter_load.py2
-rw-r--r--addons/mrp_jit/__init__.py2
-rw-r--r--addons/mrp_jit/__terp__.py2
-rw-r--r--addons/mrp_operations/__init__.py2
-rw-r--r--addons/mrp_operations/__terp__.py2
-rw-r--r--addons/mrp_operations/mrp_operations.py2
-rwxr-xr-xaddons/mrp_operations/report/__init__.py2
-rwxr-xr-xaddons/mrp_operations/report/mrp_code_barcode.py2
-rwxr-xr-xaddons/mrp_operations/report/mrp_wc_barcode.py2
-rw-r--r--addons/mrp_repair/__init__.py2
-rw-r--r--addons/mrp_repair/__terp__.py2
-rw-r--r--addons/mrp_repair/mrp_repair.py2
-rw-r--r--addons/mrp_repair/report/__init__.py2
-rw-r--r--addons/mrp_repair/report/order.py2
-rw-r--r--addons/mrp_repair/wizard/__init__.py2
-rw-r--r--addons/mrp_repair/wizard/wizard_cancel_repair.py2
-rw-r--r--addons/mrp_repair/wizard/wizard_make_invoice.py2
-rw-r--r--addons/mrp_subproduct/__init__.py2
-rw-r--r--addons/mrp_subproduct/__terp__.py2
-rw-r--r--addons/mrp_subproduct/mrp_subproduct.py2
-rw-r--r--addons/point_of_sale/__init__.py2
-rw-r--r--addons/point_of_sale/__terp__.py2
-rw-r--r--addons/point_of_sale/pos.py2
-rw-r--r--addons/point_of_sale/report/__init__.py2
-rw-r--r--addons/point_of_sale/report/pos_details.py2
-rw-r--r--addons/point_of_sale/report/pos_details_summary.py2
-rw-r--r--addons/point_of_sale/report/pos_invoice.py2
-rw-r--r--addons/point_of_sale/report/pos_lines.py2
-rw-r--r--addons/point_of_sale/report/pos_receipt.py2
-rw-r--r--addons/point_of_sale/stock.py2
-rw-r--r--addons/point_of_sale/wizard/__init__.py2
-rw-r--r--addons/point_of_sale/wizard/wizard_add_product.py2
-rw-r--r--addons/point_of_sale/wizard/wizard_confirm.py2
-rw-r--r--addons/point_of_sale/wizard/wizard_default_journal.py2
-rw-r--r--addons/point_of_sale/wizard/wizard_discount.py2
-rw-r--r--addons/point_of_sale/wizard/wizard_get_sale.py2
-rw-r--r--addons/point_of_sale/wizard/wizard_refund_order.py2
-rw-r--r--addons/process/__init__.py2
-rw-r--r--addons/process/__terp__.py2
-rw-r--r--addons/process/process.py2
-rw-r--r--addons/product/__init__.py2
-rw-r--r--addons/product/__terp__.py2
-rw-r--r--addons/product/_common.py2
-rw-r--r--addons/product/partner.py2
-rw-r--r--addons/product/pricelist.py2
-rw-r--r--addons/product/report/__init__.py2
-rw-r--r--addons/product/report/pricelist.py2
-rw-r--r--addons/product/wizard/__init__.py2
-rw-r--r--addons/product/wizard/wizard_price.py2
-rw-r--r--addons/product_margin/__init__.py2
-rw-r--r--addons/product_margin/__terp__.py2
-rw-r--r--addons/product_margin/product_margin.py2
-rw-r--r--addons/product_margin/wizard/__init__.py2
-rw-r--r--addons/product_margin/wizard/wizard_product_margin.py2
-rw-r--r--addons/profile_accounting/__init__.py2
-rw-r--r--addons/profile_accounting/__terp__.py2
-rw-r--r--addons/profile_accounting/profile_accounting.py2
-rw-r--r--addons/profile_association/__init__.py2
-rw-r--r--addons/profile_association/__terp__.py2
-rw-r--r--addons/profile_association/profile_association.py2
-rw-r--r--addons/profile_auction/__init__.py2
-rw-r--r--addons/profile_auction/__terp__.py2
-rw-r--r--addons/profile_crm/__init__.py2
-rw-r--r--addons/profile_crm/__terp__.py2
-rw-r--r--addons/profile_manufacturing/__init__.py2
-rw-r--r--addons/profile_manufacturing/__terp__.py2
-rw-r--r--addons/profile_manufacturing/profile_manufacturing.py2
-rw-r--r--addons/profile_service/__init__.py2
-rw-r--r--addons/profile_service/__terp__.py2
-rw-r--r--addons/profile_service/profile_service.py2
-rw-r--r--addons/project/__init__.py2
-rw-r--r--addons/project/__terp__.py2
-rw-r--r--addons/project/company.py2
-rw-r--r--addons/project/project.py2
-rw-r--r--addons/project/report/__init__.py2
-rw-r--r--addons/project/report/_date_compute.py2
-rw-r--r--addons/project/report/gantt.py2
-rw-r--r--addons/project/report/gantt_report.py2
-rw-r--r--addons/project/wizard/__init__.py2
-rw-r--r--addons/project/wizard/close_task.py2
-rw-r--r--addons/project/wizard/task_delegate.py2
-rw-r--r--addons/project_gtd/__init__.py2
-rw-r--r--addons/project_gtd/__terp__.py2
-rw-r--r--addons/project_gtd/project_gtd.py2
-rw-r--r--addons/project_gtd/wizard/__init__.py2
-rw-r--r--addons/project_gtd/wizard/project_gtd_daily.py2
-rw-r--r--addons/project_gtd/wizard/project_gtd_empty.py2
-rw-r--r--addons/project_gtd/wizard/project_gtd_fill.py2
-rw-r--r--addons/project_mrp/__init__.py2
-rw-r--r--addons/project_mrp/__terp__.py2
-rw-r--r--addons/project_mrp/mrp.py2
-rw-r--r--addons/project_mrp/project.py2
-rw-r--r--addons/project_retro_planning/__init__.py2
-rw-r--r--addons/project_retro_planning/__terp__.py2
-rw-r--r--addons/project_retro_planning/project_retro_planning.py2
-rw-r--r--addons/project_timesheet/__init__.py2
-rw-r--r--addons/project_timesheet/__terp__.py2
-rw-r--r--addons/project_timesheet/project_timesheet.py2
-rw-r--r--addons/purchase/__init__.py2
-rw-r--r--addons/purchase/__terp__.py2
-rw-r--r--addons/purchase/partner.py2
-rw-r--r--addons/purchase/purchase.py2
-rw-r--r--addons/purchase/report/__init__.py2
-rw-r--r--addons/purchase/report/order.py2
-rw-r--r--addons/purchase/report/request_quotation.py2
-rw-r--r--addons/purchase/wizard/__init__.py2
-rw-r--r--addons/purchase_analytic_plans/__init__.py2
-rw-r--r--addons/purchase_analytic_plans/__terp__.py2
-rw-r--r--addons/purchase_analytic_plans/purchase_analytic_plans.py2
-rw-r--r--addons/report_account/__init__.py2
-rw-r--r--addons/report_account/__terp__.py2
-rw-r--r--addons/report_account/report_receivable.py2
-rw-r--r--addons/report_analytic/__init__.py2
-rw-r--r--addons/report_analytic/__terp__.py2
-rw-r--r--addons/report_analytic/report_analytic.py2
-rw-r--r--addons/report_analytic_line/__init__.py2
-rw-r--r--addons/report_analytic_line/__terp__.py2
-rw-r--r--addons/report_analytic_line/report_analytic_line.py2
-rw-r--r--addons/report_analytic_planning/__init__.py2
-rw-r--r--addons/report_analytic_planning/__terp__.py2
-rw-r--r--addons/report_analytic_planning/report/__init__.py2
-rw-r--r--addons/report_crm/__init__.py2
-rw-r--r--addons/report_crm/__terp__.py2
-rw-r--r--addons/report_crm/report_crm.py2
-rw-r--r--addons/report_document/__init__.py2
-rw-r--r--addons/report_document/__terp__.py2
-rw-r--r--addons/report_document/report_document.py2
-rw-r--r--addons/report_intrastat/__init__.py2
-rw-r--r--addons/report_intrastat/__terp__.py2
-rw-r--r--addons/report_intrastat/report/__init__.py2
-rw-r--r--addons/report_intrastat/report/invoice.py2
-rw-r--r--addons/report_mrp/__init__.py2
-rw-r--r--addons/report_mrp/__terp__.py2
-rw-r--r--addons/report_mrp/report_mrp.py2
-rw-r--r--addons/report_project/__init__.py2
-rw-r--r--addons/report_project/__terp__.py2
-rw-r--r--addons/report_project/report_project.py2
-rw-r--r--addons/report_purchase/__init__.py2
-rw-r--r--addons/report_purchase/__terp__.py2
-rw-r--r--addons/report_purchase/report_purchase.py2
-rw-r--r--addons/report_sale/__init__.py2
-rw-r--r--addons/report_sale/__terp__.py2
-rw-r--r--addons/report_sale/report_sale.py2
-rw-r--r--addons/report_task/__init__.py2
-rw-r--r--addons/report_task/__terp__.py2
-rw-r--r--addons/report_task/report_task.py2
-rw-r--r--addons/report_timesheet/__init__.py2
-rw-r--r--addons/report_timesheet/__terp__.py2
-rw-r--r--addons/report_timesheet/report_timesheet.py2
-rw-r--r--addons/sale/__init__.py2
-rw-r--r--addons/sale/__terp__.py2
-rw-r--r--addons/sale/product.py2
-rw-r--r--addons/sale/report/__init__.py2
-rw-r--r--addons/sale/report/order.py2
-rw-r--r--addons/sale/report/sale_prepare_allot.py2
-rw-r--r--addons/sale/sale.py2
-rw-r--r--addons/sale/stock.py2
-rw-r--r--addons/sale/wizard/__init__.py2
-rw-r--r--addons/sale/wizard/make_invoice.py2
-rw-r--r--addons/sale/wizard/make_invoice_advance.py2
-rw-r--r--addons/sale/wizard/wizard_sale_line_invoice.py2
-rw-r--r--addons/sale_analytic_plans/__init__.py2
-rw-r--r--addons/sale_analytic_plans/__terp__.py2
-rw-r--r--addons/sale_analytic_plans/sale_analytic_plans.py2
-rw-r--r--addons/sale_crm/__init__.py2
-rw-r--r--addons/sale_crm/__terp__.py2
-rw-r--r--addons/sale_crm/wizard/__init__.py2
-rw-r--r--addons/sale_crm/wizard/makecase.py2
-rw-r--r--addons/sale_crm/wizard/makesale.py2
-rw-r--r--addons/sale_delivery_report/__init__.py2
-rw-r--r--addons/sale_delivery_report/__terp__.py2
-rw-r--r--addons/sale_delivery_report/report/__init__.py2
-rw-r--r--addons/sale_delivery_report/report/shipping.py2
-rw-r--r--addons/sale_journal/__init__.py2
-rw-r--r--addons/sale_journal/__terp__.py2
-rw-r--r--addons/sale_journal/sale_journal.py2
-rw-r--r--addons/sale_journal/sale_journal_inherit.py2
-rw-r--r--addons/sale_journal/sale_journal_picking_report.py2
-rw-r--r--addons/sale_journal/sale_journal_report.py2
-rw-r--r--addons/scrum/__init__.py2
-rw-r--r--addons/scrum/__terp__.py2
-rw-r--r--addons/scrum/report/__init__.py2
-rw-r--r--addons/scrum/report/_burndown.py2
-rw-r--r--addons/scrum/report/sprint_burndown.py2
-rw-r--r--addons/scrum/report/task_burndown.py2
-rw-r--r--addons/scrum/scrum.py2
-rw-r--r--addons/scrum/wizard/__init__.py2
-rw-r--r--addons/scrum/wizard/backlog_to_task.py2
-rw-r--r--addons/stock/__init__.py2
-rw-r--r--addons/stock/__terp__.py2
-rw-r--r--addons/stock/partner.py2
-rw-r--r--addons/stock/report/__init__.py2
-rw-r--r--addons/stock/report/picking.py2
-rw-r--r--addons/stock/report/product_stock.py2
-rw-r--r--addons/stock/report/stock_by_location.py2
-rw-r--r--addons/stock/report/stock_graph.py2
-rw-r--r--addons/stock/report/ups.py2
-rw-r--r--addons/stock/report_stock.py2
-rw-r--r--addons/stock/stock.py2
-rw-r--r--addons/stock/wizard/__init__.py2
-rw-r--r--addons/stock/wizard/inventory_merge.py2
-rw-r--r--addons/stock/wizard/inventory_merge_zero.py2
-rw-r--r--addons/stock/wizard/stock_traceability.py2
-rw-r--r--addons/stock/wizard/wizard_inventory.py2
-rwxr-xr-xaddons/stock/wizard/wizard_location_product.py2
-rw-r--r--addons/stock/wizard/wizard_partial_picking.py2
-rw-r--r--addons/stock/wizard/wizard_picking_make.py2
-rw-r--r--addons/stock/wizard/wizard_replacement.py2
-rw-r--r--addons/stock/wizard/wizard_return.py2
-rw-r--r--addons/stock/wizard/wizard_split_lot_line.py2
-rw-r--r--addons/stock/wizard/wizard_track_line.py2
-rw-r--r--addons/stock/wizard/wizard_ups.py2
-rw-r--r--addons/stock_invoice_directly/__init__.py2
-rw-r--r--addons/stock_invoice_directly/__terp__.py2
-rw-r--r--addons/stock_invoice_directly/wizard/__init__.py2
-rw-r--r--addons/stock_invoice_directly/wizard/stock_invoice.py2
-rw-r--r--addons/stock_location/__init__.py2
-rw-r--r--addons/stock_location/__terp__.py2
-rw-r--r--addons/stock_location/stock.py2
-rw-r--r--addons/stock_no_autopicking/__init__.py2
-rw-r--r--addons/stock_no_autopicking/__terp__.py2
-rw-r--r--addons/stock_no_autopicking/stock_no_autopicking.py2
-rw-r--r--addons/subscription/__init__.py2
-rw-r--r--addons/subscription/__terp__.py2
-rw-r--r--addons/subscription/subscription.py2
-rw-r--r--addons/warning/__init__.py2
-rw-r--r--addons/warning/__terp__.py2
-rw-r--r--addons/warning/warning.py2
-rw-r--r--addons/wiki/wiki.py2
-rw-r--r--addons/wiki/wizard/create_menu.py2
-rw-r--r--addons/wiki/wizard/make_index.py2
-rw-r--r--addons/wiki/wizard/open_page.py2
-rw-r--r--addons/wiki/wizard/show_diff.py2
691 files changed, 720 insertions, 720 deletions
diff --git a/addons/account/account.py b/addons/account/account.py
index b7b866e8f79..1b7f3f968f8 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index a6552d490c2..11499c9fdb1 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 63baf5165e4..c873f3fc7f5 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 1974d2c70e4..edb7ad6a5e7 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 559f0a88156..79d9cdd848f 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/partner.py b/addons/account/partner.py
index 9c1f13f6e81..e18392deaa2 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/product.py b/addons/account/product.py
index f9ae9598e69..485e8c7b7b7 100644
--- a/addons/account/product.py
+++ b/addons/account/product.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/project/__init__.py b/addons/account/project/__init__.py
index 72508d1eeae..e9f78dc3403 100644
--- a/addons/account/project/__init__.py
+++ b/addons/account/project/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/project/project.py b/addons/account/project/project.py
index bcec9209d22..e86d6a49df8 100644
--- a/addons/account/project/project.py
+++ b/addons/account/project/project.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/project/report/__init__.py b/addons/account/project/report/__init__.py
index 4df2cd92438..404f6db468e 100644
--- a/addons/account/project/report/__init__.py
+++ b/addons/account/project/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/project/report/account_journal.py b/addons/account/project/report/account_journal.py
index 2f46abaceda..102d3eba8c2 100644
--- a/addons/account/project/report/account_journal.py
+++ b/addons/account/project/report/account_journal.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/project/report/analytic_balance.py b/addons/account/project/report/analytic_balance.py
index 0c7b0cda761..0b77ca82140 100644
--- a/addons/account/project/report/analytic_balance.py
+++ b/addons/account/project/report/analytic_balance.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/project/report/analytic_check.py b/addons/account/project/report/analytic_check.py
index 6e794b35d87..ccd5ea5b1d7 100644
--- a/addons/account/project/report/analytic_check.py
+++ b/addons/account/project/report/analytic_check.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/project/report/analytic_journal.py b/addons/account/project/report/analytic_journal.py
index 30faa18fecc..32469532454 100644
--- a/addons/account/project/report/analytic_journal.py
+++ b/addons/account/project/report/analytic_journal.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/project/report/cost_ledger.py b/addons/account/project/report/cost_ledger.py
index 0641cfe2ba3..c22ebf15cae 100644
--- a/addons/account/project/report/cost_ledger.py
+++ b/addons/account/project/report/cost_ledger.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/project/report/inverted_analytic_balance.py b/addons/account/project/report/inverted_analytic_balance.py
index 345f60619d0..a47aee1df38 100644
--- a/addons/account/project/report/inverted_analytic_balance.py
+++ b/addons/account/project/report/inverted_analytic_balance.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/project/report/quantity_cost_ledger.py b/addons/account/project/report/quantity_cost_ledger.py
index 5e79e16c1ed..c81db6afc56 100644
--- a/addons/account/project/report/quantity_cost_ledger.py
+++ b/addons/account/project/report/quantity_cost_ledger.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/project/wizard/__init__.py b/addons/account/project/wizard/__init__.py
index c539b899fba..1009b3e1981 100644
--- a/addons/account/project/wizard/__init__.py
+++ b/addons/account/project/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/project/wizard/wizard_account_analytic_analytic_check.py b/addons/account/project/wizard/wizard_account_analytic_analytic_check.py
index 5af7e653622..c3bbf8865ad 100644
--- a/addons/account/project/wizard/wizard_account_analytic_analytic_check.py
+++ b/addons/account/project/wizard/wizard_account_analytic_analytic_check.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/project/wizard/wizard_account_analytic_balance_report.py b/addons/account/project/wizard/wizard_account_analytic_balance_report.py
index 57c9353ceeb..635c31a0e35 100644
--- a/addons/account/project/wizard/wizard_account_analytic_balance_report.py
+++ b/addons/account/project/wizard/wizard_account_analytic_balance_report.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/project/wizard/wizard_account_analytic_cost_ledger_for_journal_report.py b/addons/account/project/wizard/wizard_account_analytic_cost_ledger_for_journal_report.py
index 2cfa1942f60..d4f248d0b06 100644
--- a/addons/account/project/wizard/wizard_account_analytic_cost_ledger_for_journal_report.py
+++ b/addons/account/project/wizard/wizard_account_analytic_cost_ledger_for_journal_report.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/project/wizard/wizard_account_analytic_cost_ledger_report.py b/addons/account/project/wizard/wizard_account_analytic_cost_ledger_report.py
index c0849427f00..6b7a5f20032 100644
--- a/addons/account/project/wizard/wizard_account_analytic_cost_ledger_report.py
+++ b/addons/account/project/wizard/wizard_account_analytic_cost_ledger_report.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/project/wizard/wizard_account_analytic_inverted_balance_report.py b/addons/account/project/wizard/wizard_account_analytic_inverted_balance_report.py
index 1a9101d138e..27647b3a9b5 100644
--- a/addons/account/project/wizard/wizard_account_analytic_inverted_balance_report.py
+++ b/addons/account/project/wizard/wizard_account_analytic_inverted_balance_report.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/project/wizard/wizard_account_analytic_journal_report.py b/addons/account/project/wizard/wizard_account_analytic_journal_report.py
index ea46e97ae34..c165ac625cf 100644
--- a/addons/account/project/wizard/wizard_account_analytic_journal_report.py
+++ b/addons/account/project/wizard/wizard_account_analytic_journal_report.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/project/wizard/wizard_account_analytic_line.py b/addons/account/project/wizard/wizard_account_analytic_line.py
index 8a6774617b6..62360437ef3 100644
--- a/addons/account/project/wizard/wizard_account_analytic_line.py
+++ b/addons/account/project/wizard/wizard_account_analytic_line.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/report/__init__.py b/addons/account/report/__init__.py
index dd1143e71b3..3409aa3081f 100644
--- a/addons/account/report/__init__.py
+++ b/addons/account/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index ebf12dd9b08..2bafe343ac3 100644
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/report/account_journal.py b/addons/account/report/account_journal.py
index f3c87ca1603..a243d2983ad 100644
--- a/addons/account/report/account_journal.py
+++ b/addons/account/report/account_journal.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/report/aged_trial_balance.py b/addons/account/report/aged_trial_balance.py
index 652929e187d..f5596916ac0 100644
--- a/addons/account/report/aged_trial_balance.py
+++ b/addons/account/report/aged_trial_balance.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/report/central_journal.py b/addons/account/report/central_journal.py
index 2db5c6fe971..8301d252d01 100644
--- a/addons/account/report/central_journal.py
+++ b/addons/account/report/central_journal.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py
index 534b4d52e67..421512ba63c 100644
--- a/addons/account/report/general_ledger.py
+++ b/addons/account/report/general_ledger.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# Copyright (c) 2005-2006 CamptoCamp
diff --git a/addons/account/report/general_ledger_landscape.py b/addons/account/report/general_ledger_landscape.py
index c63c4281173..3bded55a404 100644
--- a/addons/account/report/general_ledger_landscape.py
+++ b/addons/account/report/general_ledger_landscape.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# Copyright (c) 2005-2006 CamptoCamp
diff --git a/addons/account/report/invoice.py b/addons/account/report/invoice.py
index 3ca850a148b..b5ac25ff8e2 100644
--- a/addons/account/report/invoice.py
+++ b/addons/account/report/invoice.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/report/overdue.py b/addons/account/report/overdue.py
index 861ad82ef9c..1f7a664e542 100644
--- a/addons/account/report/overdue.py
+++ b/addons/account/report/overdue.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/report/partner_balance.py b/addons/account/report/partner_balance.py
index ddd6ad1ecb4..2c5d596d4c3 100755
--- a/addons/account/report/partner_balance.py
+++ b/addons/account/report/partner_balance.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/report/rml_parse.py b/addons/account/report/rml_parse.py
index e0c41e8f286..b91da13b7cf 100644
--- a/addons/account/report/rml_parse.py
+++ b/addons/account/report/rml_parse.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/report/tax_report.py b/addons/account/report/tax_report.py
index 1f0332d2906..790b7192f67 100644
--- a/addons/account/report/tax_report.py
+++ b/addons/account/report/tax_report.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/sequence.py b/addons/account/sequence.py
index 26f2e12f468..ce13d8f5dac 100644
--- a/addons/account/sequence.py
+++ b/addons/account/sequence.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py
index c46a9a5cd97..d3f1ef6f974 100644
--- a/addons/account/wizard/__init__.py
+++ b/addons/account/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/wizard/wizard_account_balance_report.py b/addons/account/wizard/wizard_account_balance_report.py
index b7ff7c00922..c61428b3ae5 100644
--- a/addons/account/wizard/wizard_account_balance_report.py
+++ b/addons/account/wizard/wizard_account_balance_report.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/wizard/wizard_account_chart.py b/addons/account/wizard/wizard_account_chart.py
index 124a8146c34..caa47cae8fb 100644
--- a/addons/account/wizard/wizard_account_chart.py
+++ b/addons/account/wizard/wizard_account_chart.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/wizard/wizard_account_duplicate.py b/addons/account/wizard/wizard_account_duplicate.py
index abb05194fca..585655a91ea 100644
--- a/addons/account/wizard/wizard_account_duplicate.py
+++ b/addons/account/wizard/wizard_account_duplicate.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/wizard/wizard_aged_trial_balance.py b/addons/account/wizard/wizard_aged_trial_balance.py
index ff02943ddfa..772998472a9 100755
--- a/addons/account/wizard/wizard_aged_trial_balance.py
+++ b/addons/account/wizard/wizard_aged_trial_balance.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/wizard/wizard_automatic_reconcile.py b/addons/account/wizard/wizard_automatic_reconcile.py
index 4d270cdc6fe..c7b86047d82 100644
--- a/addons/account/wizard/wizard_automatic_reconcile.py
+++ b/addons/account/wizard/wizard_automatic_reconcile.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/wizard/wizard_bank_reconcile.py b/addons/account/wizard/wizard_bank_reconcile.py
index 9ac1053b125..c510a0cf1df 100644
--- a/addons/account/wizard/wizard_bank_reconcile.py
+++ b/addons/account/wizard/wizard_bank_reconcile.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/wizard/wizard_central_journal.py b/addons/account/wizard/wizard_central_journal.py
index 1b8c4ba525a..b7d7e19127a 100644
--- a/addons/account/wizard/wizard_central_journal.py
+++ b/addons/account/wizard/wizard_central_journal.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/wizard/wizard_fiscalyear_close.py b/addons/account/wizard/wizard_fiscalyear_close.py
index ac9518e006b..298ea732c9d 100644
--- a/addons/account/wizard/wizard_fiscalyear_close.py
+++ b/addons/account/wizard/wizard_fiscalyear_close.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/wizard/wizard_fiscalyear_close_state.py b/addons/account/wizard/wizard_fiscalyear_close_state.py
index 52aa9f50477..43e904fc738 100644
--- a/addons/account/wizard/wizard_fiscalyear_close_state.py
+++ b/addons/account/wizard/wizard_fiscalyear_close_state.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/wizard/wizard_general_journal.py b/addons/account/wizard/wizard_general_journal.py
index fe9c1d1141f..f1b4c20f5b1 100644
--- a/addons/account/wizard/wizard_general_journal.py
+++ b/addons/account/wizard/wizard_general_journal.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/wizard/wizard_general_ledger_report.py b/addons/account/wizard/wizard_general_ledger_report.py
index b6b998e3bbd..d524756ec55 100644
--- a/addons/account/wizard/wizard_general_ledger_report.py
+++ b/addons/account/wizard/wizard_general_ledger_report.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/wizard/wizard_invoice_state.py b/addons/account/wizard/wizard_invoice_state.py
index d6d0e4b1171..39c35528be4 100644
--- a/addons/account/wizard/wizard_invoice_state.py
+++ b/addons/account/wizard/wizard_invoice_state.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/wizard/wizard_journal.py b/addons/account/wizard/wizard_journal.py
index a80364c907a..dec61418922 100644
--- a/addons/account/wizard/wizard_journal.py
+++ b/addons/account/wizard/wizard_journal.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/wizard/wizard_journal_select.py b/addons/account/wizard/wizard_journal_select.py
index 56195a59827..3d629c9934f 100644
--- a/addons/account/wizard/wizard_journal_select.py
+++ b/addons/account/wizard/wizard_journal_select.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/wizard/wizard_move_line_select.py b/addons/account/wizard/wizard_move_line_select.py
index c091bccf949..b32fb5bd8fb 100644
--- a/addons/account/wizard/wizard_move_line_select.py
+++ b/addons/account/wizard/wizard_move_line_select.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/wizard/wizard_open_closed_fiscalyear.py b/addons/account/wizard/wizard_open_closed_fiscalyear.py
index 1fbb8302694..b59d5d57111 100644
--- a/addons/account/wizard/wizard_open_closed_fiscalyear.py
+++ b/addons/account/wizard/wizard_open_closed_fiscalyear.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/wizard/wizard_partner_balance_report.py b/addons/account/wizard/wizard_partner_balance_report.py
index 3031440c33e..afa0dfed785 100644
--- a/addons/account/wizard/wizard_partner_balance_report.py
+++ b/addons/account/wizard/wizard_partner_balance_report.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/wizard/wizard_pay_invoice.py b/addons/account/wizard/wizard_pay_invoice.py
index 2baba87e51d..d9601f0e8a7 100644
--- a/addons/account/wizard/wizard_pay_invoice.py
+++ b/addons/account/wizard/wizard_pay_invoice.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/wizard/wizard_period_close.py b/addons/account/wizard/wizard_period_close.py
index 9c95ff7647d..9fceec67ff8 100644
--- a/addons/account/wizard/wizard_period_close.py
+++ b/addons/account/wizard/wizard_period_close.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/wizard/wizard_print_journal.py b/addons/account/wizard/wizard_print_journal.py
index 6b2ea42d66c..579babd481f 100644
--- a/addons/account/wizard/wizard_print_journal.py
+++ b/addons/account/wizard/wizard_print_journal.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/wizard/wizard_reconcile.py b/addons/account/wizard/wizard_reconcile.py
index d1f98ec191e..b11c5b0f5b9 100644
--- a/addons/account/wizard/wizard_reconcile.py
+++ b/addons/account/wizard/wizard_reconcile.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/wizard/wizard_reconcile_select.py b/addons/account/wizard/wizard_reconcile_select.py
index ad3410f06f5..2a6527b2ce7 100644
--- a/addons/account/wizard/wizard_reconcile_select.py
+++ b/addons/account/wizard/wizard_reconcile_select.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/wizard/wizard_refund.py b/addons/account/wizard/wizard_refund.py
index 2f93b0e3459..bd3347664f4 100644
--- a/addons/account/wizard/wizard_refund.py
+++ b/addons/account/wizard/wizard_refund.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/wizard/wizard_state_open.py b/addons/account/wizard/wizard_state_open.py
index 4ba200f9b08..41c99554f41 100644
--- a/addons/account/wizard/wizard_state_open.py
+++ b/addons/account/wizard/wizard_state_open.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/wizard/wizard_statement_from_invoice.py b/addons/account/wizard/wizard_statement_from_invoice.py
index c3b2553503c..f0bdf9b07b4 100644
--- a/addons/account/wizard/wizard_statement_from_invoice.py
+++ b/addons/account/wizard/wizard_statement_from_invoice.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# Copyright (c) 2008 Camptocamp SA All Rights Reserved. (JGG)
diff --git a/addons/account/wizard/wizard_subscription_generate.py b/addons/account/wizard/wizard_subscription_generate.py
index 8c5f4280fec..595b8fa7915 100644
--- a/addons/account/wizard/wizard_subscription_generate.py
+++ b/addons/account/wizard/wizard_subscription_generate.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/wizard/wizard_unreconcile.py b/addons/account/wizard/wizard_unreconcile.py
index d5fb9848145..0fe6a056576 100644
--- a/addons/account/wizard/wizard_unreconcile.py
+++ b/addons/account/wizard/wizard_unreconcile.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/wizard/wizard_unreconcile_select.py b/addons/account/wizard/wizard_unreconcile_select.py
index 89d0013663c..08c3435367d 100644
--- a/addons/account/wizard/wizard_unreconcile_select.py
+++ b/addons/account/wizard/wizard_unreconcile_select.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/wizard/wizard_use_model.py b/addons/account/wizard/wizard_use_model.py
index 3815465d367..233e78d8614 100644
--- a/addons/account/wizard/wizard_use_model.py
+++ b/addons/account/wizard/wizard_use_model.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/wizard/wizard_validate_account_move.py b/addons/account/wizard/wizard_validate_account_move.py
index 8bcaa3dafe7..6f76da0fd73 100644
--- a/addons/account/wizard/wizard_validate_account_move.py
+++ b/addons/account/wizard/wizard_validate_account_move.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account/wizard/wizard_vat.py b/addons/account/wizard/wizard_vat.py
index 209306dc32d..db240ab31ff 100755
--- a/addons/account/wizard/wizard_vat.py
+++ b/addons/account/wizard/wizard_vat.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_analytic_analysis/__init__.py b/addons/account_analytic_analysis/__init__.py
index 6c38c0a75fd..7ade686dd27 100644
--- a/addons/account_analytic_analysis/__init__.py
+++ b/addons/account_analytic_analysis/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_analytic_analysis/__terp__.py b/addons/account_analytic_analysis/__terp__.py
index 89c9c6741f0..9f5c19110cd 100644
--- a/addons/account_analytic_analysis/__terp__.py
+++ b/addons/account_analytic_analysis/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 30c6f98d6a2..27727a3038e 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_analytic_default/__init__.py b/addons/account_analytic_default/__init__.py
index cb62f07c026..0a6d51234e3 100644
--- a/addons/account_analytic_default/__init__.py
+++ b/addons/account_analytic_default/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_analytic_default/__terp__.py b/addons/account_analytic_default/__terp__.py
index cea4b3b981e..a40ac103383 100644
--- a/addons/account_analytic_default/__terp__.py
+++ b/addons/account_analytic_default/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_analytic_default/account_analytic_default.py b/addons/account_analytic_default/account_analytic_default.py
index ab8323400da..002ae305f35 100644
--- a/addons/account_analytic_default/account_analytic_default.py
+++ b/addons/account_analytic_default/account_analytic_default.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_analytic_plans/__init__.py b/addons/account_analytic_plans/__init__.py
index 05feb949753..6c6cb6edf81 100644
--- a/addons/account_analytic_plans/__init__.py
+++ b/addons/account_analytic_plans/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_analytic_plans/__terp__.py b/addons/account_analytic_plans/__terp__.py
index 97d22b33fe4..5c525f878d7 100644
--- a/addons/account_analytic_plans/__terp__.py
+++ b/addons/account_analytic_plans/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index e7b6006ab8b..b907ea51d34 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_analytic_plans/report/__init__.py b/addons/account_analytic_plans/report/__init__.py
index e92e54a7421..21ceb452322 100644
--- a/addons/account_analytic_plans/report/__init__.py
+++ b/addons/account_analytic_plans/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_analytic_plans/report/crossovered_analytic.py b/addons/account_analytic_plans/report/crossovered_analytic.py
index 2fab914fb64..69573a98572 100644
--- a/addons/account_analytic_plans/report/crossovered_analytic.py
+++ b/addons/account_analytic_plans/report/crossovered_analytic.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_analytic_plans/wizard/__init__.py b/addons/account_analytic_plans/wizard/__init__.py
index b8a5d7db809..bdacf4f72ca 100644
--- a/addons/account_analytic_plans/wizard/__init__.py
+++ b/addons/account_analytic_plans/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_analytic_plans/wizard/create_model.py b/addons/account_analytic_plans/wizard/create_model.py
index 4ca9cc6c19f..5d92f30f995 100644
--- a/addons/account_analytic_plans/wizard/create_model.py
+++ b/addons/account_analytic_plans/wizard/create_model.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py b/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py
index 483e9d54893..1b995f2cb40 100644
--- a/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py
+++ b/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_balance/__init__.py b/addons/account_balance/__init__.py
index ca682d31051..7d35ed4ca24 100644
--- a/addons/account_balance/__init__.py
+++ b/addons/account_balance/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_balance/__terp__.py b/addons/account_balance/__terp__.py
index 165e1e75aaa..608a27163a6 100644
--- a/addons/account_balance/__terp__.py
+++ b/addons/account_balance/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_balance/account_move_line.py b/addons/account_balance/account_move_line.py
index 2c5249ece36..eca39e0a6bc 100644
--- a/addons/account_balance/account_move_line.py
+++ b/addons/account_balance/account_move_line.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_balance/report/__init__.py b/addons/account_balance/report/__init__.py
index 1c3fde239be..31a571ca312 100644
--- a/addons/account_balance/report/__init__.py
+++ b/addons/account_balance/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_balance/report/account_balance.py b/addons/account_balance/report/account_balance.py
index 4fe498ac147..c05018f9c97 100644
--- a/addons/account_balance/report/account_balance.py
+++ b/addons/account_balance/report/account_balance.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_balance/wizard/__init__.py b/addons/account_balance/wizard/__init__.py
index 535ca4376b4..266cdc76b33 100644
--- a/addons/account_balance/wizard/__init__.py
+++ b/addons/account_balance/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_balance/wizard/wizard_account_balance_report.py b/addons/account_balance/wizard/wizard_account_balance_report.py
index 327b6190383..75a719002e7 100644
--- a/addons/account_balance/wizard/wizard_account_balance_report.py
+++ b/addons/account_balance/wizard/wizard_account_balance_report.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_budget/__init__.py b/addons/account_budget/__init__.py
index dad85788522..d8d864dac09 100644
--- a/addons/account_budget/__init__.py
+++ b/addons/account_budget/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_budget/__terp__.py b/addons/account_budget/__terp__.py
index 2b6e84089a5..0b0aa788786 100644
--- a/addons/account_budget/__terp__.py
+++ b/addons/account_budget/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_budget/crossovered_budget.py b/addons/account_budget/crossovered_budget.py
index 54b6de41648..6eb13c45c30 100644
--- a/addons/account_budget/crossovered_budget.py
+++ b/addons/account_budget/crossovered_budget.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_budget/report/__init__.py b/addons/account_budget/report/__init__.py
index 6403852c03d..11f3135d509 100644
--- a/addons/account_budget/report/__init__.py
+++ b/addons/account_budget/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_budget/report/analytic_account_budget_report.py b/addons/account_budget/report/analytic_account_budget_report.py
index a22195cfc76..985565cf33c 100644
--- a/addons/account_budget/report/analytic_account_budget_report.py
+++ b/addons/account_budget/report/analytic_account_budget_report.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_budget/report/budget_report.py b/addons/account_budget/report/budget_report.py
index 102707a14c7..e26f550fc13 100644
--- a/addons/account_budget/report/budget_report.py
+++ b/addons/account_budget/report/budget_report.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_budget/report/crossovered_budget_report.py b/addons/account_budget/report/crossovered_budget_report.py
index 3e46c1196f5..d0ebf8a3b27 100644
--- a/addons/account_budget/report/crossovered_budget_report.py
+++ b/addons/account_budget/report/crossovered_budget_report.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_budget/wizard/__init__.py b/addons/account_budget/wizard/__init__.py
index 25843496b73..48a2427d15f 100644
--- a/addons/account_budget/wizard/__init__.py
+++ b/addons/account_budget/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_budget/wizard/wizard_analytic_account_budget.py b/addons/account_budget/wizard/wizard_analytic_account_budget.py
index df58c10eea9..79ecc208f39 100644
--- a/addons/account_budget/wizard/wizard_analytic_account_budget.py
+++ b/addons/account_budget/wizard/wizard_analytic_account_budget.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_budget/wizard/wizard_budget_report.py b/addons/account_budget/wizard/wizard_budget_report.py
index 681cfb976ea..89ec56e5284 100644
--- a/addons/account_budget/wizard/wizard_budget_report.py
+++ b/addons/account_budget/wizard/wizard_budget_report.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_budget/wizard/wizard_budget_spread.py b/addons/account_budget/wizard/wizard_budget_spread.py
index 469147b9900..a996e94b64b 100644
--- a/addons/account_budget/wizard/wizard_budget_spread.py
+++ b/addons/account_budget/wizard/wizard_budget_spread.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_budget/wizard/wizard_crossovered_budget_report.py b/addons/account_budget/wizard/wizard_crossovered_budget_report.py
index 797a694d7b8..5b665ae5d23 100644
--- a/addons/account_budget/wizard/wizard_crossovered_budget_report.py
+++ b/addons/account_budget/wizard/wizard_crossovered_budget_report.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_budget/wizard/wizard_crossovered_budget_summary_report.py b/addons/account_budget/wizard/wizard_crossovered_budget_summary_report.py
index be428ebd682..4823e47258b 100644
--- a/addons/account_budget/wizard/wizard_crossovered_budget_summary_report.py
+++ b/addons/account_budget/wizard/wizard_crossovered_budget_summary_report.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_chart/__init__.py b/addons/account_chart/__init__.py
index 7ed460db2b3..f79e3c91345 100644
--- a/addons/account_chart/__init__.py
+++ b/addons/account_chart/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_chart/__terp__.py b/addons/account_chart/__terp__.py
index 4733043cc5b..9f4ab74e901 100644
--- a/addons/account_chart/__terp__.py
+++ b/addons/account_chart/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_date_check/__init__.py b/addons/account_date_check/__init__.py
index d134542ed13..0e16570318d 100644
--- a/addons/account_date_check/__init__.py
+++ b/addons/account_date_check/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_date_check/__terp__.py b/addons/account_date_check/__terp__.py
index 6a4741f916b..b8497cfe4b1 100644
--- a/addons/account_date_check/__terp__.py
+++ b/addons/account_date_check/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_date_check/account_date_check.py b/addons/account_date_check/account_date_check.py
index 4ee33dbef85..d1af453fde7 100644
--- a/addons/account_date_check/account_date_check.py
+++ b/addons/account_date_check/account_date_check.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_followup/__init__.py b/addons/account_followup/__init__.py
index b983360128c..abb95488d05 100644
--- a/addons/account_followup/__init__.py
+++ b/addons/account_followup/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_followup/__terp__.py b/addons/account_followup/__terp__.py
index 5122204fa68..b4ed42706d4 100644
--- a/addons/account_followup/__terp__.py
+++ b/addons/account_followup/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_followup/followup.py b/addons/account_followup/followup.py
index 9efd1d0a1ff..75e8ce612b2 100644
--- a/addons/account_followup/followup.py
+++ b/addons/account_followup/followup.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_followup/followup_report.py b/addons/account_followup/followup_report.py
index 259fbc56c4e..4303d92485c 100644
--- a/addons/account_followup/followup_report.py
+++ b/addons/account_followup/followup_report.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_followup/report/__init__.py b/addons/account_followup/report/__init__.py
index 94d8639639b..65637c0fab0 100644
--- a/addons/account_followup/report/__init__.py
+++ b/addons/account_followup/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_followup/report/report_followup_print.py b/addons/account_followup/report/report_followup_print.py
index 53ad5ce2572..e09a7de757d 100644
--- a/addons/account_followup/report/report_followup_print.py
+++ b/addons/account_followup/report/report_followup_print.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_followup/wizard/__init__.py b/addons/account_followup/wizard/__init__.py
index 65497ca0140..9733d8873cb 100644
--- a/addons/account_followup/wizard/__init__.py
+++ b/addons/account_followup/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_followup/wizard/wizard_followup_print.py b/addons/account_followup/wizard/wizard_followup_print.py
index 54e8f4a0eb7..ea35c62289e 100644
--- a/addons/account_followup/wizard/wizard_followup_print.py
+++ b/addons/account_followup/wizard/wizard_followup_print.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_invoice_layout/__init__.py b/addons/account_invoice_layout/__init__.py
index 0ff19b5adb9..9ab00cc0547 100644
--- a/addons/account_invoice_layout/__init__.py
+++ b/addons/account_invoice_layout/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_invoice_layout/__terp__.py b/addons/account_invoice_layout/__terp__.py
index c1e28ad8713..ec669b81686 100644
--- a/addons/account_invoice_layout/__terp__.py
+++ b/addons/account_invoice_layout/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_invoice_layout/account_invoice_layout.py b/addons/account_invoice_layout/account_invoice_layout.py
index b0215cf9a50..72ace57cc21 100644
--- a/addons/account_invoice_layout/account_invoice_layout.py
+++ b/addons/account_invoice_layout/account_invoice_layout.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_invoice_layout/report/__init__.py b/addons/account_invoice_layout/report/__init__.py
index f7a8b74f36a..56dac0a1ce4 100644
--- a/addons/account_invoice_layout/report/__init__.py
+++ b/addons/account_invoice_layout/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_invoice_layout/wizard/__init__.py b/addons/account_invoice_layout/wizard/__init__.py
index 22477aa80ce..7849a74f603 100644
--- a/addons/account_invoice_layout/wizard/__init__.py
+++ b/addons/account_invoice_layout/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_invoice_layout/wizard/invoice_special_message.py b/addons/account_invoice_layout/wizard/invoice_special_message.py
index ebcccf7f1f4..9a1fa8f8c8b 100644
--- a/addons/account_invoice_layout/wizard/invoice_special_message.py
+++ b/addons/account_invoice_layout/wizard/invoice_special_message.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_payment/__init__.py b/addons/account_payment/__init__.py
index ffd2fc1d0a1..c92276ea1d9 100644
--- a/addons/account_payment/__init__.py
+++ b/addons/account_payment/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_payment/__terp__.py b/addons/account_payment/__terp__.py
index 812bd319306..8f7600ef010 100644
--- a/addons/account_payment/__terp__.py
+++ b/addons/account_payment/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_payment/account_invoice.py b/addons/account_payment/account_invoice.py
index 65c96b26bb3..70f04a0886b 100644
--- a/addons/account_payment/account_invoice.py
+++ b/addons/account_payment/account_invoice.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_payment/account_move_line.py b/addons/account_payment/account_move_line.py
index cd7578d4527..246aee77a26 100644
--- a/addons/account_payment/account_move_line.py
+++ b/addons/account_payment/account_move_line.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_payment/payment.py b/addons/account_payment/payment.py
index e01ace8c0d7..9a704de5e84 100644
--- a/addons/account_payment/payment.py
+++ b/addons/account_payment/payment.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_payment/report/__init__.py b/addons/account_payment/report/__init__.py
index 35127efa0ab..abf11da172c 100644
--- a/addons/account_payment/report/__init__.py
+++ b/addons/account_payment/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_payment/report/payment_order.py b/addons/account_payment/report/payment_order.py
index 4767c63ba31..de8a0b502ef 100644
--- a/addons/account_payment/report/payment_order.py
+++ b/addons/account_payment/report/payment_order.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_payment/wizard/__init__.py b/addons/account_payment/wizard/__init__.py
index f0d3e1c0d5f..0a3cac609aa 100644
--- a/addons/account_payment/wizard/__init__.py
+++ b/addons/account_payment/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_payment/wizard/wizard_pay.py b/addons/account_payment/wizard/wizard_pay.py
index fc2f1f79d70..b9b4b5acb65 100644
--- a/addons/account_payment/wizard/wizard_pay.py
+++ b/addons/account_payment/wizard/wizard_pay.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_payment/wizard/wizard_payment_order.py b/addons/account_payment/wizard/wizard_payment_order.py
index 2e84efa5fa8..49a820cca7c 100644
--- a/addons/account_payment/wizard/wizard_payment_order.py
+++ b/addons/account_payment/wizard/wizard_payment_order.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_payment/wizard/wizard_populate_statement.py b/addons/account_payment/wizard/wizard_populate_statement.py
index 8e59393bd17..8dd8bf65c22 100644
--- a/addons/account_payment/wizard/wizard_populate_statement.py
+++ b/addons/account_payment/wizard/wizard_populate_statement.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_report/__init__.py b/addons/account_report/__init__.py
index 04c4acb8bd5..f080c3f7953 100644
--- a/addons/account_report/__init__.py
+++ b/addons/account_report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_report/__terp__.py b/addons/account_report/__terp__.py
index 0aed736ec78..661881aecae 100644
--- a/addons/account_report/__terp__.py
+++ b/addons/account_report/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_report/account.py b/addons/account_report/account.py
index 4a7b1efd05b..5bdde911ebe 100644
--- a/addons/account_report/account.py
+++ b/addons/account_report/account.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_report/report/__init__.py b/addons/account_report/report/__init__.py
index 168a105a6f8..e92b8d5930c 100644
--- a/addons/account_report/report/__init__.py
+++ b/addons/account_report/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_report/report/accounting_report.py b/addons/account_report/report/accounting_report.py
index c489d99ca62..49f792b7f19 100644
--- a/addons/account_report/report/accounting_report.py
+++ b/addons/account_report/report/accounting_report.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_report/report/print_indicator.py b/addons/account_report/report/print_indicator.py
index 9d4fa4673f4..765464f151d 100644
--- a/addons/account_report/report/print_indicator.py
+++ b/addons/account_report/report/print_indicator.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
@@ -20,7 +20,7 @@
#
##############################################################################
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# Copyright (c) 2004-2009 TINY SPRL. (http://tiny.be) All Rights Reserved.
diff --git a/addons/account_report/wizard/__init__.py b/addons/account_report/wizard/__init__.py
index ba649786adf..70c01cd2a5c 100644
--- a/addons/account_report/wizard/__init__.py
+++ b/addons/account_report/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_report/wizard/wizard_print_indicators.py b/addons/account_report/wizard/wizard_print_indicators.py
index 304f4ca5ad0..a8c61bbd6d6 100644
--- a/addons/account_report/wizard/wizard_print_indicators.py
+++ b/addons/account_report/wizard/wizard_print_indicators.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_report/wizard/wizard_print_indicators_with_pdf.py b/addons/account_report/wizard/wizard_print_indicators_with_pdf.py
index a7cb2bc7a78..63501ba4003 100644
--- a/addons/account_report/wizard/wizard_print_indicators_with_pdf.py
+++ b/addons/account_report/wizard/wizard_print_indicators_with_pdf.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_reporting/__init__.py b/addons/account_reporting/__init__.py
index 0c746e5e666..2d9e1fd77f3 100644
--- a/addons/account_reporting/__init__.py
+++ b/addons/account_reporting/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_reporting/__terp__.py b/addons/account_reporting/__terp__.py
index eff79429153..2108ed409e0 100644
--- a/addons/account_reporting/__terp__.py
+++ b/addons/account_reporting/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_reporting/account.py b/addons/account_reporting/account.py
index a31dbf06c04..8a2450b1b0b 100644
--- a/addons/account_reporting/account.py
+++ b/addons/account_reporting/account.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_reporting/report/__init__.py b/addons/account_reporting/report/__init__.py
index 8b9421b1822..c59bd086ece 100644
--- a/addons/account_reporting/report/__init__.py
+++ b/addons/account_reporting/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_reporting/report/account_report_bs.py b/addons/account_reporting/report/account_report_bs.py
index 955e4c12c6f..982b2bb8d04 100644
--- a/addons/account_reporting/report/account_report_bs.py
+++ b/addons/account_reporting/report/account_report_bs.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_reporting/wizard/__init__.py b/addons/account_reporting/wizard/__init__.py
index b590eb1afbf..95720e1399f 100644
--- a/addons/account_reporting/wizard/__init__.py
+++ b/addons/account_reporting/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_reporting/wizard/wizard_account_balance_report.py b/addons/account_reporting/wizard/wizard_account_balance_report.py
index 425fc41f88e..79b0fd492e7 100644
--- a/addons/account_reporting/wizard/wizard_account_balance_report.py
+++ b/addons/account_reporting/wizard/wizard_account_balance_report.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_tax_include/__init__.py b/addons/account_tax_include/__init__.py
index a4a069c9be7..da3029700e3 100644
--- a/addons/account_tax_include/__init__.py
+++ b/addons/account_tax_include/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_tax_include/__terp__.py b/addons/account_tax_include/__terp__.py
index db8143735f1..52787e26196 100644
--- a/addons/account_tax_include/__terp__.py
+++ b/addons/account_tax_include/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_tax_include/invoice_tax_incl.py b/addons/account_tax_include/invoice_tax_incl.py
index 2acca1eb815..f54dbdc514a 100644
--- a/addons/account_tax_include/invoice_tax_incl.py
+++ b/addons/account_tax_include/invoice_tax_incl.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_voucher/__init__.py b/addons/account_voucher/__init__.py
index 87c48ae35b2..6dfc28f9aaf 100755
--- a/addons/account_voucher/__init__.py
+++ b/addons/account_voucher/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_voucher/__terp__.py b/addons/account_voucher/__terp__.py
index 92f6199f3cb..d18ae01418b 100755
--- a/addons/account_voucher/__terp__.py
+++ b/addons/account_voucher/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index 69709f8bc23..832e481f176 100755
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/analytic_journal_billing_rate/__init__.py b/addons/analytic_journal_billing_rate/__init__.py
index 36087dcb982..cf05c179058 100644
--- a/addons/analytic_journal_billing_rate/__init__.py
+++ b/addons/analytic_journal_billing_rate/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/analytic_journal_billing_rate/__terp__.py b/addons/analytic_journal_billing_rate/__terp__.py
index 2290900f99a..fa85c000ba7 100644
--- a/addons/analytic_journal_billing_rate/__terp__.py
+++ b/addons/analytic_journal_billing_rate/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate.py b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate.py
index d83df50ebd1..d9a7476f017 100644
--- a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate.py
+++ b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/analytic_user_function/__init__.py b/addons/analytic_user_function/__init__.py
index 515aa6900dc..a8b092831ab 100644
--- a/addons/analytic_user_function/__init__.py
+++ b/addons/analytic_user_function/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/analytic_user_function/__terp__.py b/addons/analytic_user_function/__terp__.py
index 786919785b3..235e81e416b 100644
--- a/addons/analytic_user_function/__terp__.py
+++ b/addons/analytic_user_function/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py
index 3c8972f4df9..bb8bb6b7921 100644
--- a/addons/analytic_user_function/analytic_user_function.py
+++ b/addons/analytic_user_function/analytic_user_function.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/__init__.py b/addons/auction/__init__.py
index 08b2b1882c7..1d0ef8c0297 100644
--- a/addons/auction/__init__.py
+++ b/addons/auction/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/__terp__.py b/addons/auction/__terp__.py
index 99e2b87718b..479674479f4 100644
--- a/addons/auction/__terp__.py
+++ b/addons/auction/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/report/__init__.py b/addons/auction/report/__init__.py
index ba0d6f9577a..bd92ba631fd 100644
--- a/addons/auction/report/__init__.py
+++ b/addons/auction/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/report/artists_lots.py b/addons/auction/report/artists_lots.py
index ae69a8f0b06..d926e9404c8 100644
--- a/addons/auction/report/artists_lots.py
+++ b/addons/auction/report/artists_lots.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/report/auction_artists.py b/addons/auction/report/auction_artists.py
index 91843906dff..5ca3f407fb8 100644
--- a/addons/auction/report/auction_artists.py
+++ b/addons/auction/report/auction_artists.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/report/auction_bids.py b/addons/auction/report/auction_bids.py
index 560160ac008..261f0ba0b19 100644
--- a/addons/auction/report/auction_bids.py
+++ b/addons/auction/report/auction_bids.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/report/auction_buyer_result.py b/addons/auction/report/auction_buyer_result.py
index 97ab54cc056..7cb226fd046 100644
--- a/addons/auction/report/auction_buyer_result.py
+++ b/addons/auction/report/auction_buyer_result.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/report/auction_catelog.py b/addons/auction/report/auction_catelog.py
index 70b2b6db917..330d3f858c2 100644
--- a/addons/auction/report/auction_catelog.py
+++ b/addons/auction/report/auction_catelog.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/report/auction_invoice.py b/addons/auction/report/auction_invoice.py
index ddc81933c76..7f02735802d 100644
--- a/addons/auction/report/auction_invoice.py
+++ b/addons/auction/report/auction_invoice.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/report/auction_objects.py b/addons/auction/report/auction_objects.py
index 879b407c184..0b918b435d7 100644
--- a/addons/auction/report/auction_objects.py
+++ b/addons/auction/report/auction_objects.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/report/auction_result.py b/addons/auction/report/auction_result.py
index 48f21d73669..fe4be425252 100644
--- a/addons/auction/report/auction_result.py
+++ b/addons/auction/report/auction_result.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/report/auction_total_rml.py b/addons/auction/report/auction_total_rml.py
index cc103e7c250..3aedba0169f 100644
--- a/addons/auction/report/auction_total_rml.py
+++ b/addons/auction/report/auction_total_rml.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/report/bids_lots.py b/addons/auction/report/bids_lots.py
index 8358e76ea2a..8205a49ed8e 100644
--- a/addons/auction/report/bids_lots.py
+++ b/addons/auction/report/bids_lots.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/report/bids_phones_details.py b/addons/auction/report/bids_phones_details.py
index bf5e5343074..6ab80e20dbb 100644
--- a/addons/auction/report/bids_phones_details.py
+++ b/addons/auction/report/bids_phones_details.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/report/buyer_form_report.py b/addons/auction/report/buyer_form_report.py
index 20d93cef754..53a2e3f8df6 100644
--- a/addons/auction/report/buyer_form_report.py
+++ b/addons/auction/report/buyer_form_report.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/report/buyer_list.py b/addons/auction/report/buyer_list.py
index eaa44f22c0c..e3af18488c8 100644
--- a/addons/auction/report/buyer_list.py
+++ b/addons/auction/report/buyer_list.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/report/catelogwithpictures.py b/addons/auction/report/catelogwithpictures.py
index f3f954a2908..fe4b3718924 100644
--- a/addons/auction/report/catelogwithpictures.py
+++ b/addons/auction/report/catelogwithpictures.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/report/deposit_seller.py b/addons/auction/report/deposit_seller.py
index 4e0a184ffc7..fb333235a1b 100644
--- a/addons/auction/report/deposit_seller.py
+++ b/addons/auction/report/deposit_seller.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/report/huissier.py b/addons/auction/report/huissier.py
index 140123ca77d..23eee535a6f 100644
--- a/addons/auction/report/huissier.py
+++ b/addons/auction/report/huissier.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/report/lots_list.py b/addons/auction/report/lots_list.py
index 32d23accb90..e4fc42e01f8 100644
--- a/addons/auction/report/lots_list.py
+++ b/addons/auction/report/lots_list.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/report/lots_list_inventory.py b/addons/auction/report/lots_list_inventory.py
index 42a993ccc7a..943e5f1cc87 100644
--- a/addons/auction/report/lots_list_inventory.py
+++ b/addons/auction/report/lots_list_inventory.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/report/lots_list_landscape.py b/addons/auction/report/lots_list_landscape.py
index b638c6e54c4..3ec74292956 100644
--- a/addons/auction/report/lots_list_landscape.py
+++ b/addons/auction/report/lots_list_landscape.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/report/photo_shadow.py b/addons/auction/report/photo_shadow.py
index 16b4f2bba28..b1b4234fdfb 100644
--- a/addons/auction/report/photo_shadow.py
+++ b/addons/auction/report/photo_shadow.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/report/report_lot_bar_code.py b/addons/auction/report/report_lot_bar_code.py
index 3d9f8df4330..5708ceb3c80 100644
--- a/addons/auction/report/report_lot_bar_code.py
+++ b/addons/auction/report/report_lot_bar_code.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/report/seller_address.py b/addons/auction/report/seller_address.py
index 0c5a80d5641..faaa6531020 100644
--- a/addons/auction/report/seller_address.py
+++ b/addons/auction/report/seller_address.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/report/seller_form_report.py b/addons/auction/report/seller_form_report.py
index a64759b2547..ed1a02105c2 100644
--- a/addons/auction/report/seller_form_report.py
+++ b/addons/auction/report/seller_form_report.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/report/total.py b/addons/auction/report/total.py
index 2784635b6c8..483b263a99b 100644
--- a/addons/auction/report/total.py
+++ b/addons/auction/report/total.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/wizard/__init__.py b/addons/auction/wizard/__init__.py
index 9b87bcfa1b9..a7967cf6bbe 100644
--- a/addons/auction/wizard/__init__.py
+++ b/addons/auction/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/wizard/auction_catalog_flagey.py b/addons/auction/wizard/auction_catalog_flagey.py
index 51457d7d732..c425a540bf2 100644
--- a/addons/auction/wizard/auction_catalog_flagey.py
+++ b/addons/auction/wizard/auction_catalog_flagey.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/wizard/auction_wizard_able_taken.py b/addons/auction/wizard/auction_wizard_able_taken.py
index 9a3a3b44c0e..11f9a4f3cd0 100644
--- a/addons/auction/wizard/auction_wizard_able_taken.py
+++ b/addons/auction/wizard/auction_wizard_able_taken.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/wizard/auction_wizard_enable_taken.py b/addons/auction/wizard/auction_wizard_enable_taken.py
index 90ac618e557..174397a360f 100644
--- a/addons/auction/wizard/auction_wizard_enable_taken.py
+++ b/addons/auction/wizard/auction_wizard_enable_taken.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/wizard/wizard_aie_send.py b/addons/auction/wizard/wizard_aie_send.py
index cdb27d5957d..eb2490e4644 100644
--- a/addons/auction/wizard/wizard_aie_send.py
+++ b/addons/auction/wizard/wizard_aie_send.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/wizard/wizard_aie_send_result.py b/addons/auction/wizard/wizard_aie_send_result.py
index c74b9100045..bbc45abf491 100644
--- a/addons/auction/wizard/wizard_aie_send_result.py
+++ b/addons/auction/wizard/wizard_aie_send_result.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/wizard/wizard_auction_invoice_buyer.py b/addons/auction/wizard/wizard_auction_invoice_buyer.py
index 3de71962774..2f35cda85fc 100644
--- a/addons/auction/wizard/wizard_auction_invoice_buyer.py
+++ b/addons/auction/wizard/wizard_auction_invoice_buyer.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/wizard/wizard_auction_journal.py b/addons/auction/wizard/wizard_auction_journal.py
index 0ce0a14ae5c..7b19234526b 100644
--- a/addons/auction/wizard/wizard_auction_journal.py
+++ b/addons/auction/wizard/wizard_auction_journal.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/wizard/wizard_emporte.py b/addons/auction/wizard/wizard_emporte.py
index 026a123ec63..56fd0d7b9ff 100644
--- a/addons/auction/wizard/wizard_emporte.py
+++ b/addons/auction/wizard/wizard_emporte.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/wizard/wizard_lot_date_move.py b/addons/auction/wizard/wizard_lot_date_move.py
index 2ecbcd60f50..1efca9a7de2 100644
--- a/addons/auction/wizard/wizard_lot_date_move.py
+++ b/addons/auction/wizard/wizard_lot_date_move.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/wizard/wizard_lots_buyer_map.py b/addons/auction/wizard/wizard_lots_buyer_map.py
index c5adbc10283..58bb55648c3 100644
--- a/addons/auction/wizard/wizard_lots_buyer_map.py
+++ b/addons/auction/wizard/wizard_lots_buyer_map.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/wizard/wizard_lots_cancel.py b/addons/auction/wizard/wizard_lots_cancel.py
index 946dec403ed..fbd6e2405e3 100644
--- a/addons/auction/wizard/wizard_lots_cancel.py
+++ b/addons/auction/wizard/wizard_lots_cancel.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/wizard/wizard_lots_invoice.py b/addons/auction/wizard/wizard_lots_invoice.py
index 82f92a1f82b..59e44920be6 100644
--- a/addons/auction/wizard/wizard_lots_invoice.py
+++ b/addons/auction/wizard/wizard_lots_invoice.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/wizard/wizard_lots_numerotate.py b/addons/auction/wizard/wizard_lots_numerotate.py
index ac820acb689..5604e75ee02 100644
--- a/addons/auction/wizard/wizard_lots_numerotate.py
+++ b/addons/auction/wizard/wizard_lots_numerotate.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/wizard/wizard_lots_pay.py b/addons/auction/wizard/wizard_lots_pay.py
index d4ee409a517..0790b044cff 100644
--- a/addons/auction/wizard/wizard_lots_pay.py
+++ b/addons/auction/wizard/wizard_lots_pay.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/wizard/wizard_lots_sms.py b/addons/auction/wizard/wizard_lots_sms.py
index 4abf559e2de..93c4a30df09 100644
--- a/addons/auction/wizard/wizard_lots_sms.py
+++ b/addons/auction/wizard/wizard_lots_sms.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/wizard/wizard_pay.py b/addons/auction/wizard/wizard_pay.py
index f4d35484112..117c9697d95 100644
--- a/addons/auction/wizard/wizard_pay.py
+++ b/addons/auction/wizard/wizard_pay.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/wizard/wizard_payer.py b/addons/auction/wizard/wizard_payer.py
index 4229819da2e..ea798741883 100644
--- a/addons/auction/wizard/wizard_payer.py
+++ b/addons/auction/wizard/wizard_payer.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/auction/wizard/wizard_transfer_unsold_object.py b/addons/auction/wizard/wizard_transfer_unsold_object.py
index 304f2f7645e..69998e540cf 100644
--- a/addons/auction/wizard/wizard_transfer_unsold_object.py
+++ b/addons/auction/wizard/wizard_transfer_unsold_object.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/audittrail/__init__.py b/addons/audittrail/__init__.py
index 759a43666fc..1e0ee6c4d0a 100644
--- a/addons/audittrail/__init__.py
+++ b/addons/audittrail/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/audittrail/__terp__.py b/addons/audittrail/__terp__.py
index 122bd6dc789..438f9eee51e 100644
--- a/addons/audittrail/__terp__.py
+++ b/addons/audittrail/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index a7ae0f59075..01ee506bdcd 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/audittrail/wizard/__init__.py b/addons/audittrail/wizard/__init__.py
index 038f4a67f97..d9111f3d6db 100644
--- a/addons/audittrail/wizard/__init__.py
+++ b/addons/audittrail/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/audittrail/wizard/wizard_view_log.py b/addons/audittrail/wizard/wizard_view_log.py
index e72d2376af0..7aaecece617 100644
--- a/addons/audittrail/wizard/wizard_view_log.py
+++ b/addons/audittrail/wizard/wizard_view_log.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_contact/__init__.py b/addons/base_contact/__init__.py
index 43d2a2ea9da..f51e545d6d3 100644
--- a/addons/base_contact/__init__.py
+++ b/addons/base_contact/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_contact/__terp__.py b/addons/base_contact/__terp__.py
index e02191c703f..57af7035b0c 100644
--- a/addons/base_contact/__terp__.py
+++ b/addons/base_contact/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index b29bff9c5ac..99d1b426d19 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_iban/__init__.py b/addons/base_iban/__init__.py
index 7e9582e8540..a399a452b4a 100644
--- a/addons/base_iban/__init__.py
+++ b/addons/base_iban/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_iban/__terp__.py b/addons/base_iban/__terp__.py
index b4de833c77b..3e3e7a046c5 100644
--- a/addons/base_iban/__terp__.py
+++ b/addons/base_iban/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_iban/base_iban.py b/addons/base_iban/base_iban.py
index 2d91e1d5b4c..5111228d1c0 100644
--- a/addons/base_iban/base_iban.py
+++ b/addons/base_iban/base_iban.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_module_merge/__init__.py b/addons/base_module_merge/__init__.py
index a80e4c66974..0112f12d070 100644
--- a/addons/base_module_merge/__init__.py
+++ b/addons/base_module_merge/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_module_merge/__terp__.py b/addons/base_module_merge/__terp__.py
index 4a2a004753d..6b1ef2fb6f1 100644
--- a/addons/base_module_merge/__terp__.py
+++ b/addons/base_module_merge/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_module_merge/wizard/__init__.py b/addons/base_module_merge/wizard/__init__.py
index 736590e18c6..a96871efca6 100644
--- a/addons/base_module_merge/wizard/__init__.py
+++ b/addons/base_module_merge/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_module_merge/wizard/base_module_merge.py b/addons/base_module_merge/wizard/base_module_merge.py
index d056e56d8b8..aaa37ef2254 100644
--- a/addons/base_module_merge/wizard/base_module_merge.py
+++ b/addons/base_module_merge/wizard/base_module_merge.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_module_publish/__init__.py b/addons/base_module_publish/__init__.py
index 5152cda9e9e..358c26fca8b 100644
--- a/addons/base_module_publish/__init__.py
+++ b/addons/base_module_publish/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_module_publish/__terp__.py b/addons/base_module_publish/__terp__.py
index 400409c6ebc..eb7647aefb9 100644
--- a/addons/base_module_publish/__terp__.py
+++ b/addons/base_module_publish/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_module_publish/wizard/__init__.py b/addons/base_module_publish/wizard/__init__.py
index 071d4ceec17..41e23a05d49 100644
--- a/addons/base_module_publish/wizard/__init__.py
+++ b/addons/base_module_publish/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_module_publish/wizard/base_module_publish.py b/addons/base_module_publish/wizard/base_module_publish.py
index 954e22e7fce..0194762fca2 100644
--- a/addons/base_module_publish/wizard/base_module_publish.py
+++ b/addons/base_module_publish/wizard/base_module_publish.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_module_publish/wizard/base_module_publish_all.py b/addons/base_module_publish/wizard/base_module_publish_all.py
index 1272cf09353..a1de03e248a 100644
--- a/addons/base_module_publish/wizard/base_module_publish_all.py
+++ b/addons/base_module_publish/wizard/base_module_publish_all.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_module_publish/wizard/module_zip.py b/addons/base_module_publish/wizard/module_zip.py
index ec9b3aa00c4..02e6bb63bb7 100644
--- a/addons/base_module_publish/wizard/module_zip.py
+++ b/addons/base_module_publish/wizard/module_zip.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_module_publish/wizard/wizard_module_export.py b/addons/base_module_publish/wizard/wizard_module_export.py
index 0b40d57ddac..49d096e5076 100644
--- a/addons/base_module_publish/wizard/wizard_module_export.py
+++ b/addons/base_module_publish/wizard/wizard_module_export.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_module_record/__init__.py b/addons/base_module_record/__init__.py
index 789c74c11a6..b7583415ce5 100644
--- a/addons/base_module_record/__init__.py
+++ b/addons/base_module_record/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_module_record/__terp__.py b/addons/base_module_record/__terp__.py
index 9b9cbca2bf0..8dda69a7309 100644
--- a/addons/base_module_record/__terp__.py
+++ b/addons/base_module_record/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py
index 144c7f2c80e..97c81accac3 100644
--- a/addons/base_module_record/base_module_record.py
+++ b/addons/base_module_record/base_module_record.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_module_record/wizard/__init__.py b/addons/base_module_record/wizard/__init__.py
index 1e94d096c53..ce6c1e0bf8e 100644
--- a/addons/base_module_record/wizard/__init__.py
+++ b/addons/base_module_record/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_module_record/wizard/base_module_record_objects.py b/addons/base_module_record/wizard/base_module_record_objects.py
index ff7b79a030f..b3854769211 100644
--- a/addons/base_module_record/wizard/base_module_record_objects.py
+++ b/addons/base_module_record/wizard/base_module_record_objects.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_module_record/wizard/base_module_save.py b/addons/base_module_record/wizard/base_module_save.py
index 026439677a4..cd6bdfddf33 100644
--- a/addons/base_module_record/wizard/base_module_save.py
+++ b/addons/base_module_record/wizard/base_module_save.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_report_creator/__init__.py b/addons/base_report_creator/__init__.py
index 314d9f09f5a..0b021bbfe59 100644
--- a/addons/base_report_creator/__init__.py
+++ b/addons/base_report_creator/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_report_creator/__terp__.py b/addons/base_report_creator/__terp__.py
index 32e6c4e0c25..d0f11cbdc56 100644
--- a/addons/base_report_creator/__terp__.py
+++ b/addons/base_report_creator/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_report_creator/base_report_creator.py b/addons/base_report_creator/base_report_creator.py
index 3a8678cccc8..639b7a9de3f 100644
--- a/addons/base_report_creator/base_report_creator.py
+++ b/addons/base_report_creator/base_report_creator.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_report_creator/wizard/__init__.py b/addons/base_report_creator/wizard/__init__.py
index 5b432030f2d..24fe0278c76 100644
--- a/addons/base_report_creator/wizard/__init__.py
+++ b/addons/base_report_creator/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_report_creator/wizard/base_report_creator_open.py b/addons/base_report_creator/wizard/base_report_creator_open.py
index cd8e3c64651..a3c19ca6e4c 100644
--- a/addons/base_report_creator/wizard/base_report_creator_open.py
+++ b/addons/base_report_creator/wizard/base_report_creator_open.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_report_creator/wizard/report_menu_create.py b/addons/base_report_creator/wizard/report_menu_create.py
index 514dd95b8fe..10a48b7815b 100644
--- a/addons/base_report_creator/wizard/report_menu_create.py
+++ b/addons/base_report_creator/wizard/report_menu_create.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_report_creator/wizard/wiz_set_filter_fields.py b/addons/base_report_creator/wizard/wiz_set_filter_fields.py
index a97be887803..c9987327379 100644
--- a/addons/base_report_creator/wizard/wiz_set_filter_fields.py
+++ b/addons/base_report_creator/wizard/wiz_set_filter_fields.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_report_designer/__init__.py b/addons/base_report_designer/__init__.py
index c9fdd99333d..f3114bc9630 100644
--- a/addons/base_report_designer/__init__.py
+++ b/addons/base_report_designer/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_report_designer/__terp__.py b/addons/base_report_designer/__terp__.py
index 9782fba2786..21d558ca4e2 100644
--- a/addons/base_report_designer/__terp__.py
+++ b/addons/base_report_designer/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_report_designer/base_report_designer.py b/addons/base_report_designer/base_report_designer.py
index 9aaa4910d7e..20b2dbf161a 100644
--- a/addons/base_report_designer/base_report_designer.py
+++ b/addons/base_report_designer/base_report_designer.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_report_designer/wizard/__init__.py b/addons/base_report_designer/wizard/__init__.py
index 740a31b31e5..b09e2eac28d 100644
--- a/addons/base_report_designer/wizard/__init__.py
+++ b/addons/base_report_designer/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_report_designer/wizard/base_report_designer_modify.py b/addons/base_report_designer/wizard/base_report_designer_modify.py
index a53be164cee..9bb5a63c13b 100644
--- a/addons/base_report_designer/wizard/base_report_designer_modify.py
+++ b/addons/base_report_designer/wizard/base_report_designer_modify.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/__init__.py b/addons/base_report_designer/wizard/tiny_sxw2rml/__init__.py
index a99fa877fc9..8fa9e1745ab 100644
--- a/addons/base_report_designer/wizard/tiny_sxw2rml/__init__.py
+++ b/addons/base_report_designer/wizard/tiny_sxw2rml/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py b/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py
index 0d0ced599cb..3d3237fa5e3 100644
--- a/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py
+++ b/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py
@@ -1,5 +1,5 @@
#!/usr/bin/python
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# Copyright (c):
diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py
index 5152cda9e9e..358c26fca8b 100644
--- a/addons/base_setup/__init__.py
+++ b/addons/base_setup/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_setup/__terp__.py b/addons/base_setup/__terp__.py
index 0d20c3a01c6..b52269e57e4 100644
--- a/addons/base_setup/__terp__.py
+++ b/addons/base_setup/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_setup/wizard/__init__.py b/addons/base_setup/wizard/__init__.py
index a8b4bda1776..23e4e3b776e 100644
--- a/addons/base_setup/wizard/__init__.py
+++ b/addons/base_setup/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_setup/wizard/wizard_base_setup.py b/addons/base_setup/wizard/wizard_base_setup.py
index bd72757a0fd..77ae4fd70d6 100644
--- a/addons/base_setup/wizard/wizard_base_setup.py
+++ b/addons/base_setup/wizard/wizard_base_setup.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_vat/__init__.py b/addons/base_vat/__init__.py
index 15267824d51..7b556f2d1a0 100644
--- a/addons/base_vat/__init__.py
+++ b/addons/base_vat/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_vat/__terp__.py b/addons/base_vat/__terp__.py
index 86e2af8a555..85871e465dd 100644
--- a/addons/base_vat/__terp__.py
+++ b/addons/base_vat/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/base_vat/partner.py b/addons/base_vat/partner.py
index e470244e5e4..4a23ce65165 100644
--- a/addons/base_vat/partner.py
+++ b/addons/base_vat/partner.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/board/__init__.py b/addons/board/__init__.py
index 1b9afa4d57b..f6e8663394f 100644
--- a/addons/board/__init__.py
+++ b/addons/board/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/board/__terp__.py b/addons/board/__terp__.py
index 4477c45ae82..b8ef8699d0e 100644
--- a/addons/board/__terp__.py
+++ b/addons/board/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/board/board.py b/addons/board/board.py
index 120ebbf5600..dfbe59c15e2 100644
--- a/addons/board/board.py
+++ b/addons/board/board.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/board/wizard/__init__.py b/addons/board/wizard/__init__.py
index 28aacd1c9ba..91130f1df7e 100644
--- a/addons/board/wizard/__init__.py
+++ b/addons/board/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/board/wizard/board_wizard.py b/addons/board/wizard/board_wizard.py
index 02149c8eabc..36715db5b28 100644
--- a/addons/board/wizard/board_wizard.py
+++ b/addons/board/wizard/board_wizard.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/board_account/__init__.py b/addons/board_account/__init__.py
index d63502c9ed8..b0f0f5004ae 100644
--- a/addons/board_account/__init__.py
+++ b/addons/board_account/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/board_account/__terp__.py b/addons/board_account/__terp__.py
index 64f80fba8d1..103fb8e49a6 100644
--- a/addons/board_account/__terp__.py
+++ b/addons/board_account/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/board_association/__init__.py b/addons/board_association/__init__.py
index 7ed460db2b3..f79e3c91345 100644
--- a/addons/board_association/__init__.py
+++ b/addons/board_association/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/board_association/__terp__.py b/addons/board_association/__terp__.py
index 9c838590a04..1fb212a4b85 100644
--- a/addons/board_association/__terp__.py
+++ b/addons/board_association/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/board_auction/__terp__.py b/addons/board_auction/__terp__.py
index 7d44ae3c827..45fe00f7745 100644
--- a/addons/board_auction/__terp__.py
+++ b/addons/board_auction/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/board_crm_configuration/__init__.py b/addons/board_crm_configuration/__init__.py
index df7a8a9df47..50678195081 100644
--- a/addons/board_crm_configuration/__init__.py
+++ b/addons/board_crm_configuration/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/board_crm_configuration/__terp__.py b/addons/board_crm_configuration/__terp__.py
index 5c869a997d3..9eccf687bbf 100644
--- a/addons/board_crm_configuration/__terp__.py
+++ b/addons/board_crm_configuration/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/board_document/__terp__.py b/addons/board_document/__terp__.py
index 19114430437..74bf8770964 100644
--- a/addons/board_document/__terp__.py
+++ b/addons/board_document/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/board_manufacturing/__init__.py b/addons/board_manufacturing/__init__.py
index 7ed460db2b3..f79e3c91345 100644
--- a/addons/board_manufacturing/__init__.py
+++ b/addons/board_manufacturing/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/board_manufacturing/__terp__.py b/addons/board_manufacturing/__terp__.py
index 8a3c14fba3e..f30b27eef50 100644
--- a/addons/board_manufacturing/__terp__.py
+++ b/addons/board_manufacturing/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/board_project/__init__.py b/addons/board_project/__init__.py
index d63502c9ed8..b0f0f5004ae 100644
--- a/addons/board_project/__init__.py
+++ b/addons/board_project/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/board_project/__terp__.py b/addons/board_project/__terp__.py
index 5b37f5bb323..7b58a63cb9b 100644
--- a/addons/board_project/__terp__.py
+++ b/addons/board_project/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/board_sale/__init__.py b/addons/board_sale/__init__.py
index d63502c9ed8..b0f0f5004ae 100644
--- a/addons/board_sale/__init__.py
+++ b/addons/board_sale/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/board_sale/__terp__.py b/addons/board_sale/__terp__.py
index e5a1ae51f72..f26348f223e 100644
--- a/addons/board_sale/__terp__.py
+++ b/addons/board_sale/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/crm/__init__.py b/addons/crm/__init__.py
index 31422c96d27..b56446e2797 100644
--- a/addons/crm/__init__.py
+++ b/addons/crm/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 045bcfa85fe..43a7ba8be19 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 09b0d4d25c6..6aa1900cb1f 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/crm/crm_operators.py b/addons/crm/crm_operators.py
index 7a41189a95f..9c48ca4cd8b 100644
--- a/addons/crm/crm_operators.py
+++ b/addons/crm/crm_operators.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/crm/crm_segmentation.py b/addons/crm/crm_segmentation.py
index 0ded3cda606..38a02050e64 100644
--- a/addons/crm/crm_segmentation.py
+++ b/addons/crm/crm_segmentation.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/crm/report/__init__.py b/addons/crm/report/__init__.py
index e9af8c83c59..84919f42297 100644
--- a/addons/crm/report/__init__.py
+++ b/addons/crm/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/crm/report/report_businessopp.py b/addons/crm/report/report_businessopp.py
index e7f6b3ee0cd..f8ac3ba9c26 100644
--- a/addons/crm/report/report_businessopp.py
+++ b/addons/crm/report/report_businessopp.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py b/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py
index 3e17c07fccf..d8d2d858929 100755
--- a/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py
+++ b/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py
@@ -1,5 +1,5 @@
#!/usr/bin/python
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 0ee363ca04e..99ecd73ec59 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/crm/wizard/crm_wizard.py b/addons/crm/wizard/crm_wizard.py
index b0ae66e95db..66a3b903eb4 100644
--- a/addons/crm/wizard/crm_wizard.py
+++ b/addons/crm/wizard/crm_wizard.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/crm_configuration/__init__.py b/addons/crm_configuration/__init__.py
index f6b8b7c3bc8..cf7c8c4bfc0 100644
--- a/addons/crm_configuration/__init__.py
+++ b/addons/crm_configuration/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/crm_configuration/__terp__.py b/addons/crm_configuration/__terp__.py
index 0964b63b369..3cced8c144b 100644
--- a/addons/crm_configuration/__terp__.py
+++ b/addons/crm_configuration/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/crm_configuration/report/__init__.py b/addons/crm_configuration/report/__init__.py
index 32939bfa282..2cc1fc7a94f 100644
--- a/addons/crm_configuration/report/__init__.py
+++ b/addons/crm_configuration/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/crm_configuration/report/crm_report.py b/addons/crm_configuration/report/crm_report.py
index c05e3af63e7..9c14b71f7c3 100644
--- a/addons/crm_configuration/report/crm_report.py
+++ b/addons/crm_configuration/report/crm_report.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/crm_configuration/wizard/__init__.py b/addons/crm_configuration/wizard/__init__.py
index 3be034d69c5..66a32ed51ce 100644
--- a/addons/crm_configuration/wizard/__init__.py
+++ b/addons/crm_configuration/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/crm_configuration/wizard/meeting_planify.py b/addons/crm_configuration/wizard/meeting_planify.py
index 1fad9f9770f..e4281f83ee6 100644
--- a/addons/crm_configuration/wizard/meeting_planify.py
+++ b/addons/crm_configuration/wizard/meeting_planify.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/crm_configuration/wizard/wizard_opportunity_set.py b/addons/crm_configuration/wizard/wizard_opportunity_set.py
index 1768697d931..160ef8b8fd1 100644
--- a/addons/crm_configuration/wizard/wizard_opportunity_set.py
+++ b/addons/crm_configuration/wizard/wizard_opportunity_set.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/crm_configuration/wizard/wizard_partner_create.py b/addons/crm_configuration/wizard/wizard_partner_create.py
index 34558e3f1b5..4d2649c7fa3 100644
--- a/addons/crm_configuration/wizard/wizard_partner_create.py
+++ b/addons/crm_configuration/wizard/wizard_partner_create.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/crm_profiling/__init__.py b/addons/crm_profiling/__init__.py
index 3f2ff45e905..01576ce5a61 100644
--- a/addons/crm_profiling/__init__.py
+++ b/addons/crm_profiling/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/crm_profiling/__terp__.py b/addons/crm_profiling/__terp__.py
index 6ea05a5fd34..bb5a1934431 100644
--- a/addons/crm_profiling/__terp__.py
+++ b/addons/crm_profiling/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/crm_profiling/crm_profiling.py b/addons/crm_profiling/crm_profiling.py
index d6345377d1e..03252acdb8d 100644
--- a/addons/crm_profiling/crm_profiling.py
+++ b/addons/crm_profiling/crm_profiling.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/crm_profiling/wizard/__init__.py b/addons/crm_profiling/wizard/__init__.py
index 68c14b590c2..377d01cfea9 100644
--- a/addons/crm_profiling/wizard/__init__.py
+++ b/addons/crm_profiling/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/crm_profiling/wizard/open_questionnaire.py b/addons/crm_profiling/wizard/open_questionnaire.py
index 57b563a9224..0ed4a44d7f7 100644
--- a/addons/crm_profiling/wizard/open_questionnaire.py
+++ b/addons/crm_profiling/wizard/open_questionnaire.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/crm_vertical/__init__.py b/addons/crm_vertical/__init__.py
index 51f5dcf919b..3eb6774f395 100644
--- a/addons/crm_vertical/__init__.py
+++ b/addons/crm_vertical/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/crm_vertical/__terp__.py b/addons/crm_vertical/__terp__.py
index 34453baad14..fb54ce14893 100644
--- a/addons/crm_vertical/__terp__.py
+++ b/addons/crm_vertical/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/crm_vertical/crm_vertical.py b/addons/crm_vertical/crm_vertical.py
index 8b057eb14c4..1e18f85c2ab 100644
--- a/addons/crm_vertical/crm_vertical.py
+++ b/addons/crm_vertical/crm_vertical.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/delivery/__init__.py b/addons/delivery/__init__.py
index 89437f714b5..b06da65d1b1 100644
--- a/addons/delivery/__init__.py
+++ b/addons/delivery/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/delivery/__terp__.py b/addons/delivery/__terp__.py
index 856404465dc..007c54bc4dc 100644
--- a/addons/delivery/__terp__.py
+++ b/addons/delivery/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index 4cf0a5df79d..d86d67478c5 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/delivery/partner.py b/addons/delivery/partner.py
index e24bf9f6418..2350e931211 100644
--- a/addons/delivery/partner.py
+++ b/addons/delivery/partner.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/delivery/sale.py b/addons/delivery/sale.py
index 40b20ecf317..d06f8e574c8 100644
--- a/addons/delivery/sale.py
+++ b/addons/delivery/sale.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py
index 3377ff3395e..ce5e32d51ec 100644
--- a/addons/delivery/stock.py
+++ b/addons/delivery/stock.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/delivery/wizard/__init__.py b/addons/delivery/wizard/__init__.py
index 86616810a19..92b607a71fe 100644
--- a/addons/delivery/wizard/__init__.py
+++ b/addons/delivery/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/delivery/wizard/delivery_sale_order.py b/addons/delivery/wizard/delivery_sale_order.py
index b0bda72dabd..931a9a5adae 100644
--- a/addons/delivery/wizard/delivery_sale_order.py
+++ b/addons/delivery/wizard/delivery_sale_order.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/document/__init__.py b/addons/document/__init__.py
index 2b9d7747b91..913d255bb22 100644
--- a/addons/document/__init__.py
+++ b/addons/document/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/document/__terp__.py b/addons/document/__terp__.py
index 27c917f3deb..0103409b89c 100644
--- a/addons/document/__terp__.py
+++ b/addons/document/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/document/content_index.py b/addons/document/content_index.py
index 6540b87b5ff..e281ca6e7b8 100644
--- a/addons/document/content_index.py
+++ b/addons/document/content_index.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/document/document.py b/addons/document/document.py
index 460c52a9698..ebfed095020 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/document/ftpserver/__init__.py b/addons/document/ftpserver/__init__.py
index 7a68a7e5821..d79c4df450b 100644
--- a/addons/document/ftpserver/__init__.py
+++ b/addons/document/ftpserver/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/document/ftpserver/authorizer.py b/addons/document/ftpserver/authorizer.py
index 5a64ca8f7a0..394f773486d 100644
--- a/addons/document/ftpserver/authorizer.py
+++ b/addons/document/ftpserver/authorizer.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
class authorizer:
read_perms = "elr"
diff --git a/addons/document/ftpserver/ftpserver.py b/addons/document/ftpserver/ftpserver.py
index ae0fc38e1e1..1ee45df4481 100644
--- a/addons/document/ftpserver/ftpserver.py
+++ b/addons/document/ftpserver/ftpserver.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
# ftpserver.py
#
# pyftpdlib is released under the MIT license, reproduced below:
diff --git a/addons/document/odt2txt.py b/addons/document/odt2txt.py
index 55c228498fa..e0bef65c888 100644
--- a/addons/document/odt2txt.py
+++ b/addons/document/odt2txt.py
@@ -1,5 +1,5 @@
#!/usr/bin/python
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/document_ics/__init__.py b/addons/document_ics/__init__.py
index a651d00614b..03e6aebfb34 100644
--- a/addons/document_ics/__init__.py
+++ b/addons/document_ics/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/document_ics/__terp__.py b/addons/document_ics/__terp__.py
index 9e3d85295da..531b6a23635 100644
--- a/addons/document_ics/__terp__.py
+++ b/addons/document_ics/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/document_ics/document.py b/addons/document_ics/document.py
index 048a82c7680..b8ce53e31de 100644
--- a/addons/document_ics/document.py
+++ b/addons/document_ics/document.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/event/__init__.py b/addons/event/__init__.py
index bee0958c584..2993d18bbbb 100644
--- a/addons/event/__init__.py
+++ b/addons/event/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/event/__terp__.py b/addons/event/__terp__.py
index ddb972a372a..aec02104f94 100644
--- a/addons/event/__terp__.py
+++ b/addons/event/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/event/event.py b/addons/event/event.py
index 34433683a1a..a9bce74e044 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/event/wizard/__init__.py b/addons/event/wizard/__init__.py
index 162a6dc1fe2..29427a61af0 100644
--- a/addons/event/wizard/__init__.py
+++ b/addons/event/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/event/wizard/confirm_registration.py b/addons/event/wizard/confirm_registration.py
index 3a9a79712c8..76db028616d 100644
--- a/addons/event/wizard/confirm_registration.py
+++ b/addons/event/wizard/confirm_registration.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/event/wizard/event_registration.py b/addons/event/wizard/event_registration.py
index 0e355c3ac1b..f077e8de2ae 100644
--- a/addons/event/wizard/event_registration.py
+++ b/addons/event/wizard/event_registration.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/event/wizard/event_registrations_partner.py b/addons/event/wizard/event_registrations_partner.py
index 9331c2aa757..9b578bf7d60 100644
--- a/addons/event/wizard/event_registrations_partner.py
+++ b/addons/event/wizard/event_registrations_partner.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/event/wizard/make_invoice.py b/addons/event/wizard/make_invoice.py
index c41a0748b55..bc6b45c3395 100644
--- a/addons/event/wizard/make_invoice.py
+++ b/addons/event/wizard/make_invoice.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/event_project/__init__.py b/addons/event_project/__init__.py
index bee0958c584..2993d18bbbb 100644
--- a/addons/event_project/__init__.py
+++ b/addons/event_project/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/event_project/__terp__.py b/addons/event_project/__terp__.py
index cd846203c75..8b8128654bb 100644
--- a/addons/event_project/__terp__.py
+++ b/addons/event_project/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/event_project/event.py b/addons/event_project/event.py
index 51dd36c6199..fe75fcf5068 100644
--- a/addons/event_project/event.py
+++ b/addons/event_project/event.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/event_project/wizard/__init__.py b/addons/event_project/wizard/__init__.py
index e89f0edc4c3..9deafadbf5d 100644
--- a/addons/event_project/wizard/__init__.py
+++ b/addons/event_project/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/event_project/wizard/event_task.py b/addons/event_project/wizard/event_task.py
index 57a9782e151..b9796fb7295 100644
--- a/addons/event_project/wizard/event_task.py
+++ b/addons/event_project/wizard/event_task.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/event_project/wizard/project_wizard.py b/addons/event_project/wizard/project_wizard.py
index f8996c8fa35..2183d6dfc76 100644
--- a/addons/event_project/wizard/project_wizard.py
+++ b/addons/event_project/wizard/project_wizard.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/google_map/__init__.py b/addons/google_map/__init__.py
index b8d61f3f765..a6d98e1042d 100644
--- a/addons/google_map/__init__.py
+++ b/addons/google_map/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/google_map/__terp__.py b/addons/google_map/__terp__.py
index 9d5df2f8aed..9920e419039 100644
--- a/addons/google_map/__terp__.py
+++ b/addons/google_map/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/google_map/google_map.py b/addons/google_map/google_map.py
index 4ec5321e2be..cde5face359 100644
--- a/addons/google_map/google_map.py
+++ b/addons/google_map/google_map.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/google_map/wizard/__init__.py b/addons/google_map/wizard/__init__.py
index 67821c467c0..c675e725655 100644
--- a/addons/google_map/wizard/__init__.py
+++ b/addons/google_map/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/google_map/wizard/google_map_launch.py b/addons/google_map/wizard/google_map_launch.py
index a513421ad2d..9053bfe900b 100644
--- a/addons/google_map/wizard/google_map_launch.py
+++ b/addons/google_map/wizard/google_map_launch.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr/__init__.py b/addons/hr/__init__.py
index fbf65ca473c..a35871b7115 100644
--- a/addons/hr/__init__.py
+++ b/addons/hr/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr/__terp__.py b/addons/hr/__terp__.py
index 0fc937404e3..eb042be4fde 100644
--- a/addons/hr/__terp__.py
+++ b/addons/hr/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 2a707e79eb6..3af0b4e5345 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_attendance/__init__.py b/addons/hr_attendance/__init__.py
index 9b6634e4bdd..b8442924a94 100644
--- a/addons/hr_attendance/__init__.py
+++ b/addons/hr_attendance/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_attendance/__terp__.py b/addons/hr_attendance/__terp__.py
index 5f59acab357..8916ad2de5c 100644
--- a/addons/hr_attendance/__terp__.py
+++ b/addons/hr_attendance/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index d6cc2687111..532bcc72d25 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_attendance/report/__init__.py b/addons/hr_attendance/report/__init__.py
index 84f891d3c1b..a68156401e2 100644
--- a/addons/hr_attendance/report/__init__.py
+++ b/addons/hr_attendance/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_attendance/report/attendance_errors.py b/addons/hr_attendance/report/attendance_errors.py
index ef3317e27da..ff048f05e01 100644
--- a/addons/hr_attendance/report/attendance_errors.py
+++ b/addons/hr_attendance/report/attendance_errors.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_attendance/report/bymonth.py b/addons/hr_attendance/report/bymonth.py
index 1da6db83cfd..0ae0710a853 100644
--- a/addons/hr_attendance/report/bymonth.py
+++ b/addons/hr_attendance/report/bymonth.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_attendance/wizard/__init__.py b/addons/hr_attendance/wizard/__init__.py
index f6ce627cbf9..2539a329d22 100644
--- a/addons/hr_attendance/wizard/__init__.py
+++ b/addons/hr_attendance/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_attendance/wizard/print_attendance_error.py b/addons/hr_attendance/wizard/print_attendance_error.py
index 242fc7f90aa..b5f9632e8d3 100644
--- a/addons/hr_attendance/wizard/print_attendance_error.py
+++ b/addons/hr_attendance/wizard/print_attendance_error.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_attendance/wizard/print_bymonth.py b/addons/hr_attendance/wizard/print_bymonth.py
index 8c83b90cde3..ea557096719 100644
--- a/addons/hr_attendance/wizard/print_bymonth.py
+++ b/addons/hr_attendance/wizard/print_bymonth.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_attendance/wizard/print_byweek.py b/addons/hr_attendance/wizard/print_byweek.py
index b5956cb7b48..5912c5a11ec 100644
--- a/addons/hr_attendance/wizard/print_byweek.py
+++ b/addons/hr_attendance/wizard/print_byweek.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_attendance/wizard/sign_in_out.py b/addons/hr_attendance/wizard/sign_in_out.py
index b3c253219bf..7b23aebdf84 100644
--- a/addons/hr_attendance/wizard/sign_in_out.py
+++ b/addons/hr_attendance/wizard/sign_in_out.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_contract/__init__.py b/addons/hr_contract/__init__.py
index 77b27246dd0..7c179dd9b96 100644
--- a/addons/hr_contract/__init__.py
+++ b/addons/hr_contract/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_contract/__terp__.py b/addons/hr_contract/__terp__.py
index 2afd71a042a..a80cd58a093 100644
--- a/addons/hr_contract/__terp__.py
+++ b/addons/hr_contract/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
index 0425fb9e3db..1ddd4ae571b 100644
--- a/addons/hr_contract/hr_contract.py
+++ b/addons/hr_contract/hr_contract.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_expense/__init__.py b/addons/hr_expense/__init__.py
index 018108b1197..bc804294acb 100644
--- a/addons/hr_expense/__init__.py
+++ b/addons/hr_expense/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_expense/__terp__.py b/addons/hr_expense/__terp__.py
index fd7ad9d2530..4b8617ef8f3 100644
--- a/addons/hr_expense/__terp__.py
+++ b/addons/hr_expense/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 0523dcb687c..64425d076d5 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_expense/report/__init__.py b/addons/hr_expense/report/__init__.py
index 2a85b725306..9b69aeff779 100644
--- a/addons/hr_expense/report/__init__.py
+++ b/addons/hr_expense/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_expense/report/expense.py b/addons/hr_expense/report/expense.py
index 0c35a035a38..50d249d2ff7 100644
--- a/addons/hr_expense/report/expense.py
+++ b/addons/hr_expense/report/expense.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_holidays/__init__.py b/addons/hr_holidays/__init__.py
index 88be1b293ee..fe0100012b8 100644
--- a/addons/hr_holidays/__init__.py
+++ b/addons/hr_holidays/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
import hr
import report
import wizard
diff --git a/addons/hr_holidays/__terp__.py b/addons/hr_holidays/__terp__.py
index 7a9162936c9..1091ea60392 100644
--- a/addons/hr_holidays/__terp__.py
+++ b/addons/hr_holidays/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
{
diff --git a/addons/hr_holidays/hr.py b/addons/hr_holidays/hr.py
index 733f90f48cd..4e754ec4b7d 100644
--- a/addons/hr_holidays/hr.py
+++ b/addons/hr_holidays/hr.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##################################################################################
#
# Copyright (c) 2005-2006 Axelor SARL. (http://www.axelor.com) All Rights Reserved.
diff --git a/addons/hr_holidays/report/__init__.py b/addons/hr_holidays/report/__init__.py
index 0ed85c820fc..4363f58d0e5 100644
--- a/addons/hr_holidays/report/__init__.py
+++ b/addons/hr_holidays/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
import holidays_summary_report
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py
index b6539fbd52e..bc008f158ba 100644
--- a/addons/hr_holidays/report/holidays_summary_report.py
+++ b/addons/hr_holidays/report/holidays_summary_report.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
import datetime
import time
diff --git a/addons/hr_holidays/wizard/__init__.py b/addons/hr_holidays/wizard/__init__.py
index b8703e0bbcb..b4b84c405ac 100644
--- a/addons/hr_holidays/wizard/__init__.py
+++ b/addons/hr_holidays/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
import holidays_summary
import holidays_summary_employees
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_holidays/wizard/holidays_summary.py b/addons/hr_holidays/wizard/holidays_summary.py
index ac37fc4b081..923f2800704 100644
--- a/addons/hr_holidays/wizard/holidays_summary.py
+++ b/addons/hr_holidays/wizard/holidays_summary.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# Copyright (c) 2004-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
diff --git a/addons/hr_holidays/wizard/holidays_summary_employees.py b/addons/hr_holidays/wizard/holidays_summary_employees.py
index 9637d109774..ff1f6c4f018 100644
--- a/addons/hr_holidays/wizard/holidays_summary_employees.py
+++ b/addons/hr_holidays/wizard/holidays_summary_employees.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
import wizard
import datetime
diff --git a/addons/hr_timesheet/__init__.py b/addons/hr_timesheet/__init__.py
index 5c72265f726..a0a46edb8e5 100644
--- a/addons/hr_timesheet/__init__.py
+++ b/addons/hr_timesheet/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_timesheet/__terp__.py b/addons/hr_timesheet/__terp__.py
index 56bca69936a..73f8881cc07 100644
--- a/addons/hr_timesheet/__terp__.py
+++ b/addons/hr_timesheet/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 7ceca8495d5..9950a1d5bdb 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_timesheet/report/__init__.py b/addons/hr_timesheet/report/__init__.py
index f831357588a..1bd509f7d2e 100644
--- a/addons/hr_timesheet/report/__init__.py
+++ b/addons/hr_timesheet/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_timesheet/report/user_timesheet.py b/addons/hr_timesheet/report/user_timesheet.py
index 8c7dd387648..ba72e2791ed 100644
--- a/addons/hr_timesheet/report/user_timesheet.py
+++ b/addons/hr_timesheet/report/user_timesheet.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_timesheet/report/users_timesheet.py b/addons/hr_timesheet/report/users_timesheet.py
index d7f17b00e9e..9f8025ae34c 100644
--- a/addons/hr_timesheet/report/users_timesheet.py
+++ b/addons/hr_timesheet/report/users_timesheet.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_timesheet/wizard/__init__.py b/addons/hr_timesheet/wizard/__init__.py
index 6c9297d3b90..bcba0198618 100644
--- a/addons/hr_timesheet/wizard/__init__.py
+++ b/addons/hr_timesheet/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_timesheet/wizard/sign_in_out.py b/addons/hr_timesheet/wizard/sign_in_out.py
index 538a55f75ac..3bf058cd5c2 100644
--- a/addons/hr_timesheet/wizard/sign_in_out.py
+++ b/addons/hr_timesheet/wizard/sign_in_out.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_timesheet/wizard/wizard_print_timesheet.py b/addons/hr_timesheet/wizard/wizard_print_timesheet.py
index 429b9bf0d4e..134138ec138 100644
--- a/addons/hr_timesheet/wizard/wizard_print_timesheet.py
+++ b/addons/hr_timesheet/wizard/wizard_print_timesheet.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_timesheet/wizard/wizard_print_timesheet_users.py b/addons/hr_timesheet/wizard/wizard_print_timesheet_users.py
index e2c13044d7c..c70bb9c8097 100644
--- a/addons/hr_timesheet/wizard/wizard_print_timesheet_users.py
+++ b/addons/hr_timesheet/wizard/wizard_print_timesheet_users.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_timesheet_invoice/__init__.py b/addons/hr_timesheet_invoice/__init__.py
index ffd5aa7d8ae..34c738894e9 100644
--- a/addons/hr_timesheet_invoice/__init__.py
+++ b/addons/hr_timesheet_invoice/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_timesheet_invoice/__terp__.py b/addons/hr_timesheet_invoice/__terp__.py
index 34cb8b8a16d..3f3f5924941 100644
--- a/addons/hr_timesheet_invoice/__terp__.py
+++ b/addons/hr_timesheet_invoice/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 0c16fb4ffd4..a5ba6a4ce80 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_timesheet_invoice/report/__init__.py b/addons/hr_timesheet_invoice/report/__init__.py
index 3572eb09517..652607d964b 100644
--- a/addons/hr_timesheet_invoice/report/__init__.py
+++ b/addons/hr_timesheet_invoice/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_timesheet_invoice/report/account_analytic_profit.py b/addons/hr_timesheet_invoice/report/account_analytic_profit.py
index a767eba946a..f812e325b75 100644
--- a/addons/hr_timesheet_invoice/report/account_analytic_profit.py
+++ b/addons/hr_timesheet_invoice/report/account_analytic_profit.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_timesheet_invoice/report/cost_ledger.py b/addons/hr_timesheet_invoice/report/cost_ledger.py
index 5e588f11e06..38726d36580 100644
--- a/addons/hr_timesheet_invoice/report/cost_ledger.py
+++ b/addons/hr_timesheet_invoice/report/cost_ledger.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_timesheet_invoice/wizard/__init__.py b/addons/hr_timesheet_invoice/wizard/__init__.py
index 564d25cc4b3..2ea6215b4b5 100644
--- a/addons/hr_timesheet_invoice/wizard/__init__.py
+++ b/addons/hr_timesheet_invoice/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_timesheet_invoice/wizard/account_analytic_profit.py b/addons/hr_timesheet_invoice/wizard/account_analytic_profit.py
index 9d1ac817baf..197cf86b69e 100644
--- a/addons/hr_timesheet_invoice/wizard/account_analytic_profit.py
+++ b/addons/hr_timesheet_invoice/wizard/account_analytic_profit.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
index 29b5809db5b..9bdee2a21f7 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 7d911bfeeed..19da9517d0a 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_timesheet_invoice/wizard/wizard_account_analytic_cost_ledger_report.py b/addons/hr_timesheet_invoice/wizard/wizard_account_analytic_cost_ledger_report.py
index 1f881465825..ec44431130c 100644
--- a/addons/hr_timesheet_invoice/wizard/wizard_account_analytic_cost_ledger_report.py
+++ b/addons/hr_timesheet_invoice/wizard/wizard_account_analytic_cost_ledger_report.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_timesheet_sheet/__init__.py b/addons/hr_timesheet_sheet/__init__.py
index 9f4d3cb64f3..91616b06d8b 100644
--- a/addons/hr_timesheet_sheet/__init__.py
+++ b/addons/hr_timesheet_sheet/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_timesheet_sheet/__terp__.py b/addons/hr_timesheet_sheet/__terp__.py
index 129592adfaa..3e51e9e660a 100644
--- a/addons/hr_timesheet_sheet/__terp__.py
+++ b/addons/hr_timesheet_sheet/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index e700e404c2f..5ab3448dc90 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_timesheet_sheet/wizard/__init__.py b/addons/hr_timesheet_sheet/wizard/__init__.py
index 364a0a25e2d..6fcd9ce3b4a 100644
--- a/addons/hr_timesheet_sheet/wizard/__init__.py
+++ b/addons/hr_timesheet_sheet/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_timesheet_sheet/wizard/wizard_timesheet_current.py b/addons/hr_timesheet_sheet/wizard/wizard_timesheet_current.py
index 2c6613baa68..abc07934443 100644
--- a/addons/hr_timesheet_sheet/wizard/wizard_timesheet_current.py
+++ b/addons/hr_timesheet_sheet/wizard/wizard_timesheet_current.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/hr_timesheet_sheet/wizard/wizard_timesheet_department.py b/addons/hr_timesheet_sheet/wizard/wizard_timesheet_department.py
index 0b1e77d5659..7a783602755 100644
--- a/addons/hr_timesheet_sheet/wizard/wizard_timesheet_department.py
+++ b/addons/hr_timesheet_sheet/wizard/wizard_timesheet_department.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/idea/__init__.py b/addons/idea/__init__.py
index 09f122b507c..87656192833 100644
--- a/addons/idea/__init__.py
+++ b/addons/idea/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/idea/__terp__.py b/addons/idea/__terp__.py
index a30d2854d32..7ecd6313ecf 100644
--- a/addons/idea/__terp__.py
+++ b/addons/idea/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/l10n_be/__init__.py b/addons/l10n_be/__init__.py
index c652b702c26..5e1061125e6 100644
--- a/addons/l10n_be/__init__.py
+++ b/addons/l10n_be/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/l10n_be/__terp__.py b/addons/l10n_be/__terp__.py
index 910df2d39e2..532ea10c9f9 100644
--- a/addons/l10n_be/__terp__.py
+++ b/addons/l10n_be/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/l10n_be/company.py b/addons/l10n_be/company.py
index 0ef41919dcb..f47e3ec8c27 100644
--- a/addons/l10n_be/company.py
+++ b/addons/l10n_be/company.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/l10n_be/wizard/account_vat_declaration.py b/addons/l10n_be/wizard/account_vat_declaration.py
index d913cf20e12..2ea0c5bba74 100644
--- a/addons/l10n_be/wizard/account_vat_declaration.py
+++ b/addons/l10n_be/wizard/account_vat_declaration.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/l10n_be/wizard/partner_vat_listing.py b/addons/l10n_be/wizard/partner_vat_listing.py
index 78437408640..601da8d1c5a 100644
--- a/addons/l10n_be/wizard/partner_vat_listing.py
+++ b/addons/l10n_be/wizard/partner_vat_listing.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/l10n_ch/__init__.py b/addons/l10n_ch/__init__.py
index 7da724eaaff..91ddfdb9f3d 100755
--- a/addons/l10n_ch/__init__.py
+++ b/addons/l10n_ch/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
#
# __init__.py
# l10n_ch
diff --git a/addons/l10n_ch/__terp__.py b/addons/l10n_ch/__terp__.py
index a7fdbb86511..9f45629d516 100755
--- a/addons/l10n_ch/__terp__.py
+++ b/addons/l10n_ch/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
#
# __terp__.py
# l10n_ch
diff --git a/addons/l10n_ch/company.py b/addons/l10n_ch/company.py
index 924278cd1a5..84aa2602673 100755
--- a/addons/l10n_ch/company.py
+++ b/addons/l10n_ch/company.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
#
# company.py
# l10n_ch
diff --git a/addons/l10n_ch/dta.py b/addons/l10n_ch/dta.py
index 435a0b2b18b..1226433d8d9 100755
--- a/addons/l10n_ch/dta.py
+++ b/addons/l10n_ch/dta.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
# dat.py
# l10n_ch
#
diff --git a/addons/l10n_ch/invoice.py b/addons/l10n_ch/invoice.py
index 9d5780f003a..cebdf5b23f3 100755
--- a/addons/l10n_ch/invoice.py
+++ b/addons/l10n_ch/invoice.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
#
# bank.py
# invoice.py
diff --git a/addons/l10n_ch/partner.py b/addons/l10n_ch/partner.py
index 4dc9656826c..5b0a68c3ec8 100755
--- a/addons/l10n_ch/partner.py
+++ b/addons/l10n_ch/partner.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
#
# bank.py
# partner.py
diff --git a/addons/l10n_ch/payment.py b/addons/l10n_ch/payment.py
index 56420e85046..c1ca00b793c 100755
--- a/addons/l10n_ch/payment.py
+++ b/addons/l10n_ch/payment.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
#
# payment.py
# l10n_ch
diff --git a/addons/l10n_ch/report/__init__.py b/addons/l10n_ch/report/__init__.py
index 9c21083c668..ee83c9c6f12 100755
--- a/addons/l10n_ch/report/__init__.py
+++ b/addons/l10n_ch/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
#
# __init__.py
# l10n_ch
diff --git a/addons/l10n_ch/report/bvr.py b/addons/l10n_ch/report/bvr.py
index c71c62a0da2..095defdb2e6 100755
--- a/addons/l10n_ch/report/bvr.py
+++ b/addons/l10n_ch/report/bvr.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
#
# bvr.py
# l10n_ch
diff --git a/addons/l10n_ch/wizard/__init__.py b/addons/l10n_ch/wizard/__init__.py
index eaeaaf905f8..ecc5c6a07ba 100755
--- a/addons/l10n_ch/wizard/__init__.py
+++ b/addons/l10n_ch/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
#
# __init__.py
# l10n_ch
diff --git a/addons/l10n_ch/wizard/bvr_import.py b/addons/l10n_ch/wizard/bvr_import.py
index 585e996bbed..36212d559db 100755
--- a/addons/l10n_ch/wizard/bvr_import.py
+++ b/addons/l10n_ch/wizard/bvr_import.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
#
# bvr_import.py
# l10n_ch
diff --git a/addons/l10n_ch/wizard/dta_wizard.py b/addons/l10n_ch/wizard/dta_wizard.py
index fe148c0810a..766fd550e74 100755
--- a/addons/l10n_ch/wizard/dta_wizard.py
+++ b/addons/l10n_ch/wizard/dta_wizard.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
#
# dta_wizard.py
# l10n_ch
diff --git a/addons/l10n_ch/wizard/journal_config.py b/addons/l10n_ch/wizard/journal_config.py
index 905cb6e0a4a..51368536f84 100755
--- a/addons/l10n_ch/wizard/journal_config.py
+++ b/addons/l10n_ch/wizard/journal_config.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
#
# journal_config.py
# l10n_ch
diff --git a/addons/l10n_ch/wizard/wizard_bvr.py b/addons/l10n_ch/wizard/wizard_bvr.py
index 8c1221d1303..15bdb85b356 100755
--- a/addons/l10n_ch/wizard/wizard_bvr.py
+++ b/addons/l10n_ch/wizard/wizard_bvr.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
#
# wizzard_bvr.py
# l10n_ch
diff --git a/addons/l10n_ch_chart_c2c_pcg/__terp__.py b/addons/l10n_ch_chart_c2c_pcg/__terp__.py
index 34ddd400b52..fe6e9a04511 100644
--- a/addons/l10n_ch_chart_c2c_pcg/__terp__.py
+++ b/addons/l10n_ch_chart_c2c_pcg/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
# Copyright (c) 2008 CamptoCamp SA
#
# __init__.py
diff --git a/addons/l10n_chart_uk_minimal/__init__.py b/addons/l10n_chart_uk_minimal/__init__.py
index 21766a1cab8..c417d8b0478 100644
--- a/addons/l10n_chart_uk_minimal/__init__.py
+++ b/addons/l10n_chart_uk_minimal/__init__.py
@@ -1,34 +1,34 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2004-2009 Seath Solutions Ltd. All Rights Reserved.
-# Geoff Gardiner, Seath Solutions Ltd (http://www.seathsolutions.com/)
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2009 Seath Solutions Ltd. All Rights Reserved.
+# Geoff Gardiner, Seath Solutions Ltd (http://www.seathsolutions.com/)
# $Id$
#
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-##############################################################################
-
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_chart_uk_minimal/__terp__.py b/addons/l10n_chart_uk_minimal/__terp__.py
index b4881867bb8..78b1edfa13a 100644
--- a/addons/l10n_chart_uk_minimal/__terp__.py
+++ b/addons/l10n_chart_uk_minimal/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/l10n_fr/__init__.py b/addons/l10n_fr/__init__.py
index d61b0d44f42..4319b838c0c 100644
--- a/addons/l10n_fr/__init__.py
+++ b/addons/l10n_fr/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# Copyright (c) 2008 JAILLET Simon - CrysaLEAD - www.crysalead.fr
diff --git a/addons/l10n_fr/__terp__.py b/addons/l10n_fr/__terp__.py
index b3a1f507ce1..55b5eb1ce1f 100644
--- a/addons/l10n_fr/__terp__.py
+++ b/addons/l10n_fr/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# Copyright (c) 2008 JAILLET Simon - CrysaLEAD - www.crysalead.fr
diff --git a/addons/l10n_fr/l10n_fr.py b/addons/l10n_fr/l10n_fr.py
index db43fe38144..f0877d88ccf 100644
--- a/addons/l10n_fr/l10n_fr.py
+++ b/addons/l10n_fr/l10n_fr.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/l10n_fr/report/__init__.py b/addons/l10n_fr/report/__init__.py
index 0866a4bcad2..558b90865b9 100644
--- a/addons/l10n_fr/report/__init__.py
+++ b/addons/l10n_fr/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# Copyright (c) 2008 JAILLET Simon - CrysaLEAD - www.crysalead.fr
diff --git a/addons/l10n_fr/report/base_report.py b/addons/l10n_fr/report/base_report.py
index 488f36304c5..080f289ef29 100644
--- a/addons/l10n_fr/report/base_report.py
+++ b/addons/l10n_fr/report/base_report.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# Copyright (c) 2008 JAILLET Simon - CrysaLEAD - www.crysalead.fr
diff --git a/addons/l10n_fr/report/bilan.py b/addons/l10n_fr/report/bilan.py
index d464217c34f..96d269893d8 100644
--- a/addons/l10n_fr/report/bilan.py
+++ b/addons/l10n_fr/report/bilan.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# Copyright (c) 2008 JAILLET Simon - CrysaLEAD - www.crysalead.fr
diff --git a/addons/l10n_fr/report/cdr.py b/addons/l10n_fr/report/cdr.py
index 8a650729135..6e763087f5e 100644
--- a/addons/l10n_fr/report/cdr.py
+++ b/addons/l10n_fr/report/cdr.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# Copyright (c) 2008 JAILLET Simon - CrysaLEAD - www.crysalead.fr
diff --git a/addons/l10n_fr/wizard/__init__.py b/addons/l10n_fr/wizard/__init__.py
index c067040e0bc..11db3887d1f 100644
--- a/addons/l10n_fr/wizard/__init__.py
+++ b/addons/l10n_fr/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# Copyright (c) 2008 JAILLET Simon - CrysaLEAD - www.crysalead.fr
diff --git a/addons/l10n_fr/wizard/bilan.py b/addons/l10n_fr/wizard/bilan.py
index a30ae320ad4..2a0e3c1855e 100644
--- a/addons/l10n_fr/wizard/bilan.py
+++ b/addons/l10n_fr/wizard/bilan.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# Copyright (c) 2008 JAILLET Simon - CrysaLEAD - www.crysalead.fr
diff --git a/addons/l10n_fr/wizard/cdr.py b/addons/l10n_fr/wizard/cdr.py
index 9d36bb55a5d..57216754366 100644
--- a/addons/l10n_fr/wizard/cdr.py
+++ b/addons/l10n_fr/wizard/cdr.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# Copyright (c) 2008 JAILLET Simon - CrysaLEAD - www.crysalead.fr
diff --git a/addons/l10n_lu/__init__.py b/addons/l10n_lu/__init__.py
index cb7027eb605..0917884983c 100644
--- a/addons/l10n_lu/__init__.py
+++ b/addons/l10n_lu/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/l10n_lu/__terp__.py b/addons/l10n_lu/__terp__.py
index 169d95df3fc..b34d96c1ff7 100644
--- a/addons/l10n_lu/__terp__.py
+++ b/addons/l10n_lu/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/l10n_lu/wizard/__init__.py b/addons/l10n_lu/wizard/__init__.py
index 2d818b6f2fa..8ad1ea08614 100644
--- a/addons/l10n_lu/wizard/__init__.py
+++ b/addons/l10n_lu/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/l10n_lu/wizard/pdf_ext.py b/addons/l10n_lu/wizard/pdf_ext.py
index 401800b5d7a..53400824db2 100644
--- a/addons/l10n_lu/wizard/pdf_ext.py
+++ b/addons/l10n_lu/wizard/pdf_ext.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/l10n_lu/wizard/print_vat.py b/addons/l10n_lu/wizard/print_vat.py
index 69c93f956c7..4523e9aa89e 100644
--- a/addons/l10n_lu/wizard/print_vat.py
+++ b/addons/l10n_lu/wizard/print_vat.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
#Copyright (c) Vincent Cardon <vincent.cardon@tranquil-it-systems.fr>
# Denis Cardon <denis.cardon@tranquilitsystems.com> and Emmanuel RICHARD.
#Ingenieur fondateur
diff --git a/addons/membership/__init__.py b/addons/membership/__init__.py
index 1904739c361..c22d6ea6f00 100644
--- a/addons/membership/__init__.py
+++ b/addons/membership/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/membership/__terp__.py b/addons/membership/__terp__.py
index dfc6774da2f..0740e4701b4 100644
--- a/addons/membership/__terp__.py
+++ b/addons/membership/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 71e7f6e2e88..1dded5934a0 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/membership/wizard/__init__.py b/addons/membership/wizard/__init__.py
index ab1f292ce8f..c83ca28f8da 100644
--- a/addons/membership/wizard/__init__.py
+++ b/addons/membership/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/membership/wizard/invoice_membership.py b/addons/membership/wizard/invoice_membership.py
index 8eac255c610..0bc75c67e3f 100644
--- a/addons/membership/wizard/invoice_membership.py
+++ b/addons/membership/wizard/invoice_membership.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp/__init__.py b/addons/mrp/__init__.py
index 75001ba0ceb..9b443833b45 100644
--- a/addons/mrp/__init__.py
+++ b/addons/mrp/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py
index 508b66a7878..a30bd0669f5 100644
--- a/addons/mrp/__terp__.py
+++ b/addons/mrp/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp/company.py b/addons/mrp/company.py
index 1d3c7cf02ea..603523ad607 100644
--- a/addons/mrp/company.py
+++ b/addons/mrp/company.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index f5d4c7cd15e..0db221762e6 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp/report/__init__.py b/addons/mrp/report/__init__.py
index 4456190cfcb..c797b2fa840 100644
--- a/addons/mrp/report/__init__.py
+++ b/addons/mrp/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp/report/order.py b/addons/mrp/report/order.py
index 5fc82b9f7f0..acecf826ed2 100644
--- a/addons/mrp/report/order.py
+++ b/addons/mrp/report/order.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py
index 249978da461..d97629fd806 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp/report/workcenter_load.py b/addons/mrp/report/workcenter_load.py
index 46d0d34628a..a6fc8ac5916 100644
--- a/addons/mrp/report/workcenter_load.py
+++ b/addons/mrp/report/workcenter_load.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp/scripts/scheduler.py b/addons/mrp/scripts/scheduler.py
index 47760229fb5..0d95822108e 100644
--- a/addons/mrp/scripts/scheduler.py
+++ b/addons/mrp/scripts/scheduler.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp/wizard/__init__.py b/addons/mrp/wizard/__init__.py
index 1fcb7406959..47bff83e9eb 100644
--- a/addons/mrp/wizard/__init__.py
+++ b/addons/mrp/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp/wizard/make_procurement.py b/addons/mrp/wizard/make_procurement.py
index 22f451bc257..863bd9ecdac 100644
--- a/addons/mrp/wizard/make_procurement.py
+++ b/addons/mrp/wizard/make_procurement.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp/wizard/wizard_change_production_qty.py b/addons/mrp/wizard/wizard_change_production_qty.py
index 22fe912e4cf..a961529f442 100644
--- a/addons/mrp/wizard/wizard_change_production_qty.py
+++ b/addons/mrp/wizard/wizard_change_production_qty.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp/wizard/wizard_orderpoint_procurement.py b/addons/mrp/wizard/wizard_orderpoint_procurement.py
index 44ee2f4f223..1bfc8e5ea74 100644
--- a/addons/mrp/wizard/wizard_orderpoint_procurement.py
+++ b/addons/mrp/wizard/wizard_orderpoint_procurement.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp/wizard/wizard_price.py b/addons/mrp/wizard/wizard_price.py
index 7af46f74c1b..c4d4dc963a3 100644
--- a/addons/mrp/wizard/wizard_price.py
+++ b/addons/mrp/wizard/wizard_price.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp/wizard/wizard_procurement.py b/addons/mrp/wizard/wizard_procurement.py
index aab4c01c5b9..7d0d0395529 100644
--- a/addons/mrp/wizard/wizard_procurement.py
+++ b/addons/mrp/wizard/wizard_procurement.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp/wizard/wizard_schedulers_all.py b/addons/mrp/wizard/wizard_schedulers_all.py
index 8aba0cb9de2..ea4c79117d7 100644
--- a/addons/mrp/wizard/wizard_schedulers_all.py
+++ b/addons/mrp/wizard/wizard_schedulers_all.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp/wizard/wizard_track_prod.py b/addons/mrp/wizard/wizard_track_prod.py
index c58a0767f30..d91023d341d 100644
--- a/addons/mrp/wizard/wizard_track_prod.py
+++ b/addons/mrp/wizard/wizard_track_prod.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp/wizard/wizard_workcenter_load.py b/addons/mrp/wizard/wizard_workcenter_load.py
index 6f237b0feab..b4499965210 100644
--- a/addons/mrp/wizard/wizard_workcenter_load.py
+++ b/addons/mrp/wizard/wizard_workcenter_load.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp_jit/__init__.py b/addons/mrp_jit/__init__.py
index 7ed460db2b3..f79e3c91345 100644
--- a/addons/mrp_jit/__init__.py
+++ b/addons/mrp_jit/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp_jit/__terp__.py b/addons/mrp_jit/__terp__.py
index 944971b97e7..bb94485d4f9 100644
--- a/addons/mrp_jit/__terp__.py
+++ b/addons/mrp_jit/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp_operations/__init__.py b/addons/mrp_operations/__init__.py
index 2eaa1fc7024..cbb416535af 100644
--- a/addons/mrp_operations/__init__.py
+++ b/addons/mrp_operations/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp_operations/__terp__.py b/addons/mrp_operations/__terp__.py
index c53269f5b7c..9a1bc32886e 100644
--- a/addons/mrp_operations/__terp__.py
+++ b/addons/mrp_operations/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index 8d01b87e7a6..5b5ee509cbf 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp_operations/report/__init__.py b/addons/mrp_operations/report/__init__.py
index 267152163bb..30903e7610a 100755
--- a/addons/mrp_operations/report/__init__.py
+++ b/addons/mrp_operations/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp_operations/report/mrp_code_barcode.py b/addons/mrp_operations/report/mrp_code_barcode.py
index a4431e55b57..e0081db10f7 100755
--- a/addons/mrp_operations/report/mrp_code_barcode.py
+++ b/addons/mrp_operations/report/mrp_code_barcode.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp_operations/report/mrp_wc_barcode.py b/addons/mrp_operations/report/mrp_wc_barcode.py
index bc4fe4976ee..991fcd517ef 100755
--- a/addons/mrp_operations/report/mrp_wc_barcode.py
+++ b/addons/mrp_operations/report/mrp_wc_barcode.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp_repair/__init__.py b/addons/mrp_repair/__init__.py
index 4756c351515..aedc00a2225 100644
--- a/addons/mrp_repair/__init__.py
+++ b/addons/mrp_repair/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp_repair/__terp__.py b/addons/mrp_repair/__terp__.py
index 5db51c15ce4..61b88d72424 100644
--- a/addons/mrp_repair/__terp__.py
+++ b/addons/mrp_repair/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index a34f6c844b6..a350172c966 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp_repair/report/__init__.py b/addons/mrp_repair/report/__init__.py
index 1d9986041d3..89ce6e4891d 100644
--- a/addons/mrp_repair/report/__init__.py
+++ b/addons/mrp_repair/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp_repair/report/order.py b/addons/mrp_repair/report/order.py
index be6897d8c2e..331b45670bf 100644
--- a/addons/mrp_repair/report/order.py
+++ b/addons/mrp_repair/report/order.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp_repair/wizard/__init__.py b/addons/mrp_repair/wizard/__init__.py
index 723bde62717..a95a620a08e 100644
--- a/addons/mrp_repair/wizard/__init__.py
+++ b/addons/mrp_repair/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp_repair/wizard/wizard_cancel_repair.py b/addons/mrp_repair/wizard/wizard_cancel_repair.py
index 81aaed0b0ac..5edeb6df6bc 100644
--- a/addons/mrp_repair/wizard/wizard_cancel_repair.py
+++ b/addons/mrp_repair/wizard/wizard_cancel_repair.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp_repair/wizard/wizard_make_invoice.py b/addons/mrp_repair/wizard/wizard_make_invoice.py
index 3e108d102f6..82bdabe6550 100644
--- a/addons/mrp_repair/wizard/wizard_make_invoice.py
+++ b/addons/mrp_repair/wizard/wizard_make_invoice.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp_subproduct/__init__.py b/addons/mrp_subproduct/__init__.py
index 89155c540e0..e809ffdb568 100644
--- a/addons/mrp_subproduct/__init__.py
+++ b/addons/mrp_subproduct/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp_subproduct/__terp__.py b/addons/mrp_subproduct/__terp__.py
index fe005926185..9de05a3dc3f 100644
--- a/addons/mrp_subproduct/__terp__.py
+++ b/addons/mrp_subproduct/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/addons/mrp_subproduct/mrp_subproduct.py
index 92622845818..a0ffc21d7cc 100644
--- a/addons/mrp_subproduct/mrp_subproduct.py
+++ b/addons/mrp_subproduct/mrp_subproduct.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/point_of_sale/__init__.py b/addons/point_of_sale/__init__.py
index 2c7fd939262..d8efffaaa60 100644
--- a/addons/point_of_sale/__init__.py
+++ b/addons/point_of_sale/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py
index f597c98b0b2..6c250529c99 100644
--- a/addons/point_of_sale/__terp__.py
+++ b/addons/point_of_sale/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index be588a156dd..8a0d94da400 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/point_of_sale/report/__init__.py b/addons/point_of_sale/report/__init__.py
index ea7c7e354bf..8661e60d013 100644
--- a/addons/point_of_sale/report/__init__.py
+++ b/addons/point_of_sale/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/point_of_sale/report/pos_details.py b/addons/point_of_sale/report/pos_details.py
index 1e5962c6586..3c95e1f4d3f 100644
--- a/addons/point_of_sale/report/pos_details.py
+++ b/addons/point_of_sale/report/pos_details.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/point_of_sale/report/pos_details_summary.py b/addons/point_of_sale/report/pos_details_summary.py
index 826844effd6..9bb1463d511 100644
--- a/addons/point_of_sale/report/pos_details_summary.py
+++ b/addons/point_of_sale/report/pos_details_summary.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/point_of_sale/report/pos_invoice.py b/addons/point_of_sale/report/pos_invoice.py
index 54423775614..cce4b039b4e 100644
--- a/addons/point_of_sale/report/pos_invoice.py
+++ b/addons/point_of_sale/report/pos_invoice.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/point_of_sale/report/pos_lines.py b/addons/point_of_sale/report/pos_lines.py
index 1abec66dc80..3541ed7f985 100644
--- a/addons/point_of_sale/report/pos_lines.py
+++ b/addons/point_of_sale/report/pos_lines.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/point_of_sale/report/pos_receipt.py b/addons/point_of_sale/report/pos_receipt.py
index 69f4bd706c2..de4fdb3af32 100644
--- a/addons/point_of_sale/report/pos_receipt.py
+++ b/addons/point_of_sale/report/pos_receipt.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/point_of_sale/stock.py b/addons/point_of_sale/stock.py
index 1e5b76d5813..45853ac7d4e 100644
--- a/addons/point_of_sale/stock.py
+++ b/addons/point_of_sale/stock.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index 89a8f8eab3e..e406742fb6a 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/point_of_sale/wizard/wizard_add_product.py b/addons/point_of_sale/wizard/wizard_add_product.py
index 0daa0bdf0db..f061e3ee97d 100644
--- a/addons/point_of_sale/wizard/wizard_add_product.py
+++ b/addons/point_of_sale/wizard/wizard_add_product.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/point_of_sale/wizard/wizard_confirm.py b/addons/point_of_sale/wizard/wizard_confirm.py
index b401438815e..439612ee705 100644
--- a/addons/point_of_sale/wizard/wizard_confirm.py
+++ b/addons/point_of_sale/wizard/wizard_confirm.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/point_of_sale/wizard/wizard_default_journal.py b/addons/point_of_sale/wizard/wizard_default_journal.py
index bfe59251f45..c3e002fdbb4 100644
--- a/addons/point_of_sale/wizard/wizard_default_journal.py
+++ b/addons/point_of_sale/wizard/wizard_default_journal.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/point_of_sale/wizard/wizard_discount.py b/addons/point_of_sale/wizard/wizard_discount.py
index 8866737d590..4ebea46a7a0 100644
--- a/addons/point_of_sale/wizard/wizard_discount.py
+++ b/addons/point_of_sale/wizard/wizard_discount.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/point_of_sale/wizard/wizard_get_sale.py b/addons/point_of_sale/wizard/wizard_get_sale.py
index de686c11d49..4df51a43ed9 100644
--- a/addons/point_of_sale/wizard/wizard_get_sale.py
+++ b/addons/point_of_sale/wizard/wizard_get_sale.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/point_of_sale/wizard/wizard_refund_order.py b/addons/point_of_sale/wizard/wizard_refund_order.py
index 3caaf127486..df3ec32ded8 100644
--- a/addons/point_of_sale/wizard/wizard_refund_order.py
+++ b/addons/point_of_sale/wizard/wizard_refund_order.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/process/__init__.py b/addons/process/__init__.py
index e18b4f814a7..acadb951c10 100644
--- a/addons/process/__init__.py
+++ b/addons/process/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/process/__terp__.py b/addons/process/__terp__.py
index 68671b965d1..16fa92ae5fb 100644
--- a/addons/process/__terp__.py
+++ b/addons/process/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/process/process.py b/addons/process/process.py
index 739db125833..b58e88726c6 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/product/__init__.py b/addons/product/__init__.py
index e26b636a64e..1f35c05a322 100644
--- a/addons/product/__init__.py
+++ b/addons/product/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/product/__terp__.py b/addons/product/__terp__.py
index ee875c60bd0..a1abb45448d 100644
--- a/addons/product/__terp__.py
+++ b/addons/product/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/product/_common.py b/addons/product/_common.py
index 1c80c6a470e..e3379395798 100644
--- a/addons/product/_common.py
+++ b/addons/product/_common.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/product/partner.py b/addons/product/partner.py
index adc573bbe90..6895a3d1ee8 100644
--- a/addons/product/partner.py
+++ b/addons/product/partner.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 3170a7662a1..ea92e36ccfb 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/product/report/__init__.py b/addons/product/report/__init__.py
index 4a077dc6121..740bae90638 100644
--- a/addons/product/report/__init__.py
+++ b/addons/product/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/product/report/pricelist.py b/addons/product/report/pricelist.py
index 6e9c7ef1b54..1c8f4b9b1a2 100644
--- a/addons/product/report/pricelist.py
+++ b/addons/product/report/pricelist.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/product/wizard/__init__.py b/addons/product/wizard/__init__.py
index d89612cccd7..1a488b0b05b 100644
--- a/addons/product/wizard/__init__.py
+++ b/addons/product/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/product/wizard/wizard_price.py b/addons/product/wizard/wizard_price.py
index 9a10c95670b..fd711707364 100644
--- a/addons/product/wizard/wizard_price.py
+++ b/addons/product/wizard/wizard_price.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/product_margin/__init__.py b/addons/product_margin/__init__.py
index a6b6cbab942..379d11bcba4 100644
--- a/addons/product_margin/__init__.py
+++ b/addons/product_margin/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/product_margin/__terp__.py b/addons/product_margin/__terp__.py
index 5be94a6bb95..63043767e43 100644
--- a/addons/product_margin/__terp__.py
+++ b/addons/product_margin/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/product_margin/product_margin.py b/addons/product_margin/product_margin.py
index 776d17ad1b4..4ad61a9f282 100644
--- a/addons/product_margin/product_margin.py
+++ b/addons/product_margin/product_margin.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/product_margin/wizard/__init__.py b/addons/product_margin/wizard/__init__.py
index 01a37f7bf9b..a7c138eb8f5 100644
--- a/addons/product_margin/wizard/__init__.py
+++ b/addons/product_margin/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/product_margin/wizard/wizard_product_margin.py b/addons/product_margin/wizard/wizard_product_margin.py
index c5095d632c2..60d565891e4 100644
--- a/addons/product_margin/wizard/wizard_product_margin.py
+++ b/addons/product_margin/wizard/wizard_product_margin.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/profile_accounting/__init__.py b/addons/profile_accounting/__init__.py
index 3b7a00509c9..36bb3e3190b 100644
--- a/addons/profile_accounting/__init__.py
+++ b/addons/profile_accounting/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/profile_accounting/__terp__.py b/addons/profile_accounting/__terp__.py
index ace96c34b35..080d2ff6744 100644
--- a/addons/profile_accounting/__terp__.py
+++ b/addons/profile_accounting/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/profile_accounting/profile_accounting.py b/addons/profile_accounting/profile_accounting.py
index 7a149e1b90b..ab64ff27c65 100644
--- a/addons/profile_accounting/profile_accounting.py
+++ b/addons/profile_accounting/profile_accounting.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/profile_association/__init__.py b/addons/profile_association/__init__.py
index 681173b3153..ac51fc8bee1 100644
--- a/addons/profile_association/__init__.py
+++ b/addons/profile_association/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/profile_association/__terp__.py b/addons/profile_association/__terp__.py
index c4344c51458..b5602ea6f12 100644
--- a/addons/profile_association/__terp__.py
+++ b/addons/profile_association/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/profile_association/profile_association.py b/addons/profile_association/profile_association.py
index 4dbdebd50e1..86efc2bb874 100644
--- a/addons/profile_association/profile_association.py
+++ b/addons/profile_association/profile_association.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/profile_auction/__init__.py b/addons/profile_auction/__init__.py
index 7ed460db2b3..f79e3c91345 100644
--- a/addons/profile_auction/__init__.py
+++ b/addons/profile_auction/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/profile_auction/__terp__.py b/addons/profile_auction/__terp__.py
index c08dfbf0149..d763f3c1132 100644
--- a/addons/profile_auction/__terp__.py
+++ b/addons/profile_auction/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/profile_crm/__init__.py b/addons/profile_crm/__init__.py
index 7ed460db2b3..f79e3c91345 100644
--- a/addons/profile_crm/__init__.py
+++ b/addons/profile_crm/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/profile_crm/__terp__.py b/addons/profile_crm/__terp__.py
index 6f0944baff5..e5d5daf07f1 100644
--- a/addons/profile_crm/__terp__.py
+++ b/addons/profile_crm/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/profile_manufacturing/__init__.py b/addons/profile_manufacturing/__init__.py
index ac8cd30e469..5b998fabfc6 100644
--- a/addons/profile_manufacturing/__init__.py
+++ b/addons/profile_manufacturing/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/profile_manufacturing/__terp__.py b/addons/profile_manufacturing/__terp__.py
index 7bf367bfed7..cff8299a6d0 100644
--- a/addons/profile_manufacturing/__terp__.py
+++ b/addons/profile_manufacturing/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/profile_manufacturing/profile_manufacturing.py b/addons/profile_manufacturing/profile_manufacturing.py
index 5dfcc68d71a..abbb3084368 100644
--- a/addons/profile_manufacturing/profile_manufacturing.py
+++ b/addons/profile_manufacturing/profile_manufacturing.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/profile_service/__init__.py b/addons/profile_service/__init__.py
index 3c7ba36b96e..1ef9ad0a5c8 100644
--- a/addons/profile_service/__init__.py
+++ b/addons/profile_service/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/profile_service/__terp__.py b/addons/profile_service/__terp__.py
index a69f3228b9e..c620eedeeda 100644
--- a/addons/profile_service/__terp__.py
+++ b/addons/profile_service/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/profile_service/profile_service.py b/addons/profile_service/profile_service.py
index d27989f01fc..e19a23d5ceb 100644
--- a/addons/profile_service/profile_service.py
+++ b/addons/profile_service/profile_service.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/project/__init__.py b/addons/project/__init__.py
index c0395cdad27..95c3ed6428e 100644
--- a/addons/project/__init__.py
+++ b/addons/project/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/project/__terp__.py b/addons/project/__terp__.py
index e865e966052..b201999b555 100644
--- a/addons/project/__terp__.py
+++ b/addons/project/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/project/company.py b/addons/project/company.py
index 0e17ca9e616..29af7c2d058 100644
--- a/addons/project/company.py
+++ b/addons/project/company.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/project/project.py b/addons/project/project.py
index ed2f3c65dd8..f74ccf5495a 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/project/report/__init__.py b/addons/project/report/__init__.py
index 03623366738..379bdda908f 100644
--- a/addons/project/report/__init__.py
+++ b/addons/project/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/project/report/_date_compute.py b/addons/project/report/_date_compute.py
index 85458ee0175..616a2241fbc 100644
--- a/addons/project/report/_date_compute.py
+++ b/addons/project/report/_date_compute.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/project/report/gantt.py b/addons/project/report/gantt.py
index 1caa71b423f..47b3812b604 100644
--- a/addons/project/report/gantt.py
+++ b/addons/project/report/gantt.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/project/report/gantt_report.py b/addons/project/report/gantt_report.py
index 62ab354ae42..6802b0fb845 100644
--- a/addons/project/report/gantt_report.py
+++ b/addons/project/report/gantt_report.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/project/wizard/__init__.py b/addons/project/wizard/__init__.py
index e8ef05292ac..f646128acca 100644
--- a/addons/project/wizard/__init__.py
+++ b/addons/project/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/project/wizard/close_task.py b/addons/project/wizard/close_task.py
index 589f26d1c44..26cfbf51aec 100644
--- a/addons/project/wizard/close_task.py
+++ b/addons/project/wizard/close_task.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/project/wizard/task_delegate.py b/addons/project/wizard/task_delegate.py
index 82f9d7e580e..012be9bb2cb 100644
--- a/addons/project/wizard/task_delegate.py
+++ b/addons/project/wizard/task_delegate.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/project_gtd/__init__.py b/addons/project_gtd/__init__.py
index 7529b78447e..751a5a91b1a 100644
--- a/addons/project_gtd/__init__.py
+++ b/addons/project_gtd/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/project_gtd/__terp__.py b/addons/project_gtd/__terp__.py
index f68555d35e5..ef31f0734bb 100644
--- a/addons/project_gtd/__terp__.py
+++ b/addons/project_gtd/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py
index bb0686e5615..d0ed83e2a87 100644
--- a/addons/project_gtd/project_gtd.py
+++ b/addons/project_gtd/project_gtd.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/project_gtd/wizard/__init__.py b/addons/project_gtd/wizard/__init__.py
index 82f6efe5997..b38481cd7fd 100644
--- a/addons/project_gtd/wizard/__init__.py
+++ b/addons/project_gtd/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/project_gtd/wizard/project_gtd_daily.py b/addons/project_gtd/wizard/project_gtd_daily.py
index 3ead091e06b..98a38b7cf0d 100644
--- a/addons/project_gtd/wizard/project_gtd_daily.py
+++ b/addons/project_gtd/wizard/project_gtd_daily.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/project_gtd/wizard/project_gtd_empty.py b/addons/project_gtd/wizard/project_gtd_empty.py
index cd203240de3..9b57cc357b3 100644
--- a/addons/project_gtd/wizard/project_gtd_empty.py
+++ b/addons/project_gtd/wizard/project_gtd_empty.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/project_gtd/wizard/project_gtd_fill.py b/addons/project_gtd/wizard/project_gtd_fill.py
index 598615b8090..a04ac47d603 100644
--- a/addons/project_gtd/wizard/project_gtd_fill.py
+++ b/addons/project_gtd/wizard/project_gtd_fill.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/project_mrp/__init__.py b/addons/project_mrp/__init__.py
index 31caabd68c8..dee562a6ed3 100644
--- a/addons/project_mrp/__init__.py
+++ b/addons/project_mrp/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/project_mrp/__terp__.py b/addons/project_mrp/__terp__.py
index 784814414cf..38fe2f71a65 100644
--- a/addons/project_mrp/__terp__.py
+++ b/addons/project_mrp/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/project_mrp/mrp.py b/addons/project_mrp/mrp.py
index 75a04f27872..25fdbaac3a3 100644
--- a/addons/project_mrp/mrp.py
+++ b/addons/project_mrp/mrp.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/project_mrp/project.py b/addons/project_mrp/project.py
index cdb9fc8aa6a..fc468249c8a 100644
--- a/addons/project_mrp/project.py
+++ b/addons/project_mrp/project.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/project_retro_planning/__init__.py b/addons/project_retro_planning/__init__.py
index 343170d49d9..eaa90d66042 100644
--- a/addons/project_retro_planning/__init__.py
+++ b/addons/project_retro_planning/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/project_retro_planning/__terp__.py b/addons/project_retro_planning/__terp__.py
index d3a6bd1d9c1..4686800a8ef 100644
--- a/addons/project_retro_planning/__terp__.py
+++ b/addons/project_retro_planning/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/project_retro_planning/project_retro_planning.py b/addons/project_retro_planning/project_retro_planning.py
index e928cec589c..1662e39b251 100644
--- a/addons/project_retro_planning/project_retro_planning.py
+++ b/addons/project_retro_planning/project_retro_planning.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/project_timesheet/__init__.py b/addons/project_timesheet/__init__.py
index 9a3c1be3101..b89aa70be92 100644
--- a/addons/project_timesheet/__init__.py
+++ b/addons/project_timesheet/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/project_timesheet/__terp__.py b/addons/project_timesheet/__terp__.py
index 36c1b4a3db6..ebb5cccb5f9 100644
--- a/addons/project_timesheet/__terp__.py
+++ b/addons/project_timesheet/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 71c3542c010..31363bea2b5 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/purchase/__init__.py b/addons/purchase/__init__.py
index 94a324ad9e4..2723edcd605 100644
--- a/addons/purchase/__init__.py
+++ b/addons/purchase/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/purchase/__terp__.py b/addons/purchase/__terp__.py
index 88b92b4f853..1b38f9cc8ea 100644
--- a/addons/purchase/__terp__.py
+++ b/addons/purchase/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/purchase/partner.py b/addons/purchase/partner.py
index 0c4dc37517c..85ef7a11f1b 100644
--- a/addons/purchase/partner.py
+++ b/addons/purchase/partner.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 2733d5b9ddb..fc56c95a1a1 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/purchase/report/__init__.py b/addons/purchase/report/__init__.py
index f9cdb88968e..2030200fbe0 100644
--- a/addons/purchase/report/__init__.py
+++ b/addons/purchase/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/purchase/report/order.py b/addons/purchase/report/order.py
index 52aaa1ae865..21d2e10e726 100644
--- a/addons/purchase/report/order.py
+++ b/addons/purchase/report/order.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/purchase/report/request_quotation.py b/addons/purchase/report/request_quotation.py
index 9acf4309264..ba72377ec80 100644
--- a/addons/purchase/report/request_quotation.py
+++ b/addons/purchase/report/request_quotation.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/purchase/wizard/__init__.py b/addons/purchase/wizard/__init__.py
index df04cf432de..8d3f30f862f 100644
--- a/addons/purchase/wizard/__init__.py
+++ b/addons/purchase/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/purchase_analytic_plans/__init__.py b/addons/purchase_analytic_plans/__init__.py
index a2e952ed9d8..bc83e9691e1 100644
--- a/addons/purchase_analytic_plans/__init__.py
+++ b/addons/purchase_analytic_plans/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/purchase_analytic_plans/__terp__.py b/addons/purchase_analytic_plans/__terp__.py
index ddb2063e89e..01d5b5d0e7c 100644
--- a/addons/purchase_analytic_plans/__terp__.py
+++ b/addons/purchase_analytic_plans/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/purchase_analytic_plans/purchase_analytic_plans.py b/addons/purchase_analytic_plans/purchase_analytic_plans.py
index 1860b60a319..aa3e73d53e0 100644
--- a/addons/purchase_analytic_plans/purchase_analytic_plans.py
+++ b/addons/purchase_analytic_plans/purchase_analytic_plans.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_account/__init__.py b/addons/report_account/__init__.py
index acbd29cd953..08bd5bf9bd4 100644
--- a/addons/report_account/__init__.py
+++ b/addons/report_account/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_account/__terp__.py b/addons/report_account/__terp__.py
index af3c7a0726c..48cb590f9d8 100644
--- a/addons/report_account/__terp__.py
+++ b/addons/report_account/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_account/report_receivable.py b/addons/report_account/report_receivable.py
index 005a8458628..af2c7863e92 100644
--- a/addons/report_account/report_receivable.py
+++ b/addons/report_account/report_receivable.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_analytic/__init__.py b/addons/report_analytic/__init__.py
index e3278dfc162..deaad9bc8b1 100644
--- a/addons/report_analytic/__init__.py
+++ b/addons/report_analytic/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_analytic/__terp__.py b/addons/report_analytic/__terp__.py
index 5827f019e3b..882b722e593 100644
--- a/addons/report_analytic/__terp__.py
+++ b/addons/report_analytic/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_analytic/report_analytic.py b/addons/report_analytic/report_analytic.py
index 4ddbf296084..52ea71fbf5f 100644
--- a/addons/report_analytic/report_analytic.py
+++ b/addons/report_analytic/report_analytic.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_analytic_line/__init__.py b/addons/report_analytic_line/__init__.py
index f5bc9615951..b2c0be5cdab 100644
--- a/addons/report_analytic_line/__init__.py
+++ b/addons/report_analytic_line/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_analytic_line/__terp__.py b/addons/report_analytic_line/__terp__.py
index b9c97e2a7d3..eafe4988001 100644
--- a/addons/report_analytic_line/__terp__.py
+++ b/addons/report_analytic_line/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_analytic_line/report_analytic_line.py b/addons/report_analytic_line/report_analytic_line.py
index a30b4981d72..55c3c2a199d 100644
--- a/addons/report_analytic_line/report_analytic_line.py
+++ b/addons/report_analytic_line/report_analytic_line.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_analytic_planning/__init__.py b/addons/report_analytic_planning/__init__.py
index 72ac746ba43..2963b2dfbd5 100644
--- a/addons/report_analytic_planning/__init__.py
+++ b/addons/report_analytic_planning/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_analytic_planning/__terp__.py b/addons/report_analytic_planning/__terp__.py
index 327b47c6b25..312e72b3b5f 100644
--- a/addons/report_analytic_planning/__terp__.py
+++ b/addons/report_analytic_planning/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_analytic_planning/report/__init__.py b/addons/report_analytic_planning/report/__init__.py
index d63502c9ed8..b0f0f5004ae 100644
--- a/addons/report_analytic_planning/report/__init__.py
+++ b/addons/report_analytic_planning/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_crm/__init__.py b/addons/report_crm/__init__.py
index f2265b89509..8ee67fea417 100644
--- a/addons/report_crm/__init__.py
+++ b/addons/report_crm/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_crm/__terp__.py b/addons/report_crm/__terp__.py
index 4023b1c331e..817a5f140d2 100644
--- a/addons/report_crm/__terp__.py
+++ b/addons/report_crm/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_crm/report_crm.py b/addons/report_crm/report_crm.py
index a502400777c..a0af5fba035 100644
--- a/addons/report_crm/report_crm.py
+++ b/addons/report_crm/report_crm.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_document/__init__.py b/addons/report_document/__init__.py
index b5b69f0486d..a553499c351 100644
--- a/addons/report_document/__init__.py
+++ b/addons/report_document/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_document/__terp__.py b/addons/report_document/__terp__.py
index 5b4e7e7d86f..1fd5d9e193b 100644
--- a/addons/report_document/__terp__.py
+++ b/addons/report_document/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_document/report_document.py b/addons/report_document/report_document.py
index 9f8fea2e972..d6baec6a651 100644
--- a/addons/report_document/report_document.py
+++ b/addons/report_document/report_document.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_intrastat/__init__.py b/addons/report_intrastat/__init__.py
index 6d5e6170adf..1513e2d168c 100644
--- a/addons/report_intrastat/__init__.py
+++ b/addons/report_intrastat/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_intrastat/__terp__.py b/addons/report_intrastat/__terp__.py
index aa4f4f33c20..51a335d4cd4 100644
--- a/addons/report_intrastat/__terp__.py
+++ b/addons/report_intrastat/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_intrastat/report/__init__.py b/addons/report_intrastat/report/__init__.py
index e0965056b93..57ae958d70d 100644
--- a/addons/report_intrastat/report/__init__.py
+++ b/addons/report_intrastat/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_intrastat/report/invoice.py b/addons/report_intrastat/report/invoice.py
index 692b33d0095..575a3074562 100644
--- a/addons/report_intrastat/report/invoice.py
+++ b/addons/report_intrastat/report/invoice.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_mrp/__init__.py b/addons/report_mrp/__init__.py
index 4ec27b85ce6..7573f10c72c 100644
--- a/addons/report_mrp/__init__.py
+++ b/addons/report_mrp/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_mrp/__terp__.py b/addons/report_mrp/__terp__.py
index 3b60a05e3cc..4656ae0f7c1 100644
--- a/addons/report_mrp/__terp__.py
+++ b/addons/report_mrp/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_mrp/report_mrp.py b/addons/report_mrp/report_mrp.py
index 25718337d4f..99c7319a731 100644
--- a/addons/report_mrp/report_mrp.py
+++ b/addons/report_mrp/report_mrp.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_project/__init__.py b/addons/report_project/__init__.py
index 71ef70bedca..13d9fbc8abf 100644
--- a/addons/report_project/__init__.py
+++ b/addons/report_project/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_project/__terp__.py b/addons/report_project/__terp__.py
index b0ca49e7724..c53f33b5dd4 100644
--- a/addons/report_project/__terp__.py
+++ b/addons/report_project/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_project/report_project.py b/addons/report_project/report_project.py
index 933af3e5a46..e920b76798f 100644
--- a/addons/report_project/report_project.py
+++ b/addons/report_project/report_project.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_purchase/__init__.py b/addons/report_purchase/__init__.py
index dbe341f4067..749ed3e08bb 100644
--- a/addons/report_purchase/__init__.py
+++ b/addons/report_purchase/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_purchase/__terp__.py b/addons/report_purchase/__terp__.py
index 8a578ab6b2d..dad6e10892c 100644
--- a/addons/report_purchase/__terp__.py
+++ b/addons/report_purchase/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_purchase/report_purchase.py b/addons/report_purchase/report_purchase.py
index cbb388b797d..76adc54d39b 100644
--- a/addons/report_purchase/report_purchase.py
+++ b/addons/report_purchase/report_purchase.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_sale/__init__.py b/addons/report_sale/__init__.py
index da84c670125..2cc6b761adf 100644
--- a/addons/report_sale/__init__.py
+++ b/addons/report_sale/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_sale/__terp__.py b/addons/report_sale/__terp__.py
index dc9c29b71f8..6cf8d84a879 100644
--- a/addons/report_sale/__terp__.py
+++ b/addons/report_sale/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_sale/report_sale.py b/addons/report_sale/report_sale.py
index c437522a3bb..e238ae63559 100644
--- a/addons/report_sale/report_sale.py
+++ b/addons/report_sale/report_sale.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_task/__init__.py b/addons/report_task/__init__.py
index fabd56c564a..af47722a3ea 100644
--- a/addons/report_task/__init__.py
+++ b/addons/report_task/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_task/__terp__.py b/addons/report_task/__terp__.py
index 17ce448e46f..acff9dc7ac0 100644
--- a/addons/report_task/__terp__.py
+++ b/addons/report_task/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_task/report_task.py b/addons/report_task/report_task.py
index 8f10ac4ff07..f8a2df246ef 100644
--- a/addons/report_task/report_task.py
+++ b/addons/report_task/report_task.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_timesheet/__init__.py b/addons/report_timesheet/__init__.py
index 6a77fa0c3aa..20fd4470ebe 100644
--- a/addons/report_timesheet/__init__.py
+++ b/addons/report_timesheet/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_timesheet/__terp__.py b/addons/report_timesheet/__terp__.py
index fc993c31311..97908d47412 100644
--- a/addons/report_timesheet/__terp__.py
+++ b/addons/report_timesheet/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/report_timesheet/report_timesheet.py b/addons/report_timesheet/report_timesheet.py
index 3418dd6a561..61a340af266 100644
--- a/addons/report_timesheet/report_timesheet.py
+++ b/addons/report_timesheet/report_timesheet.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/sale/__init__.py b/addons/sale/__init__.py
index 539ebb2cfe3..8fb6555a4a3 100644
--- a/addons/sale/__init__.py
+++ b/addons/sale/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/sale/__terp__.py b/addons/sale/__terp__.py
index a734342ba1b..facfd96ca87 100644
--- a/addons/sale/__terp__.py
+++ b/addons/sale/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/sale/product.py b/addons/sale/product.py
index 6642e9f1385..20486becd1b 100644
--- a/addons/sale/product.py
+++ b/addons/sale/product.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/sale/report/__init__.py b/addons/sale/report/__init__.py
index f12997224c5..73e088add29 100644
--- a/addons/sale/report/__init__.py
+++ b/addons/sale/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/sale/report/order.py b/addons/sale/report/order.py
index cb239b62f2a..3d37ce4c72f 100644
--- a/addons/sale/report/order.py
+++ b/addons/sale/report/order.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/sale/report/sale_prepare_allot.py b/addons/sale/report/sale_prepare_allot.py
index ef59da50d7d..9680da73027 100644
--- a/addons/sale/report/sale_prepare_allot.py
+++ b/addons/sale/report/sale_prepare_allot.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 56ce895b379..803d080faa5 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index 9e3cd377f03..7181a03b582 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/sale/wizard/__init__.py b/addons/sale/wizard/__init__.py
index cf99eb5f0db..b02487b5d12 100644
--- a/addons/sale/wizard/__init__.py
+++ b/addons/sale/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/sale/wizard/make_invoice.py b/addons/sale/wizard/make_invoice.py
index 0a4a7e305b7..642e2d43f53 100644
--- a/addons/sale/wizard/make_invoice.py
+++ b/addons/sale/wizard/make_invoice.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/sale/wizard/make_invoice_advance.py b/addons/sale/wizard/make_invoice_advance.py
index 576601ba7f8..cacceeeef13 100644
--- a/addons/sale/wizard/make_invoice_advance.py
+++ b/addons/sale/wizard/make_invoice_advance.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/sale/wizard/wizard_sale_line_invoice.py b/addons/sale/wizard/wizard_sale_line_invoice.py
index b75dff690a4..fec94ca1a2d 100644
--- a/addons/sale/wizard/wizard_sale_line_invoice.py
+++ b/addons/sale/wizard/wizard_sale_line_invoice.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/sale_analytic_plans/__init__.py b/addons/sale_analytic_plans/__init__.py
index 04c253a76d4..5a4a6e2a674 100644
--- a/addons/sale_analytic_plans/__init__.py
+++ b/addons/sale_analytic_plans/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/sale_analytic_plans/__terp__.py b/addons/sale_analytic_plans/__terp__.py
index 6e3dcc13120..38d54d9a088 100644
--- a/addons/sale_analytic_plans/__terp__.py
+++ b/addons/sale_analytic_plans/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/sale_analytic_plans/sale_analytic_plans.py b/addons/sale_analytic_plans/sale_analytic_plans.py
index f524d26222e..9a655dc3dc6 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans.py
+++ b/addons/sale_analytic_plans/sale_analytic_plans.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/sale_crm/__init__.py b/addons/sale_crm/__init__.py
index 52fc31ffe6c..16dbe8ee834 100644
--- a/addons/sale_crm/__init__.py
+++ b/addons/sale_crm/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/sale_crm/__terp__.py b/addons/sale_crm/__terp__.py
index 737ceb18593..4b6fd0ea593 100644
--- a/addons/sale_crm/__terp__.py
+++ b/addons/sale_crm/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/sale_crm/wizard/__init__.py b/addons/sale_crm/wizard/__init__.py
index 7c43908361f..e4791fe276e 100644
--- a/addons/sale_crm/wizard/__init__.py
+++ b/addons/sale_crm/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/sale_crm/wizard/makecase.py b/addons/sale_crm/wizard/makecase.py
index 9325a3963cf..6ddafd95088 100644
--- a/addons/sale_crm/wizard/makecase.py
+++ b/addons/sale_crm/wizard/makecase.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/sale_crm/wizard/makesale.py b/addons/sale_crm/wizard/makesale.py
index 4a6f8daf4d2..f047b66cb03 100644
--- a/addons/sale_crm/wizard/makesale.py
+++ b/addons/sale_crm/wizard/makesale.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/sale_delivery_report/__init__.py b/addons/sale_delivery_report/__init__.py
index d7e6ee5977b..c450e781039 100644
--- a/addons/sale_delivery_report/__init__.py
+++ b/addons/sale_delivery_report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/sale_delivery_report/__terp__.py b/addons/sale_delivery_report/__terp__.py
index 63feb917531..63473aeb62d 100644
--- a/addons/sale_delivery_report/__terp__.py
+++ b/addons/sale_delivery_report/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/sale_delivery_report/report/__init__.py b/addons/sale_delivery_report/report/__init__.py
index 458426b866d..1eeba64b179 100644
--- a/addons/sale_delivery_report/report/__init__.py
+++ b/addons/sale_delivery_report/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/sale_delivery_report/report/shipping.py b/addons/sale_delivery_report/report/shipping.py
index 63aeba6c10c..cec411ac12f 100644
--- a/addons/sale_delivery_report/report/shipping.py
+++ b/addons/sale_delivery_report/report/shipping.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/sale_journal/__init__.py b/addons/sale_journal/__init__.py
index 86d7edba518..711a2ff6aff 100644
--- a/addons/sale_journal/__init__.py
+++ b/addons/sale_journal/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/sale_journal/__terp__.py b/addons/sale_journal/__terp__.py
index 9f65ca73bc2..2e77410a219 100644
--- a/addons/sale_journal/__terp__.py
+++ b/addons/sale_journal/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py
index adc153f9d2e..32e73980194 100644
--- a/addons/sale_journal/sale_journal.py
+++ b/addons/sale_journal/sale_journal.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/sale_journal/sale_journal_inherit.py b/addons/sale_journal/sale_journal_inherit.py
index fa145b80db4..101934ecc8f 100644
--- a/addons/sale_journal/sale_journal_inherit.py
+++ b/addons/sale_journal/sale_journal_inherit.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/sale_journal/sale_journal_picking_report.py b/addons/sale_journal/sale_journal_picking_report.py
index a19edc2d442..05dbdf6ae83 100644
--- a/addons/sale_journal/sale_journal_picking_report.py
+++ b/addons/sale_journal/sale_journal_picking_report.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/sale_journal/sale_journal_report.py b/addons/sale_journal/sale_journal_report.py
index 568ea1ea19a..5c30b2b8ca7 100644
--- a/addons/sale_journal/sale_journal_report.py
+++ b/addons/sale_journal/sale_journal_report.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/scrum/__init__.py b/addons/scrum/__init__.py
index 4a60bbf3e79..b1beac1b56f 100644
--- a/addons/scrum/__init__.py
+++ b/addons/scrum/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/scrum/__terp__.py b/addons/scrum/__terp__.py
index c66d5da2315..afb8b0e12ee 100644
--- a/addons/scrum/__terp__.py
+++ b/addons/scrum/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/scrum/report/__init__.py b/addons/scrum/report/__init__.py
index e67737d9d0a..98d0aed1645 100644
--- a/addons/scrum/report/__init__.py
+++ b/addons/scrum/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/scrum/report/_burndown.py b/addons/scrum/report/_burndown.py
index eed7bba82df..07770f384e6 100644
--- a/addons/scrum/report/_burndown.py
+++ b/addons/scrum/report/_burndown.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/scrum/report/sprint_burndown.py b/addons/scrum/report/sprint_burndown.py
index 331071125f1..4f84337936c 100644
--- a/addons/scrum/report/sprint_burndown.py
+++ b/addons/scrum/report/sprint_burndown.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/scrum/report/task_burndown.py b/addons/scrum/report/task_burndown.py
index 9ac3f4ae76d..3eb29f23367 100644
--- a/addons/scrum/report/task_burndown.py
+++ b/addons/scrum/report/task_burndown.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/scrum/scrum.py b/addons/scrum/scrum.py
index fdda78ed65f..bfd5c7855cf 100644
--- a/addons/scrum/scrum.py
+++ b/addons/scrum/scrum.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/scrum/wizard/__init__.py b/addons/scrum/wizard/__init__.py
index 5703d5a87f0..0248e7e99e3 100644
--- a/addons/scrum/wizard/__init__.py
+++ b/addons/scrum/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/scrum/wizard/backlog_to_task.py b/addons/scrum/wizard/backlog_to_task.py
index e1cc25fc428..0d8ddfca088 100644
--- a/addons/scrum/wizard/backlog_to_task.py
+++ b/addons/scrum/wizard/backlog_to_task.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock/__init__.py b/addons/stock/__init__.py
index 3c3c1712c5b..a46fbc67f87 100644
--- a/addons/stock/__init__.py
+++ b/addons/stock/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock/__terp__.py b/addons/stock/__terp__.py
index 8fadaa1f360..0e5f4814dd2 100644
--- a/addons/stock/__terp__.py
+++ b/addons/stock/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock/partner.py b/addons/stock/partner.py
index c3b2ca45423..1c456f39acd 100644
--- a/addons/stock/partner.py
+++ b/addons/stock/partner.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock/report/__init__.py b/addons/stock/report/__init__.py
index f69fc033c45..fbddd1dcd54 100644
--- a/addons/stock/report/__init__.py
+++ b/addons/stock/report/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock/report/picking.py b/addons/stock/report/picking.py
index 5a0746b80e8..8a4d065d2b6 100644
--- a/addons/stock/report/picking.py
+++ b/addons/stock/report/picking.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock/report/product_stock.py b/addons/stock/report/product_stock.py
index 3f1b65b21fb..79f23ed9b34 100644
--- a/addons/stock/report/product_stock.py
+++ b/addons/stock/report/product_stock.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock/report/stock_by_location.py b/addons/stock/report/stock_by_location.py
index 0230833a249..c6cfd1a30bf 100644
--- a/addons/stock/report/stock_by_location.py
+++ b/addons/stock/report/stock_by_location.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock/report/stock_graph.py b/addons/stock/report/stock_graph.py
index 8a71be7ce92..e33d65ffc2a 100644
--- a/addons/stock/report/stock_graph.py
+++ b/addons/stock/report/stock_graph.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock/report/ups.py b/addons/stock/report/ups.py
index b774a958a33..e72924b18dd 100644
--- a/addons/stock/report/ups.py
+++ b/addons/stock/report/ups.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock/report_stock.py b/addons/stock/report_stock.py
index 0bd44db1171..5a9824c2b86 100644
--- a/addons/stock/report_stock.py
+++ b/addons/stock/report_stock.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index a2443256d78..d0a4cbb9763 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index 10ca9c6c7e1..6aca26cd2ec 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock/wizard/inventory_merge.py b/addons/stock/wizard/inventory_merge.py
index 5bc5587a8b0..d17c9a6433d 100644
--- a/addons/stock/wizard/inventory_merge.py
+++ b/addons/stock/wizard/inventory_merge.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock/wizard/inventory_merge_zero.py b/addons/stock/wizard/inventory_merge_zero.py
index e5b5bed0112..5af5f593ea4 100644
--- a/addons/stock/wizard/inventory_merge_zero.py
+++ b/addons/stock/wizard/inventory_merge_zero.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock/wizard/stock_traceability.py b/addons/stock/wizard/stock_traceability.py
index a9529a8b327..32463c449d6 100644
--- a/addons/stock/wizard/stock_traceability.py
+++ b/addons/stock/wizard/stock_traceability.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock/wizard/wizard_inventory.py b/addons/stock/wizard/wizard_inventory.py
index e38dcaade52..6ffb8ab569c 100644
--- a/addons/stock/wizard/wizard_inventory.py
+++ b/addons/stock/wizard/wizard_inventory.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock/wizard/wizard_location_product.py b/addons/stock/wizard/wizard_location_product.py
index 7380cf9b901..58722ad1e1a 100755
--- a/addons/stock/wizard/wizard_location_product.py
+++ b/addons/stock/wizard/wizard_location_product.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock/wizard/wizard_partial_picking.py b/addons/stock/wizard/wizard_partial_picking.py
index 2fe375c1b4f..3af56229c41 100644
--- a/addons/stock/wizard/wizard_partial_picking.py
+++ b/addons/stock/wizard/wizard_partial_picking.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock/wizard/wizard_picking_make.py b/addons/stock/wizard/wizard_picking_make.py
index 83a5f17078a..537d3fa9ec1 100644
--- a/addons/stock/wizard/wizard_picking_make.py
+++ b/addons/stock/wizard/wizard_picking_make.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock/wizard/wizard_replacement.py b/addons/stock/wizard/wizard_replacement.py
index 4685f6dc622..3e947e6819c 100644
--- a/addons/stock/wizard/wizard_replacement.py
+++ b/addons/stock/wizard/wizard_replacement.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock/wizard/wizard_return.py b/addons/stock/wizard/wizard_return.py
index 38c58eb03cc..52b85ecc3fd 100644
--- a/addons/stock/wizard/wizard_return.py
+++ b/addons/stock/wizard/wizard_return.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock/wizard/wizard_split_lot_line.py b/addons/stock/wizard/wizard_split_lot_line.py
index 25d3700211a..edcb78eff3e 100644
--- a/addons/stock/wizard/wizard_split_lot_line.py
+++ b/addons/stock/wizard/wizard_split_lot_line.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock/wizard/wizard_track_line.py b/addons/stock/wizard/wizard_track_line.py
index 79c105b962b..41aabbb7dce 100644
--- a/addons/stock/wizard/wizard_track_line.py
+++ b/addons/stock/wizard/wizard_track_line.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock/wizard/wizard_ups.py b/addons/stock/wizard/wizard_ups.py
index 1249efc110c..2a332b37ed9 100644
--- a/addons/stock/wizard/wizard_ups.py
+++ b/addons/stock/wizard/wizard_ups.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock_invoice_directly/__init__.py b/addons/stock_invoice_directly/__init__.py
index 52fc31ffe6c..16dbe8ee834 100644
--- a/addons/stock_invoice_directly/__init__.py
+++ b/addons/stock_invoice_directly/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock_invoice_directly/__terp__.py b/addons/stock_invoice_directly/__terp__.py
index 1f76f651c01..3a0308f1241 100644
--- a/addons/stock_invoice_directly/__terp__.py
+++ b/addons/stock_invoice_directly/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock_invoice_directly/wizard/__init__.py b/addons/stock_invoice_directly/wizard/__init__.py
index 1c763faf5cf..201ae73c6e6 100644
--- a/addons/stock_invoice_directly/wizard/__init__.py
+++ b/addons/stock_invoice_directly/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock_invoice_directly/wizard/stock_invoice.py b/addons/stock_invoice_directly/wizard/stock_invoice.py
index 4c3d59de2b3..119bdcd70eb 100644
--- a/addons/stock_invoice_directly/wizard/stock_invoice.py
+++ b/addons/stock_invoice_directly/wizard/stock_invoice.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock_location/__init__.py b/addons/stock_location/__init__.py
index bbb46d38ccf..9bbac02b391 100644
--- a/addons/stock_location/__init__.py
+++ b/addons/stock_location/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock_location/__terp__.py b/addons/stock_location/__terp__.py
index 2d7fbba4e55..44048ba2b86 100644
--- a/addons/stock_location/__terp__.py
+++ b/addons/stock_location/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock_location/stock.py b/addons/stock_location/stock.py
index 40ff92f321c..1062023c6ad 100644
--- a/addons/stock_location/stock.py
+++ b/addons/stock_location/stock.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock_no_autopicking/__init__.py b/addons/stock_no_autopicking/__init__.py
index 8b89d2e2d1c..42fcaf6662e 100644
--- a/addons/stock_no_autopicking/__init__.py
+++ b/addons/stock_no_autopicking/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock_no_autopicking/__terp__.py b/addons/stock_no_autopicking/__terp__.py
index c6661258f1b..3e646447496 100644
--- a/addons/stock_no_autopicking/__terp__.py
+++ b/addons/stock_no_autopicking/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/stock_no_autopicking/stock_no_autopicking.py b/addons/stock_no_autopicking/stock_no_autopicking.py
index cbe85a5a7c8..e050bbeef58 100644
--- a/addons/stock_no_autopicking/stock_no_autopicking.py
+++ b/addons/stock_no_autopicking/stock_no_autopicking.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/subscription/__init__.py b/addons/subscription/__init__.py
index 4c127be4922..0a98bc48ce8 100644
--- a/addons/subscription/__init__.py
+++ b/addons/subscription/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/subscription/__terp__.py b/addons/subscription/__terp__.py
index 4e2ec06fe45..52297e00432 100644
--- a/addons/subscription/__terp__.py
+++ b/addons/subscription/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/subscription/subscription.py b/addons/subscription/subscription.py
index 7c4c80f03be..7ead51f74ae 100644
--- a/addons/subscription/subscription.py
+++ b/addons/subscription/subscription.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/warning/__init__.py b/addons/warning/__init__.py
index 781ebbcf946..0bdf7591d13 100644
--- a/addons/warning/__init__.py
+++ b/addons/warning/__init__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/warning/__terp__.py b/addons/warning/__terp__.py
index 342ddfd21c2..a4fead77f9e 100644
--- a/addons/warning/__terp__.py
+++ b/addons/warning/__terp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/warning/warning.py b/addons/warning/warning.py
index c5ee7106851..ee56d7ebb85 100644
--- a/addons/warning/warning.py
+++ b/addons/warning/warning.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index fe355a088e9..9e281a84fcd 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# Copyright (c) 2004-2006 TINY SPRL. (http://axelor.com) All Rights Reserved.
diff --git a/addons/wiki/wizard/create_menu.py b/addons/wiki/wizard/create_menu.py
index 68bb6b3defe..c8d1efbb705 100644
--- a/addons/wiki/wizard/create_menu.py
+++ b/addons/wiki/wizard/create_menu.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/wiki/wizard/make_index.py b/addons/wiki/wizard/make_index.py
index da91b7f7ca7..ba67962ef6e 100644
--- a/addons/wiki/wizard/make_index.py
+++ b/addons/wiki/wizard/make_index.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/wiki/wizard/open_page.py b/addons/wiki/wizard/open_page.py
index 892ce3f8758..f76c378e5c0 100644
--- a/addons/wiki/wizard/open_page.py
+++ b/addons/wiki/wizard/open_page.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
diff --git a/addons/wiki/wizard/show_diff.py b/addons/wiki/wizard/show_diff.py
index c5653b8541a..74e458880dd 100644
--- a/addons/wiki/wizard/show_diff.py
+++ b/addons/wiki/wizard/show_diff.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution