diff --git a/__init__.py b/__init__.py
index 0b4e6714a3..c6d25622a3 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton.  The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
 
 from trytond.pool import Pool
 from .sale import *
diff --git a/configuration.py b/configuration.py
index 905b65a073..c301a03621 100644
--- a/configuration.py
+++ b/configuration.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton.  The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
 from trytond.model import ModelView, ModelSQL, ModelSingleton, fields
 from trytond.pyson import Eval, Bool
 
diff --git a/invoice.py b/invoice.py
index bfd5937f8f..39578ce4ac 100644
--- a/invoice.py
+++ b/invoice.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton.  The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
 from functools import wraps
 from sql import Table
 
diff --git a/product.py b/product.py
index 1ccae6569c..76c8816cd3 100644
--- a/product.py
+++ b/product.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton.  The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
 import datetime
 
 from trytond.model import fields
diff --git a/sale.py b/sale.py
index 48601291a1..12e2a0c6b5 100644
--- a/sale.py
+++ b/sale.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton.  The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
 from decimal import Decimal
 from itertools import groupby, chain
 from functools import partial
@@ -92,8 +92,8 @@ class Sale(Workflow, ModelSQL, ModelView):
         depends=['state'])
     currency = fields.Many2One('currency.currency', 'Currency', required=True,
         states={
-            'readonly': (Eval('state') != 'draft') |
-                (Eval('lines', [0]) & Eval('currency', 0)),
+            'readonly': ((Eval('state') != 'draft')
+                | (Eval('lines', [0]) & Eval('currency', 0))),
             },
         depends=['state'])
     currency_digits = fields.Function(fields.Integer('Currency Digits'),
@@ -1592,7 +1592,7 @@ class HandleInvoiceExceptionAsk(ModelView):
         domain=[('id', 'in', Eval('domain_invoices'))],
         depends=['domain_invoices'],
         help='The selected invoices will be recreated. '
-            'The other ones will be ignored.')
+        'The other ones will be ignored.')
     domain_invoices = fields.Many2Many(
         'account.invoice', None, None, 'Domain Invoices')
 
diff --git a/setup.py b/setup.py
index 96bae39425..1ba287ea6c 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
-#This file is part of Tryton.  The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
 
 from setuptools import setup
 import re
diff --git a/stock.py b/stock.py
index 3bfa00d126..bc291ea55d 100644
--- a/stock.py
+++ b/stock.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton.  The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
 from sql import Null
 from sql.operators import Concat
 
@@ -19,9 +19,9 @@ class ShipmentOut:
     def __setup__(cls):
         super(ShipmentOut, cls).__setup__()
         cls._error_messages.update({
-                'reset_move': 'You cannot reset to draft a move generated '
-                    'by a sale.',
-            })
+                'reset_move': ('You cannot reset to draft a move generated '
+                    'by a sale.'),
+                })
 
     @classmethod
     def write(cls, *args):
@@ -69,9 +69,9 @@ class ShipmentOutReturn:
     def __setup__(cls):
         super(ShipmentOutReturn, cls).__setup__()
         cls._error_messages.update({
-                'reset_move': 'You cannot reset to draft a move generated '
-                    'by a sale.',
-            })
+                'reset_move': ('You cannot reset to draft a move generated '
+                    'by a sale.'),
+                })
 
     @classmethod
     def write(cls, *args):
diff --git a/tests/__init__.py b/tests/__init__.py
index 479d61c26c..daf50d7fd6 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton.  The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
 
 from .test_sale import suite
 
diff --git a/tests/test_sale.py b/tests/test_sale.py
index 87fd72fd4c..a7c28c751d 100644
--- a/tests/test_sale.py
+++ b/tests/test_sale.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton.  The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
 import unittest
 import doctest
 import trytond.tests.test_tryton