diff --git a/account_credit_control_dunning_fees/README.rst b/account_credit_control_dunning_fees/README.rst
index ae9171b00..08099c1e4 100644
--- a/account_credit_control_dunning_fees/README.rst
+++ b/account_credit_control_dunning_fees/README.rst
@@ -1,5 +1,5 @@
 .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
-   :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+   :target: http://www.gnu.org/licenses/agpl
    :alt: License: AGPL-3
 
 ===========================
@@ -27,10 +27,6 @@ the credit control line currency.
 
 The product is used to compute taxes in reconciliation process.
 
-.. figure:: path/to/local/image.png
-   :alt: alternative description
-   :width: 600 px
-
 Usage
 =====
 
@@ -44,7 +40,7 @@ Support of fees price list
 
 .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
    :alt: Try me on Runbot
-   :target: https://runbot.odoo-community.org/runbot/92/10.0
+   :target: https://runbot.odoo-community.org/runbot/92/11.0
 
 Bug Tracker
 ===========
diff --git a/account_credit_control_dunning_fees/__manifest__.py b/account_credit_control_dunning_fees/__manifest__.py
index cf1c289ba..cd90c57e9 100644
--- a/account_credit_control_dunning_fees/__manifest__.py
+++ b/account_credit_control_dunning_fees/__manifest__.py
@@ -1,12 +1,13 @@
-# -*- coding: utf-8 -*-
+# Copyright 2014-2017 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {'name': 'Credit control dunning fees',
- 'version': '10.0.1.0.0',
+ 'version': '11.0.1.0.0',
  'author': "Camptocamp, Odoo Community Association (OCA)",
  'maintainer': 'Camptocamp',
  'category': 'Accounting',
  'complexity': 'normal',
  'depends': ['account_credit_control'],
- 'website': 'http://www.camptocamp.com',
+ 'website': 'https://github.com/OCA/account-financial-tools',
  'data': ['view/policy_view.xml',
           'view/line_view.xml',
           'report/report_credit_control_summary.xml',
diff --git a/account_credit_control_dunning_fees/model/dunning.py b/account_credit_control_dunning_fees/model/dunning.py
index 02edbc632..880a19174 100644
--- a/account_credit_control_dunning_fees/model/dunning.py
+++ b/account_credit_control_dunning_fees/model/dunning.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2014-2017 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 from odoo import models, api
diff --git a/account_credit_control_dunning_fees/model/line.py b/account_credit_control_dunning_fees/model/line.py
index aa2a0f52c..7b88f0c50 100644
--- a/account_credit_control_dunning_fees/model/line.py
+++ b/account_credit_control_dunning_fees/model/line.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2014-2017 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 from odoo import models, fields, api
diff --git a/account_credit_control_dunning_fees/model/policy.py b/account_credit_control_dunning_fees/model/policy.py
index 03bf64fb0..faed67df6 100644
--- a/account_credit_control_dunning_fees/model/policy.py
+++ b/account_credit_control_dunning_fees/model/policy.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2014-2017 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 from odoo import models, fields
diff --git a/account_credit_control_dunning_fees/model/run.py b/account_credit_control_dunning_fees/model/run.py
index 28ea3c23a..4366ac2c5 100644
--- a/account_credit_control_dunning_fees/model/run.py
+++ b/account_credit_control_dunning_fees/model/run.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2014-2017 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 from odoo import models, api
diff --git a/account_credit_control_dunning_fees/report/report_credit_control_summary.xml b/account_credit_control_dunning_fees/report/report_credit_control_summary.xml
index e4b99b39b..ab48b9baa 100644
--- a/account_credit_control_dunning_fees/report/report_credit_control_summary.xml
+++ b/account_credit_control_dunning_fees/report/report_credit_control_summary.xml
@@ -12,7 +12,7 @@
     </xpath>
     <xpath expr="//span[@t-field='l.balance_due']" position="replace">
       <span t-field="l.balance_due_total"
-        t-field-options='{"widget": "monetary",
+        t-options='{"widget": "monetary",
         "display_currency": "l.currency_id or l.company_id.currency_id"}'/>
     </xpath>
   </template>
diff --git a/account_credit_control_dunning_fees/tests/test_fees_generation.py b/account_credit_control_dunning_fees/tests/test_fees_generation.py
index 0a608c63d..9ab4b4f16 100644
--- a/account_credit_control_dunning_fees/tests/test_fees_generation.py
+++ b/account_credit_control_dunning_fees/tests/test_fees_generation.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2014-2017 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 from odoo.tests import common
diff --git a/account_credit_control_dunning_fees/view/policy_view.xml b/account_credit_control_dunning_fees/view/policy_view.xml
index 5c52ec569..95b1f5c9e 100644
--- a/account_credit_control_dunning_fees/view/policy_view.xml
+++ b/account_credit_control_dunning_fees/view/policy_view.xml
@@ -7,12 +7,10 @@
     <field name="arch" type="xml">
       <xpath expr="//notebook//notebook/page[//field[@name='email_template_id']]" position="after">
         <page string="Fees">
-          <group>
-            <group>
-              <field name="dunning_fixed_amount"/>
-              <field name="dunning_product_id"/>
-              <field name="dunning_currency_id"/>
-            </group>
+          <group name="fees">
+            <field name="dunning_fixed_amount"/>
+            <field name="dunning_product_id"/>
+            <field name="dunning_currency_id"/>
           </group>
         </page>
       </xpath>
diff --git a/account_credit_control_dunning_fees/wizard/credit_control_communication.py b/account_credit_control_dunning_fees/wizard/credit_control_communication.py
index ba1285688..fd8410510 100644
--- a/account_credit_control_dunning_fees/wizard/credit_control_communication.py
+++ b/account_credit_control_dunning_fees/wizard/credit_control_communication.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2014-2017 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 from odoo import models, api