diff --git a/contract/__init__.py b/contract/__init__.py
index a0fdc10f..0650744f 100644
--- a/contract/__init__.py
+++ b/contract/__init__.py
@@ -1,2 +1 @@
-# -*- coding: utf-8 -*-
 from . import models
diff --git a/contract/__manifest__.py b/contract/__manifest__.py
index b7e57492..38913746 100644
--- a/contract/__manifest__.py
+++ b/contract/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2004-2010 OpenERP SA
 # Copyright 2014-2017 Tecnativa - Pedro M. Baeza
 # Copyright 2015 Domatix
@@ -9,7 +8,7 @@
 
 {
     'name': 'Contracts Management - Recurring',
-    'version': '10.0.3.1.0',
+    'version': '11.0.1.0.0',
     'category': 'Contract Management',
     'license': 'AGPL-3',
     'author': "OpenERP SA, "
diff --git a/contract/data/contract_cron.xml b/contract/data/contract_cron.xml
index 7c3a1fef..f1c7add6 100644
--- a/contract/data/contract_cron.xml
+++ b/contract/data/contract_cron.xml
@@ -3,12 +3,14 @@
 
     <record model="ir.cron" id="account_analytic_cron_for_invoice">
         <field name="name">Generate Recurring Invoices from Contracts</field>
+        <field name="model_id" ref="analytic.model_account_analytic_account"/>
+        <field name="state">code</field>
+        <field name="code">model.cron_recurring_create_invoice()</field>
+        <field name="user_id" ref="base.user_root" />
         <field name="interval_number">1</field>
         <field name="interval_type">days</field>
         <field name="numbercall">-1</field>
-        <field name="model" eval="'account.analytic.account'"/>
-        <field name="function" eval="'cron_recurring_create_invoice'"/>
-        <field name="args" eval="'()'"/>
+        <field eval="False" name="doall" />
     </record>
 
 </odoo>
diff --git a/contract/models/__init__.py b/contract/models/__init__.py
index 3a3ee1be..3b709b38 100644
--- a/contract/models/__init__.py
+++ b/contract/models/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import account_analytic_contract
diff --git a/contract/models/account_analytic_account.py b/contract/models/account_analytic_account.py
index 89afa911..de6464c6 100644
--- a/contract/models/account_analytic_account.py
+++ b/contract/models/account_analytic_account.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2004-2010 OpenERP SA
 # Copyright 2014 Angel Moya <angel.moya@domatix.com>
 # Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
@@ -64,7 +63,7 @@ class AccountAnalyticAccount(models.Model):
 
         contract = self.contract_template_id
 
-        for field_name, field in contract._fields.iteritems():
+        for field_name, field in contract._fields.items():
 
             if field.name == 'recurring_invoice_line_ids':
                 lines = self._convert_contract_lines(contract)
diff --git a/contract/models/account_analytic_contract.py b/contract/models/account_analytic_contract.py
index 5749f650..acd69893 100644
--- a/contract/models/account_analytic_contract.py
+++ b/contract/models/account_analytic_contract.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # © 2004-2010 OpenERP SA
 # © 2014 Angel Moya <angel.moya@domatix.com>
 # © 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
diff --git a/contract/models/account_analytic_contract_line.py b/contract/models/account_analytic_contract_line.py
index b2222c9b..a18d5dbd 100644
--- a/contract/models/account_analytic_contract_line.py
+++ b/contract/models/account_analytic_contract_line.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
@@ -6,7 +5,6 @@ from odoo import fields, models
 
 
 class AccountAnalyticContractLine(models.Model):
-
     _name = 'account.analytic.contract.line'
     _description = 'Contract Lines'
     _inherit = 'account.analytic.invoice.line'
diff --git a/contract/models/account_analytic_invoice_line.py b/contract/models/account_analytic_invoice_line.py
index 12a61c65..7dd96f71 100644
--- a/contract/models/account_analytic_invoice_line.py
+++ b/contract/models/account_analytic_invoice_line.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # © 2004-2010 OpenERP SA
 # © 2014 Angel Moya <angel.moya@domatix.com>
 # © 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
diff --git a/contract/models/account_invoice.py b/contract/models/account_invoice.py
index f93c1127..b5ab13ee 100644
--- a/contract/models/account_invoice.py
+++ b/contract/models/account_invoice.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # © 2016 Carlos Dauden <carlos.dauden@tecnativa.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
diff --git a/contract/models/res_partner.py b/contract/models/res_partner.py
index 30723d2a..cd9c30ce 100644
--- a/contract/models/res_partner.py
+++ b/contract/models/res_partner.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2017 Carlos Dauden <carlos.dauden@tecnativa.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
diff --git a/contract/tests/__init__.py b/contract/tests/__init__.py
index 2002a1d8..a2982fdc 100644
--- a/contract/tests/__init__.py
+++ b/contract/tests/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # © 2016 Carlos Dauden <carlos.dauden@tecnativa.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
diff --git a/contract/tests/test_contract.py b/contract/tests/test_contract.py
index b1ad529c..0746c0e9 100644
--- a/contract/tests/test_contract.py
+++ b/contract/tests/test_contract.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2016 Tecnativa - Carlos Dauden
 # Copyright 2017 Tecnativa - Pedro M. Baeza
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).