diff --git a/account_credit_control_usability/__openerp__.py b/account_credit_control_usability/__openerp__.py
index 6b1d23d..84b7ca7 100644
--- a/account_credit_control_usability/__openerp__.py
+++ b/account_credit_control_usability/__openerp__.py
@@ -40,7 +40,7 @@ This module has been written by Alexis de Lattre from Akretion <alexis.delattre@
     """,
     'author': 'Akretion',
     'website': 'http://www.akretion.com',
-    'depends': ['account_credit_control'],
+    'depends': ['account_credit_control', 'partner_aged_open_invoices'],
     'data': ['account_credit_control_view.xml'],
     'installable': True,
 }
diff --git a/account_credit_control_usability/account_credit_control.py b/account_credit_control_usability/account_credit_control.py
index 27fc9a0..7d1c74f 100644
--- a/account_credit_control_usability/account_credit_control.py
+++ b/account_credit_control_usability/account_credit_control.py
@@ -20,14 +20,14 @@
 #
 ##############################################################################
 
-from openerp import models, fields
+from openerp import models, fields, api
 
 
 class CreditControlPolicyLevel(models.Model):
     _inherit = "credit.control.policy.level"
     _rec_name = 'internal_name'
 
-    channel = fields.Selection(selection_add=[('phone', 'Phone call')])
+    channel = fields.Selection(selection_add=[('phone', 'Phone Call')])
     name = fields.Char(
         string='Subject',
         help="Will be displayed in the subject of the emails and in "
@@ -38,4 +38,31 @@ class CreditControlPolicyLevel(models.Model):
 class CreditControlLine(models.Model):
     _inherit = "credit.control.line"
 
-    channel = fields.Selection(selection_add=[('phone', 'Phone call')])
+    channel = fields.Selection(selection_add=[('phone', 'Phone Call')])
+
+    @api.multi
+    def open_aged_open_invoices_report(self):
+        self.ensure_one()
+        return self.partner_id.open_aged_open_invoices_report()
+
+
+class CreditControlRun(models.Model):
+    _inherit = "credit.control.run"
+
+    date = fields.Date(default=fields.Date.context_today)
+
+
+class ResPartner(models.Model):
+    _inherit = 'res.partner'
+
+    @api.one
+    @api.depends('credit_control_line_ids')
+    def _credit_control_line_count(self):
+        try:
+            self.credit_control_line_count = len(self.credit_control_line_ids)
+        except:
+            self.credit_control_line_count = 0
+
+    credit_control_line_count = fields.Integer(
+        compute='_credit_control_line_count',
+        string="# of Credit Control Lines", readonly=True)
diff --git a/account_credit_control_usability/account_credit_control_view.xml b/account_credit_control_usability/account_credit_control_view.xml
index 2bf4a5f..8311046 100644
--- a/account_credit_control_usability/account_credit_control_view.xml
+++ b/account_credit_control_usability/account_credit_control_view.xml
@@ -13,6 +13,13 @@
         <field name="move_line_id" position="attributes">
             <attribute name="invisible">1</attribute>
         </field>
+        <field name="mail_message_id" position="attributes">
+            <attribute name="invisible">1</attribute>
+        </field>
+        <field name="partner_id" position="after">
+            <button name="open_aged_open_invoices_report" type="object"
+                string="Open Aged Open Invoices Report" icon="STOCK_ZOOM_IN"/>
+        </field>
     </field>
 </record>
 
@@ -56,5 +63,50 @@
     </field>
 </record>
 
+<record id="credit_control_line_search" model="ir.ui.view">
+    <field name="name">credit_control_usability.credit_control_line_search</field>
+    <field name="model">credit.control.line</field>
+    <field name="inherit_id" ref="account_credit_control.credit_control_line_search"/>
+    <field name="arch" type="xml">
+        <filter name="filter_manual" position="after">
+            <filter name="phone" string="Phone Call" domain="[('channel', '=', 'phone')]"/>
+            <filter name="letter" string="Letter" domain="[('channel', '=', 'letter')]"/>
+            <filter name="email" string="Email" domain="[('channel', '=', 'email')]"/>
+        </filter>
+    </field>
+</record>
+
+
+<record id="partner_credit_control_line_action" model="ir.actions.act_window">
+    <field name="name">Credit Control Lines</field>
+    <field name="res_model">credit.control.line</field>
+    <field name="view_mode">tree,form</field>
+    <field name="context">{'search_default_partner_id': active_id}</field>
+</record>
+
+<record id="view_partner_form" model="ir.ui.view">
+    <field name="name">account_credit_control_usability.button.res.partner.form</field>
+    <field name="model">res.partner</field>
+    <field name="inherit_id" ref="base.view_partner_form" />
+    <field name="arch" type="xml">
+        <xpath expr="//div[@name='buttons']" position="inside">
+            <button class="oe_inline oe_stat_button" type="action"
+                name="%(partner_credit_control_line_action)d"
+                attrs="{'invisible': [('customer', '=', False)]}"
+                icon="fa-gavel">
+                <field string="Credit Control"
+                    name="credit_control_line_count" widget="statinfo"/>
+            </button>
+        </xpath>
+    </field>
+</record>
+
+<!-- rapport -->
+<template id="report_credit_control_summary_document" inherit_id="account_credit_control.report_credit_control_summary_document">
+    <xpath expr="//span[@t-field='l.amount_due']" position="attributes">
+        <attribute name="t-field-options">{"widget": "monetary", "display_currency": "l.currency_id or l.company_id.currency_id"}</attribute>
+    </xpath>
+</template>
+
 </data>
 </openerp>