From 9f9a4303ae633bbab4cbf39fb8c762b6f443d19a Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Wed, 2 Apr 2014 13:27:36 +0200
Subject: [PATCH 01/57] [FIX] unifing wizard views to respect UI guide lines

---
 .../wizard/credit_control_emailer_view.xml    | 23 +++++++++----
 .../wizard/credit_control_marker_view.xml     | 32 ++++++++++++++-----
 .../wizard/credit_control_printer_view.xml    | 14 +++++---
 3 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/account_credit_control/wizard/credit_control_emailer_view.xml b/account_credit_control/wizard/credit_control_emailer_view.xml
index ac0e5eb8c..3d8ea9574 100644
--- a/account_credit_control/wizard/credit_control_emailer_view.xml
+++ b/account_credit_control/wizard/credit_control_emailer_view.xml
@@ -6,15 +6,26 @@
       <field name="model">credit.control.emailer</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="Mailer">
+        <form string="Mailer" version="7.0">
           <separator string="Send emails for the selected lines" colspan="4"/>
           <newline/>
-          <field name="line_ids" colspan="4" nolabel="1" />
+          <notebook>
+            <page string="Lines">
+              <field name="line_ids" colspan="4" nolabel="1" />
+            </page>
+          </notebook>
           <newline/>
-          <group colspan="4">
-            <button special="cancel" string="Cancel" icon='gtk-cancel'/>
-            <button name="email_lines" string="Send the emails" type="object" icon="gtk-execute"/>
-          </group>
+          <footer>
+            <button class="oe_highlight"
+                    name="email_lines"
+                    string="Send the emails"
+                    type="object"/>
+            or
+            <button
+                class="oe_link"
+                special="cancel"
+                string="Cancel"/>
+          </footer>
         </form>
       </field>
     </record>
diff --git a/account_credit_control/wizard/credit_control_marker_view.xml b/account_credit_control/wizard/credit_control_marker_view.xml
index 567a26037..03af8dbb8 100644
--- a/account_credit_control/wizard/credit_control_marker_view.xml
+++ b/account_credit_control/wizard/credit_control_marker_view.xml
@@ -6,17 +6,33 @@
       <field name="model">credit.control.marker</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="Lines marker">
-          <separator string="Change the state of the selected lines." colspan="4"/>
+        <form string="Lines marker" version="7.0">
+          <separator string="Change the state of the selected lines" colspan="4"/>
+          <newline/>
           <label string="Warning: you will maybe not be able to revert this operation." colspan="4"></label>
           <newline/>
-          <field name="name" colspan="4"/>
-          <field name="line_ids" colspan="4" nolabel="1"/>
-          <newline/>
-          <group colspan="4">
-            <button special="cancel" string="Cancel" icon='gtk-cancel'/>
-            <button name="mark_lines" string="Change Lines' State" type="object" icon="gtk-execute"/>
+          <group>
+            <group><field name="name"/></group>
+            <group></group>
           </group>
+          <notebook>
+            <page string="Lines">
+              <field name="line_ids" colspan="4" nolabel="1"/>
+            </page>
+          </notebook>
+          <newline/>
+          <footer>
+            <button
+                class="oe_highlight"
+                name="mark_lines"
+                string="Change Lines' State"
+                type="object"/>
+            or
+            <button
+                class="oe_link"
+                special="cancel"
+                string="Cancel"/>
+          </footer>
         </form>
       </field>
     </record>
diff --git a/account_credit_control/wizard/credit_control_printer_view.xml b/account_credit_control/wizard/credit_control_printer_view.xml
index dd07c1b13..021bd242e 100644
--- a/account_credit_control/wizard/credit_control_printer_view.xml
+++ b/account_credit_control/wizard/credit_control_printer_view.xml
@@ -6,21 +6,25 @@
       <field name="model">credit.control.printer</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="Lines report">
-          <separator colspan="4" string="Print the selected lines"/>
+        <form string="Lines report" version="7.0">
+          <separator string="Print the selected lines" colspan="4"/>
           <newline/>
           <field name="mark_as_sent" colspan="4" attrs="{'invisible': [('state', '=', 'done')]}"/>
           <newline/>
+          <notebook>
+            <page string="Lines" attrs="{'invisible': [('state', '=', 'done')]}">
           <field name="line_ids" colspan="4" nolabel="1"
             attrs="{'invisible': [('state', '=', 'done')]}" />
+            </page>
+          </notebook>
           <field name="report_file" colspan="4" attrs="{'invisible': [('state', '!=', 'done')]}"/>
           <field name="state" invisible="1" />
           <newline/>
-          <group colspan="4">
+          <footer>
+            <button class="oe_highlight" name="print_lines" string="Print" type="object"  attrs="{'invisible': [('state', '==', 'done')]}"/>
             <button special="cancel" string="Cancel" icon='gtk-cancel' attrs="{'invisible': [('state', '==', 'done')]}"/>
-            <button name="print_lines" string="Print" type="object" icon="gtk-execute" attrs="{'invisible': [('state', '==', 'done')]}"/>
             <button special="cancel" string="Close" icon='gtk-close' attrs="{'invisible': [('state', '!=', 'done')]}"/>
-          </group>
+          </footer>
         </form>
       </field>
     </record>

From 43c6f3f1deef4f32d979cda0be693537a30ea532 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Tue, 8 Apr 2014 09:52:42 +0200
Subject: [PATCH 02/57] [ADD] credit control policy changer. Add a wizard on
 Invoice that will add a credit line and deprecate exisiting one on the
 invoice

---
 account_credit_control/__openerp__.py         |   1 +
 account_credit_control/line.py                |  67 +++++++----
 account_credit_control/policy.py              |   9 +-
 account_credit_control/wizard/__init__.py     |   1 +
 .../wizard/credit_control_policy_changer.py   | 106 ++++++++++++++++++
 .../credit_control_policy_changer_view.xml    |  62 ++++++++++
 6 files changed, 223 insertions(+), 23 deletions(-)
 create mode 100644 account_credit_control/wizard/credit_control_policy_changer.py
 create mode 100644 account_credit_control/wizard/credit_control_policy_changer_view.xml

diff --git a/account_credit_control/__openerp__.py b/account_credit_control/__openerp__.py
index ef5369f00..5fd55c159 100644
--- a/account_credit_control/__openerp__.py
+++ b/account_credit_control/__openerp__.py
@@ -69,6 +69,7 @@ On each generated line, you have many choices:
           "wizard/credit_control_emailer_view.xml",
           "wizard/credit_control_marker_view.xml",
           "wizard/credit_control_printer_view.xml",
+          "wizard/credit_control_policy_changer_view.xml",
           "security/ir.model.access.csv"],
  'demo_xml': ["credit_control_demo.xml"],
  'tests': [],
diff --git a/account_credit_control/line.py b/account_credit_control/line.py
index d450e0697..e2c63cf78 100644
--- a/account_credit_control/line.py
+++ b/account_credit_control/line.py
@@ -116,6 +116,7 @@ class CreditControlLine(orm.Model):
                                 string='Level',
                                 store=True,
                                 readonly=True),
+        'manually_overriden': fields.boolean('Manually overriden')
     }
 
 
@@ -141,8 +142,27 @@ class CreditControlLine(orm.Model):
         return data
 
     def create_or_update_from_mv_lines(self, cr, uid, ids, lines,
-                                       level_id, controlling_date, context=None):
-        """Create or update line based on levels"""
+                                       level_id, controlling_date,
+                                       check_tolerance=True,  context=None):
+        """Create or update line based on levels
+
+        if check_tolerance is true credit line will not be
+        created if open amount is too small.
+        eg. we do not want to send a letter for 10 cents
+        of open amount.
+
+        :param lines: move.line id list
+        :param level_id: credit.control.policy.level id
+        :param controlling_date: date string of the credit controlling date.
+                                 Generally it should be the same
+                                 as create date
+        :param check_tolerance: boolean if True credit line
+                                will not be generated if open amount
+                                is smaller than company defined
+                                tolerance
+
+        :returns: list of created credit line ids
+        """
         currency_obj = self.pool.get('res.currency')
         level_obj = self.pool.get('credit.control.policy.level')
         ml_obj = self.pool.get('account.move.line')
@@ -164,26 +184,31 @@ class CreditControlLine(orm.Model):
         for line in ml_obj.browse(cr, uid, lines, context):
 
             open_amount = line.amount_residual_currency
+            cur_tolerance = tolerance.get(line.currency_id.id, tolerance_base)
+            if check_tolerance and open_amount < cur_tolerance:
+                continue
+            vals = self._prepare_from_move_line(cr, uid,
+                                                line,
+                                                level,
+                                                controlling_date,
+                                                open_amount,
+                                                context=context)
+            line_id = self.create(cr, uid, vals, context=context)
+            line_ids.append(line_id)
 
-            if open_amount > tolerance.get(line.currency_id.id, tolerance_base):
-                vals = self._prepare_from_move_line(
-                    cr, uid, line, level, controlling_date, open_amount, context=context)
-                line_id = self.create(cr, uid, vals, context=context)
-                line_ids.append(line_id)
-
-                # when we have lines generated earlier in draft,
-                # on the same level, it means that we have left
-                # them, so they are to be considered as ignored
-                previous_draft_ids = self.search(
-                    cr, uid,
-                    [('move_line_id', '=', line.id),
-                     ('level', '=', level.id),
-                     ('state', '=', 'draft'),
-                     ('id', '!=', line_id)],
-                    context=context)
-                if previous_draft_ids:
-                    self.write(cr, uid, previous_draft_ids,
-                               {'state': 'ignored'}, context=context)
+            # when we have lines generated earlier in draft,
+            # on the same level, it means that we have left
+            # them, so they are to be considered as ignored
+            previous_draft_ids = self.search(
+                cr, uid,
+                [('move_line_id', '=', line.id),
+                 ('level', '=', level.id),
+                 ('state', '=', 'draft'),
+                 ('id', '!=', line_id)],
+                context=context)
+            if previous_draft_ids:
+                self.write(cr, uid, previous_draft_ids,
+                           {'state': 'ignored'}, context=context)
 
         return line_ids
 
diff --git a/account_credit_control/policy.py b/account_credit_control/policy.py
index 1940ea672..5e36c6bce 100644
--- a/account_credit_control/policy.py
+++ b/account_credit_control/policy.py
@@ -319,8 +319,10 @@ class CreditControlPolicyLevel(Model):
                "                 FROM credit_control_line\n"
                "                 WHERE move_line_id = mv_line.id\n"
                # lines from a previous level with a draft or ignored state
+               # or manually overriden
                # have to be generated again for the previous level
-               "                 AND state not in ('draft', 'ignored'))")
+               "                 AND NOT manually_overriden\n"
+               "                 AND state NOT IN ('draft', 'ignored'))")
         sql += " AND"
         sql += self._get_sql_date_boundary_for_computation_mode(cr, uid, level,
                                                                 controlling_date, context)
@@ -346,11 +348,14 @@ class CreditControlPolicyLevel(Model):
                " WHERE cr_line.id = (SELECT credit_control_line.id FROM credit_control_line\n"
                "                            WHERE credit_control_line.move_line_id = mv_line.id\n"
                "                            AND state != 'ignored'"
+               "                            AND NOT manually_overriden"
                "                              ORDER BY credit_control_line.level desc limit 1)\n"
                " AND cr_line.level = %(previous_level)s\n"
                # lines from a previous level with a draft or ignored state
+               # or manually overriden
                # have to be generated again for the previous level
-               " AND cr_line.state not in ('draft', 'ignored')\n"
+               " AND NOT manually_overriden\n"
+               " AND cr_line.state NOT IN ('draft', 'ignored')\n"
                " AND mv_line.id in %(line_ids)s\n")
         sql += " AND "
         sql += self._get_sql_date_boundary_for_computation_mode(cr, uid, level,
diff --git a/account_credit_control/wizard/__init__.py b/account_credit_control/wizard/__init__.py
index ca0a1758a..f12dea14d 100644
--- a/account_credit_control/wizard/__init__.py
+++ b/account_credit_control/wizard/__init__.py
@@ -22,3 +22,4 @@ from . import credit_control_emailer
 from . import credit_control_marker
 from . import credit_control_printer
 from . import credit_control_communication
+from . import credit_control_policy_changer
diff --git a/account_credit_control/wizard/credit_control_policy_changer.py b/account_credit_control/wizard/credit_control_policy_changer.py
new file mode 100644
index 000000000..4876b9df7
--- /dev/null
+++ b/account_credit_control/wizard/credit_control_policy_changer.py
@@ -0,0 +1,106 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Nicolas Bessi
+#    Copyright 2014 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from itertools import chain
+from openerp.osv import orm, fields
+
+
+class credit_control_policy_changer(orm.TransientModel):
+    """Wizard that is run from invoices and allows to set manually a policy
+    Policy are actually apply to related move lines availabe
+    in selection widget
+
+    """
+    _name = "credit.control.policy.changer"
+    _columns = {
+        'new_policy_id': fields.many2one('credit.control.policy',
+                                      'New Policy to Apply',
+                                      required=True),
+        'new_policy_level_id': fields.many2one('credit.control.policy.level',
+                                            'New level to apply',
+                                            required=True),
+        'move_line_ids': fields.many2many('account.move.line',
+                                          rel='credit_changer_ml_rel',
+                                          string='Move line to change'),
+    }
+
+    def _get_default_lines(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        active_ids = context.get('active_ids')
+        selected_line_ids = []
+        inv_model = self.pool['account.invoice']
+        move_line_model = self.pool['account.move.line']
+        if not active_ids:
+            return False
+            # raise ValueError('No active_ids passed in context')
+        for invoice in inv_model.browse(cr, uid, active_ids, context=context):
+            domain = [('account_id', '=', invoice.account_id.id),
+                      ('move_id', '=', invoice.move_id.id),
+                      ('reconcile_id', '=', False)]
+            move_ids = move_line_model.search(cr, uid, domain, context=context)
+            selected_line_ids.extend(move_ids)
+        return selected_line_ids
+
+    _defaults = {'move_line_ids': _get_default_lines}
+
+    def _mark_as_overriden(self, cr, uid, move_lines, context=None):
+        credit_model = self.pool['credit.control.line']
+        domain = [('id', 'in', [x.id for x in move_lines])]
+        credits_ids = credit_model.search(cr, uid, domain, context=context)
+        credit_model.write(cr, uid,
+                           credits_ids,
+                           {'manually_overriden': True},
+                           context)
+        return credits_ids
+
+    def set_new_policy(self, cr, uid, wizard_id, context=None):
+        assert len(wizard_id) == 1, "Only one id expected"
+        wizard_id = wizard_id[0]
+
+        credit_line_model = self.pool['credit.control.line']
+        ir_model = self.pool['ir.model.data']
+        ui_act_model = self.pool['ir.actions.act_window']
+        wizard = self.browse(cr, uid, wizard_id, context=context)
+        controlling_date = fields.date.today()
+        self._mark_as_overriden(cr,
+                                uid,
+                                wizard.move_line_ids,
+                                context=context)
+        # As disscused with business expert
+        # draft line should be passed to ignored
+        # if same level as the new one
+        # As it is a manual action
+        # We also ignore rounding tolerance
+        generated_ids = credit_line_model.create_or_update_from_mv_lines(
+            cr, uid, [],
+            [x.id for x in wizard.move_line_ids],
+            wizard.new_policy_level_id.id,
+            controlling_date,
+            check_tolerance=False,
+            context=None
+        )
+        view_id = ir_model.get_object_reference(cr, uid,
+                                                "account_credit_control",
+                                                "credit_control_line_action")
+        assert view_id, 'No view found'
+        action =  ui_act_model.read(cr, uid, view_id[1], context=context)
+        action['domain'] = [('id', 'in', generated_ids)]
+        return action
diff --git a/account_credit_control/wizard/credit_control_policy_changer_view.xml b/account_credit_control/wizard/credit_control_policy_changer_view.xml
new file mode 100644
index 000000000..ae383d8ec
--- /dev/null
+++ b/account_credit_control/wizard/credit_control_policy_changer_view.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+    <record id="credit_control_policy_changer_form" model="ir.ui.view">
+      <field name="name">credit control policy form</field>
+      <field name="model">credit.control.policy.changer</field>
+      <field name="arch" type="xml">
+        <form version="7.0" string="Set current credit level">
+          <separator string="Change the overdue level of current invoice" colspan="4"/>
+          <label string="This wizard will let you set the overdue policy and level for selected invoices"/>
+          <newline/>
+         <group>
+           <group>
+             <field name="new_policy_id"/>
+             <field name="new_policy_level_id"
+                    domain="[('policy_id', '=', new_policy_id)]"/>
+           </group>
+           <group></group>
+         </group>
+          <notebook colspan="4">
+            <page string="Move lines to affect">
+              <field name="move_line_ids"/>
+            </page>
+          </notebook>
+        <footer>
+            <button class="oe_highlight"
+                    name="set_new_policy"
+                    string="Set new policy"
+                    type="object"/>
+            or
+            <button class="oe_link"
+                    special="cancel"
+                    string="Cancel"/>
+        </footer>
+        </form>
+
+      </field>
+    </record>
+
+    <!-- for button -->
+    <record id="action_wizard_credit_policy_changer" model="ir.actions.act_window">
+      <field name="name">Change current credit policy</field>
+      <field name="res_model">credit.control.policy.changer</field>
+      <field name="src_model">account.invoice</field>
+      <field name="view_type">form</field>
+      <field name="view_mode">form</field>
+      <field name="view_id" ref="credit_control_policy_changer_form"/>
+      <field name="target">new</field>
+      <field name="help">Allows to manually change credit level</field>
+    </record>
+
+    <!-- for menu -->
+    <act_window name="Change current credit policy"
+                res_model="credit.control.policy.changer"
+                src_model="account.invoice"
+                view_mode="form"
+                target="new"
+                key2="client_action_multi"
+                id="action_wizard_credit_policy_changer_menu_action"/>
+
+  </data>
+</openerp>

From 73392e2b5d1dea20fae5a748c920b438c6913fe8 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Tue, 8 Apr 2014 10:04:20 +0200
Subject: [PATCH 03/57] [ADD] test to ensure that wizard run on customer
 invoice

---
 .../wizard/credit_control_policy_changer.py                  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/account_credit_control/wizard/credit_control_policy_changer.py b/account_credit_control/wizard/credit_control_policy_changer.py
index 4876b9df7..78199bb4b 100644
--- a/account_credit_control/wizard/credit_control_policy_changer.py
+++ b/account_credit_control/wizard/credit_control_policy_changer.py
@@ -18,7 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from itertools import chain
+from openerp.tools.translate import _
 from openerp.osv import orm, fields
 
 
@@ -52,6 +52,9 @@ class credit_control_policy_changer(orm.TransientModel):
             return False
             # raise ValueError('No active_ids passed in context')
         for invoice in inv_model.browse(cr, uid, active_ids, context=context):
+            if invoice.type in ('in_invoice', 'in_refund'):
+                raise orm.except_orm(_('User error'),
+                                     _('Please use wizard on cutomer invoices'))
             domain = [('account_id', '=', invoice.account_id.id),
                       ('move_id', '=', invoice.move_id.id),
                       ('reconcile_id', '=', False)]

From 952a404f5d549943be2ccd4a2dd1640912a924d8 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Tue, 8 Apr 2014 10:27:04 +0200
Subject: [PATCH 04/57] [ADD] doc string

---
 .../wizard/credit_control_policy_changer.py   | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/account_credit_control/wizard/credit_control_policy_changer.py b/account_credit_control/wizard/credit_control_policy_changer.py
index 78199bb4b..a7393a862 100644
--- a/account_credit_control/wizard/credit_control_policy_changer.py
+++ b/account_credit_control/wizard/credit_control_policy_changer.py
@@ -42,6 +42,13 @@ class credit_control_policy_changer(orm.TransientModel):
     }
 
     def _get_default_lines(self, cr, uid, context=None):
+        """Get default lines for fields move_line_ids
+        of wizard. Only take lines that are on the same account
+        and move of the invoice and not reconciled
+
+        :return: list of compliant move line ids
+
+        """
         if context is None:
             context = {}
         active_ids = context.get('active_ids')
@@ -65,6 +72,14 @@ class credit_control_policy_changer(orm.TransientModel):
     _defaults = {'move_line_ids': _get_default_lines}
 
     def _mark_as_overriden(self, cr, uid, move_lines, context=None):
+        """Mark `move_lines` related credit control line as overriden
+        This is done by setting manually_overriden fields to True
+
+        :param move_lines: move line to mark as overriden
+
+        :retun: list of credit line ids that where marked as overriden
+
+        """
         credit_model = self.pool['credit.control.line']
         domain = [('id', 'in', [x.id for x in move_lines])]
         credits_ids = credit_model.search(cr, uid, domain, context=context)
@@ -75,6 +90,15 @@ class credit_control_policy_changer(orm.TransientModel):
         return credits_ids
 
     def set_new_policy(self, cr, uid, wizard_id, context=None):
+        """Set new policy on an invoice.
+
+        This is done by creating a new credit control line
+        related to the move line and the policy setted in
+        the wizard form
+
+        :return: ir.actions.act_windows dict
+
+        """
         assert len(wizard_id) == 1, "Only one id expected"
         wizard_id = wizard_id[0]
 

From 7e1af6f5d5f48522bf9a86d40d0f93c812cf4844 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Wed, 9 Apr 2014 14:23:34 +0200
Subject: [PATCH 05/57] [ADD] test for policy changer and fix some bugs

---
 account_credit_control/policy.py              |  3 +-
 .../11_credit_control_manual_setting.feature  | 23 +++++++++
 .../steps/account_credit_control_changer.py   | 51 +++++++++++++++++++
 .../wizard/credit_control_policy_changer.py   | 19 ++++++-
 4 files changed, 93 insertions(+), 3 deletions(-)
 create mode 100644 account_credit_control/scenarios/features/11_credit_control_manual_setting.feature
 create mode 100644 account_credit_control/scenarios/features/steps/account_credit_control_changer.py

diff --git a/account_credit_control/policy.py b/account_credit_control/policy.py
index 5e36c6bce..a01cae83b 100644
--- a/account_credit_control/policy.py
+++ b/account_credit_control/policy.py
@@ -198,7 +198,8 @@ class CreditControlPolicy(Model):
         if isinstance(policy_id, list):
             policy_id = policy_id[0]
         cr.execute("SELECT move_line_id FROM credit_control_line"
-                   "    WHERE policy_id != %s and move_line_id in %s",
+                   "    WHERE policy_id != %s and move_line_id in %s"
+                   "    AND manually_overriden IS false",
                    (policy_id, tuple(lines)))
         res = cr.fetchall()
         if res:
diff --git a/account_credit_control/scenarios/features/11_credit_control_manual_setting.feature b/account_credit_control/scenarios/features/11_credit_control_manual_setting.feature
new file mode 100644
index 000000000..af11289dd
--- /dev/null
+++ b/account_credit_control/scenarios/features/11_credit_control_manual_setting.feature
@@ -0,0 +1,23 @@
+###############################################################################
+#
+#    OERPScenario, OpenERP Functional Tests
+#    Copyright 2012 Camptocamp SA
+#    Author Nicolas Bessi
+##############################################################################
+
+# Features Generic tags (none for all)
+##############################################################################
+
+@account_credit_control  @account_credit_control_run  @account_credit_control_run_aug
+
+Feature: Ensure that manually changing  an invoice level feature works as expected
+
+  @account_credit_control_change_level
+  Scenario: Change level
+    Given I change level for invoice "SAJ/2014/0004" to "10 days net" of policy "3 time policy"
+    Then wizard selected move lines should be:
+      | name  |
+      | SI_4  |
+    When I confirm the level change
+    And I should have "3" credit control lines overriden
+    And one new credit control line of level "10 days net" related to invoice "SAJ/2014/0004"
diff --git a/account_credit_control/scenarios/features/steps/account_credit_control_changer.py b/account_credit_control/scenarios/features/steps/account_credit_control_changer.py
new file mode 100644
index 000000000..855e36365
--- /dev/null
+++ b/account_credit_control/scenarios/features/steps/account_credit_control_changer.py
@@ -0,0 +1,51 @@
+@given(u'I change level for invoice "{invoice_name}" to "{level_name}" of policy "{policy_name}"')
+def impl(ctx, invoice_name, level_name, policy_name):
+   invoice = model('account.invoice').get([('number', '=', invoice_name)])
+   assert_true(invoice, msg='No invoices found')
+   level = model('credit.control.policy.level').get([('name', '=', level_name)])
+   assert_true(level, 'level not found')
+   policy = model('credit.control.policy').get([('name', '=', policy_name)])
+   assert_true(policy, 'Policy not found')
+   assert_equal(policy.id, level.policy_id.id)
+   context = {'active_ids': [invoice.id]}
+   data = {'new_policy_id': policy.id,
+           'new_policy_level_id': level.id}
+   wizard = model('credit.control.policy.changer').create(data, context=context)
+   ctx.wizard = wizard
+
+@then(u'wizard selected move lines should be')
+def impl(ctx):
+    assert_true(ctx.wizard)
+    names = [x.name for x in ctx.wizard.move_line_ids]
+    for line in ctx.table:
+        assert_in(line['name'], names)
+
+@when(u'I confirm the level change')
+def impl(ctx):
+    assert_true(ctx.wizard)
+    ctx.wizard.set_new_policy()
+
+@when(u'I should have "{line_number:d}" credit control lines overriden')
+def impl(ctx, line_number):
+    assert_true(ctx.wizard)
+    move_ids = [x.id for x in ctx.wizard.move_line_ids]
+    overriden = model('credit.control.line').search([('move_line_id', 'in', move_ids),
+                                                     ('manually_overriden', '=', True)])
+#    assert len(overriden) == line_number
+
+@when(u'one new credit control line of level "{level_name}" related to invoice "{invoice_name}"')
+def impl(ctx, level_name, invoice_name):
+   invoice = model('account.invoice').get([('number', '=', invoice_name)])
+   assert_true(invoice, msg='No invoices found')
+   level = model('credit.control.policy.level').get([('name', '=', level_name)])
+   assert_true(level, 'level not found')
+   assert_true(ctx.wizard)
+   move_ids = [x.id for x in ctx.wizard.move_line_ids]
+   created_id = model('credit.control.line').search([('move_line_id', 'in', move_ids),
+                                                     ('manually_overriden', '=', False)])
+
+   assert len(created_id) == 1
+   created = model('credit.control.line').get(created_id[0])
+   assert_equal(created.policy_level_id.id, level.id)
+   assert_equal(created.invoice_id.id, invoice.id)
+   assert_equal(created.invoice_id.credit_policy_id.id, level.policy_id.id)
diff --git a/account_credit_control/wizard/credit_control_policy_changer.py b/account_credit_control/wizard/credit_control_policy_changer.py
index a7393a862..89a331b68 100644
--- a/account_credit_control/wizard/credit_control_policy_changer.py
+++ b/account_credit_control/wizard/credit_control_policy_changer.py
@@ -18,9 +18,10 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+import logging
 from openerp.tools.translate import _
 from openerp.osv import orm, fields
-
+logger = logging.getLogger(__name__)
 
 class credit_control_policy_changer(orm.TransientModel):
     """Wizard that is run from invoices and allows to set manually a policy
@@ -62,6 +63,7 @@ class credit_control_policy_changer(orm.TransientModel):
             if invoice.type in ('in_invoice', 'in_refund'):
                 raise orm.except_orm(_('User error'),
                                      _('Please use wizard on cutomer invoices'))
+
             domain = [('account_id', '=', invoice.account_id.id),
                       ('move_id', '=', invoice.move_id.id),
                       ('reconcile_id', '=', False)]
@@ -81,7 +83,7 @@ class credit_control_policy_changer(orm.TransientModel):
 
         """
         credit_model = self.pool['credit.control.line']
-        domain = [('id', 'in', [x.id for x in move_lines])]
+        domain = [('move_line_id', 'in', [x.id for x in move_lines])]
         credits_ids = credit_model.search(cr, uid, domain, context=context)
         credit_model.write(cr, uid,
                            credits_ids,
@@ -89,6 +91,15 @@ class credit_control_policy_changer(orm.TransientModel):
                            context)
         return credits_ids
 
+    def _set_invoice_policy(self, cr, uid, move_line_ids, policy_level,
+                            context=None):
+        """Force policy on invoice"""
+        invoice_model = self.pool['account.invoice']
+        invoice_ids = set([x.invoice.id for x in move_line_ids if x.invoice])
+        invoice_model.write(cr, uid, list(invoice_ids),
+                            {'credit_policy_id': policy_level.policy_id.id},
+                            context=context)
+
     def set_new_policy(self, cr, uid, wizard_id, context=None):
         """Set new policy on an invoice.
 
@@ -124,6 +135,10 @@ class credit_control_policy_changer(orm.TransientModel):
             check_tolerance=False,
             context=None
         )
+        self._set_invoice_policy(cr, uid,
+                                 wizard.move_line_ids,
+                                 wizard.new_policy_level_id,
+                                 context=context)
         view_id = ir_model.get_object_reference(cr, uid,
                                                 "account_credit_control",
                                                 "credit_control_line_action")

From be1950d073bf2f4de0f62f9f33528dc7731fabd9 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Wed, 9 Apr 2014 14:44:01 +0200
Subject: [PATCH 06/57] [ADD] view and fields on manual fields

---
 account_credit_control/line_view.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/account_credit_control/line_view.xml b/account_credit_control/line_view.xml
index f48708d2f..0d4e7c0b8 100644
--- a/account_credit_control/line_view.xml
+++ b/account_credit_control/line_view.xml
@@ -10,6 +10,7 @@
           <field name="date_due"/>
           <field name="date_sent"/>
           <field name="level"/>
+          <field name="manually_overriden"/>
           <field name="state"/>
           <field name="channel"/>
           <field name="invoice_id"/>
@@ -48,6 +49,9 @@
             <filter name="filter_error" icon="terp-gtk-stop" string="Error"
                     domain="[('state', 'in', ('error', 'email_error'))]"
                     help="An error has occured during the sending of the email."/>
+            <filter name="filter_manual" icon="terp-gtk-stop" string="Manual change"
+                    domain="[('manually_overriden', '=', True)]"
+                    help="The line was deprecated by a manual change of policy on invoice."/>
             <separator orientation="vertical"/>
 
             <field name="date"/>
@@ -89,6 +93,8 @@
             <separator orientation="vertical"/>
             <filter domain='[]' context="{'group_by': 'channel'}"
                     icon="terp-document-new" string="Channel"/>
+            <filter domain='[]' context="{'group_by': 'manually_overriden'}"
+                    icon="terp-document-new" string="Manual change"/>
           </group>
         </search>
       </field>
@@ -103,6 +109,7 @@
           <field name="date"/>
           <field name="date_due"/>
           <field name="level"/>
+          <field name="manually_overriden"/>
           <field name="state"/>
           <field name="channel"/>
           <field name="invoice_id"/>

From aef10266151facd2321c83caba7b96ebdfb5cbb6 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Thu, 10 Apr 2014 09:04:35 +0200
Subject: [PATCH 07/57] [ADD] Scenario that test coherence of credit run after
 manually altering an invoice level

---
 .../09_credit_control_run_jul.feature         |  8 +++---
 .../11_credit_control_manual_setting.feature  | 21 +++++++++++++++-
 .../steps/account_credit_control_changer.py   | 25 +++++++++++++++++++
 3 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/account_credit_control/scenarios/features/09_credit_control_run_jul.feature b/account_credit_control/scenarios/features/09_credit_control_run_jul.feature
index 159fdc1ec..9bd9df52d 100644
--- a/account_credit_control/scenarios/features/09_credit_control_run_jul.feature
+++ b/account_credit_control/scenarios/features/09_credit_control_run_jul.feature
@@ -13,10 +13,10 @@
 Feature: Ensure that email credit line generation first pass is correct
 
     @account_credit_control_mark
-  Scenario: mark lines
-    Given there is "draft" credit lines
-    And I mark all draft email to state "to_be_sent"
-    Then the draft line should be in state "to_be_sent"
+    Scenario: mark lines
+      Given there is "draft" credit lines
+      And I mark all draft email to state "to_be_sent"
+      Then the draft line should be in state "to_be_sent"
 
   @account_credit_control_run_month
   Scenario: Create run
diff --git a/account_credit_control/scenarios/features/11_credit_control_manual_setting.feature b/account_credit_control/scenarios/features/11_credit_control_manual_setting.feature
index af11289dd..bfe2aa811 100644
--- a/account_credit_control/scenarios/features/11_credit_control_manual_setting.feature
+++ b/account_credit_control/scenarios/features/11_credit_control_manual_setting.feature
@@ -8,7 +8,7 @@
 # Features Generic tags (none for all)
 ##############################################################################
 
-@account_credit_control  @account_credit_control_run  @account_credit_control_run_aug
+@account_credit_control  @account_credit_control_run  @account_credit_control_run_change_level
 
 Feature: Ensure that manually changing  an invoice level feature works as expected
 
@@ -21,3 +21,22 @@ Feature: Ensure that manually changing  an invoice level feature works as expect
     When I confirm the level change
     And I should have "3" credit control lines overriden
     And one new credit control line of level "10 days net" related to invoice "SAJ/2014/0004"
+    Then I force date of generated credit line to "2013-09-15"
+
+  @account_credit_control_run_month_sept
+  Scenario: Create run
+    Given there is "draft" credit lines
+    And I mark all draft email to state "to_be_sent"
+    Then the draft line should be in state "to_be_sent"
+    Given I need a "credit.control.run" with oid: credit_control.manual_change
+    And having:
+      | name |      value |
+      | date | 2013-09-30 |
+    When I launch the credit run
+    Then my credit run should be in state "done"
+
+  @account_credit_control_manual_next_step
+  Scenario: Check manually  managed line on run
+    Given the invoice "SAJ/2014/0004" with manual changes
+    And the invoice has "1" line of level "1" for policy "3 time policy"
+    And the invoice has "1" line of level "2" for policy "3 time policy"
diff --git a/account_credit_control/scenarios/features/steps/account_credit_control_changer.py b/account_credit_control/scenarios/features/steps/account_credit_control_changer.py
index 855e36365..b3625b1c0 100644
--- a/account_credit_control/scenarios/features/steps/account_credit_control_changer.py
+++ b/account_credit_control/scenarios/features/steps/account_credit_control_changer.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 @given(u'I change level for invoice "{invoice_name}" to "{level_name}" of policy "{policy_name}"')
 def impl(ctx, invoice_name, level_name, policy_name):
    invoice = model('account.invoice').get([('number', '=', invoice_name)])
@@ -46,6 +47,30 @@ def impl(ctx, level_name, invoice_name):
 
    assert len(created_id) == 1
    created = model('credit.control.line').get(created_id[0])
+   ctx.created = created
    assert_equal(created.policy_level_id.id, level.id)
    assert_equal(created.invoice_id.id, invoice.id)
    assert_equal(created.invoice_id.credit_policy_id.id, level.policy_id.id)
+
+@then(u'I force date of generated credit line to "{date}"')
+def impl(ctx, date):
+    assert_true(ctx.created)
+    ctx.created.write({'date': date})
+
+@given(u'the invoice "{invoice_name}" with manual changes')
+def impl(ctx, invoice_name):
+   invoice = model('account.invoice').get([('number', '=', invoice_name)])
+   assert_true(invoice, msg='No invoices found')
+   man_lines = (x for x in invoice.credit_control_line_ids if x.manually_overriden)
+   assert_true(next(man_lines, None), 'No manual change on the invoice')
+   ctx.invoice = invoice
+
+@given(u'the invoice has "{line_number:d}" line of level "{level:d}" for policy "{policy_name}"')
+def impl(ctx, line_number, level, policy_name):
+    assert_true(ctx.invoice)
+    policy = model('credit.control.policy').get([('name', '=', policy_name)])
+    assert_true(policy)
+    lines = model('credit.control.line').search([('invoice_id', '=', ctx.invoice.id),
+                                                 ('level', '=', level),
+                                                 ('policy_id', '=', policy.id)])
+    assert_equal(len(lines), line_number)

From ba1a19760f404987bc105ddd8670233a8d59c489 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Thu, 10 Apr 2014 09:50:44 +0200
Subject: [PATCH 08/57] [FIX] change account_credit_control_version as it add
 new fields and functionnality

---
 account_credit_control/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/account_credit_control/__openerp__.py b/account_credit_control/__openerp__.py
index 5fd55c159..0f8871bf0 100644
--- a/account_credit_control/__openerp__.py
+++ b/account_credit_control/__openerp__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 {'name': 'Account Credit Control',
- 'version': '0.1.1',
+ 'version': '0.2.0',
  'author': 'Camptocamp',
  'maintainer': 'Camptocamp',
  'category': 'Finance',

From 9a94904a633106bd487e67006cad700b64884609 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Mon, 14 Apr 2014 11:23:39 +0200
Subject: [PATCH 09/57] [IMP] generate credit line returns generated ids

---
 account_credit_control/run.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/account_credit_control/run.py b/account_credit_control/run.py
index 1fc739b9f..05e8915be 100644
--- a/account_credit_control/run.py
+++ b/account_credit_control/run.py
@@ -110,6 +110,7 @@ class CreditControlRun(orm.Model):
                                  _('Please select a policy'))
 
         report = ''
+        generated_ids = []
         for policy in policies:
             if policy.do_nothing:
                 continue
@@ -125,7 +126,7 @@ class CreditControlRun(orm.Model):
                     level_lines = level.get_level_lines(run.date, lines, context=context)
                     policy_generated_ids += cr_line_obj.create_or_update_from_mv_lines(
                         cr, uid, [], list(level_lines), level.id, run.date, context=context)
-
+            generated_ids.extend(policy_generated_ids)
             if policy_generated_ids:
                 report += _("Policy \"%s\" has generated %d Credit Control Lines.\n") % \
                         (policy.name, len(policy_generated_ids))
@@ -138,6 +139,7 @@ class CreditControlRun(orm.Model):
                 'report': report,
                 'manual_ids': [(6, 0, manually_managed_lines)]}
         run.write(vals, context=context)
+        return generated_ids
 
     def generate_credit_lines(self, cr, uid, run_id, context=None):
         """Generate credit control lines

From 350ae708ffec6f4e24b9b012604536ab0b57c17e Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Mon, 14 Apr 2014 13:57:02 +0200
Subject: [PATCH 10/57] [ADD] credit control dunning fees module

---
 .../__init__.py                               | 21 ++++
 .../__openerp__.py                            | 70 ++++++++++++++
 .../model/__init__.py                         | 24 +++++
 .../model/dunning.py                          | 71 ++++++++++++++
 .../model/line.py                             | 29 ++++++
 .../model/policy.py                           | 36 +++++++
 .../model/run.py                              | 39 ++++++++
 .../tests/__init__.py                         | 23 +++++
 .../tests/test_fees_generation.py             | 95 +++++++++++++++++++
 .../view/line_view.xml                        | 30 ++++++
 .../view/policy_view.xml                      | 26 +++++
 11 files changed, 464 insertions(+)
 create mode 100644 account_credit_control_dunning_fees/__init__.py
 create mode 100644 account_credit_control_dunning_fees/__openerp__.py
 create mode 100644 account_credit_control_dunning_fees/model/__init__.py
 create mode 100644 account_credit_control_dunning_fees/model/dunning.py
 create mode 100644 account_credit_control_dunning_fees/model/line.py
 create mode 100644 account_credit_control_dunning_fees/model/policy.py
 create mode 100644 account_credit_control_dunning_fees/model/run.py
 create mode 100644 account_credit_control_dunning_fees/tests/__init__.py
 create mode 100644 account_credit_control_dunning_fees/tests/test_fees_generation.py
 create mode 100644 account_credit_control_dunning_fees/view/line_view.xml
 create mode 100644 account_credit_control_dunning_fees/view/policy_view.xml

diff --git a/account_credit_control_dunning_fees/__init__.py b/account_credit_control_dunning_fees/__init__.py
new file mode 100644
index 000000000..6ac610f01
--- /dev/null
+++ b/account_credit_control_dunning_fees/__init__.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Nicolas Bessi
+#    Copyright 2014 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from . import model
diff --git a/account_credit_control_dunning_fees/__openerp__.py b/account_credit_control_dunning_fees/__openerp__.py
new file mode 100644
index 000000000..36ceb3944
--- /dev/null
+++ b/account_credit_control_dunning_fees/__openerp__.py
@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Nicolas Bessi
+#    Copyright 2014 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{'name': 'Credit control dunning fees',
+ 'version': '0.1.0',
+ 'author': 'Camptocamp',
+ 'maintainer': 'Camptocamp',
+ 'category': 'Accounting',
+ 'complexity': 'normal',
+ 'depends': ['account_credit_control'],
+ 'description': """
+Dunning Fees for Credit Control
+===============================
+
+This extention of credit control adds the notion of dunning fees
+on credit control lines.
+
+Configuration
+-------------
+For release 0.1 only fixed fees are supported.
+
+You can specifiy a fees fixed a product and a currency
+on the credit control level form.
+
+The amount will be used as fees values the currency will determine
+the currency of the fee. If the credit control line has not the
+same currency as the fees currency, fees will be converted to
+the credit control line currency.
+
+The product is used to compute taxes in reconciliation process.
+
+Run
+---
+Fees are automatically computed on credit run and saved
+on the generated credit lines.
+
+Fees can be manually edited as long credit line is draft
+
+To Come
+-------
+Support of fees price list
+
+""",
+ 'website': 'http://www.camptocamp.com',
+ 'data': ['view/policy_view.xml',
+          'view/line_view.xml'],
+ 'demo': [],
+ 'test': [],
+ 'installable': True,
+ 'auto_install': False,
+ 'license': 'AGPL-3',
+ 'application': False,
+}
diff --git a/account_credit_control_dunning_fees/model/__init__.py b/account_credit_control_dunning_fees/model/__init__.py
new file mode 100644
index 000000000..c9a69427a
--- /dev/null
+++ b/account_credit_control_dunning_fees/model/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Nicolas Bessi
+#    Copyright 2014 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from . import line
+from . import policy
+from . import run
+from . import dunning
diff --git a/account_credit_control_dunning_fees/model/dunning.py b/account_credit_control_dunning_fees/model/dunning.py
new file mode 100644
index 000000000..dc383c6dd
--- /dev/null
+++ b/account_credit_control_dunning_fees/model/dunning.py
@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Nicolas Bessi
+#    Copyright 2014 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from openerp.osv import orm
+from openerp.tools.translate import _
+
+
+class FeesComputer(orm.TransientModel):
+    _name = 'credit.control.dunning.fees.computer'
+    _auto = False
+    _log_access = True
+
+    def _get_compute_fun(self, level_fees_type):
+        if level_fees_type == 'fixed':
+            return self.compute_fixed_fees
+        else:
+            raise NotImplementedError('fees type %s is not supported' % level_fees_type)
+
+    def _compute_fees(self, cr, uid, credit_line_ids, context=None):
+        if context is None:
+            context = {}
+        if not credit_line_ids:
+            return credit_line_ids
+        c_model = self.pool['credit.control.line']
+        credit_lines = c_model.browse(cr, uid, credit_line_ids, context=context)
+        for credit in credit_lines:
+            # if there is no dependence between generated credit lines
+            # this could be threaded
+            self._compute(cr, uid, credit, context=context),
+        return credit_line_ids
+
+    def _compute(self, cr, uid, credit_line, context=None):
+        """Compute fees for a given credit line"""
+        fees_type = credit_line.policy_level_id.dunning_fees_type
+        compute = self._get_compute_fun(fees_type)
+        fees = compute(cr, uid, credit_line, context=context)
+        if fees:
+            credit_line.write({'dunning_fees_amount': fees},
+                              context=context)
+
+    def compute_fixed_fees(self, cr, uid, credit_line, context=None):
+        currency_model = self.pool['res.currency']
+        credit_currency = credit_line.currency_id
+        level = credit_line.policy_level_id
+        fees_amount = level.dunning_fixed_amount
+        if not fees_amount:
+            return 0.0
+        fees_currency = level.dunning_currency_id
+        if fees_currency == credit_currency:
+            return fees_amount
+        else:
+            return currency_model.compute(cr, uid, fees_currency.id,
+                                          credit_currency.id, fees_amount,
+                                          context=context)
diff --git a/account_credit_control_dunning_fees/model/line.py b/account_credit_control_dunning_fees/model/line.py
new file mode 100644
index 000000000..9cc853326
--- /dev/null
+++ b/account_credit_control_dunning_fees/model/line.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Nicolas Bessi
+#    Copyright 2014 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from openerp.osv import orm, fields
+
+
+class credit_control_line(orm.Model):
+    """Add fees computations"""
+
+    _inherit = "credit.control.line"
+
+    _columns = {'dunning_fees_amount': fields.float('Fees')}
diff --git a/account_credit_control_dunning_fees/model/policy.py b/account_credit_control_dunning_fees/model/policy.py
new file mode 100644
index 000000000..1cf3c699b
--- /dev/null
+++ b/account_credit_control_dunning_fees/model/policy.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Nicolas Bessi
+#    Copyright 2014 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from openerp.osv import orm, fields
+
+
+class credit_control_policy(orm.Model):
+    """ADD dunning fees fields"""
+
+    _inherit = "credit.control.policy.level"
+    _columns = {'dunning_product_id': fields.many2one('product.product',
+                                                      'Fees Product'),
+                'dunning_fixed_amount': fields.float('Fees Fixed Amount'),
+                'dunning_currency_id': fields.many2one('res.currency',
+                                                       'Fees currency'),
+                # planned type are fixed, percent, compound
+                'dunning_fees_type': fields.selection([('fixed', 'Fixed')])}
+
+    _defaults = {'dunning_fees_type': 'fixed'}
diff --git a/account_credit_control_dunning_fees/model/run.py b/account_credit_control_dunning_fees/model/run.py
new file mode 100644
index 000000000..a01b43f61
--- /dev/null
+++ b/account_credit_control_dunning_fees/model/run.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Nicolas Bessi
+#    Copyright 2014 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from openerp.osv import orm, fields
+
+
+class credit_control_run(orm.Model):
+    """Add computation of fees"""
+
+    _inherit = "credit.control.run"
+
+    def  _generate_credit_lines(self, cr, uid, run_id, context=None):
+
+        credit_line_ids = super(credit_control_run, self)._generate_credit_lines(
+            cr,
+            uid,
+            run_id,
+            context=context
+        )
+        fees_model = self.pool['credit.control.dunning.fees.computer']
+        fees_model._compute_fees(cr, uid, credit_line_ids, context=context)
+        return credit_line_ids
diff --git a/account_credit_control_dunning_fees/tests/__init__.py b/account_credit_control_dunning_fees/tests/__init__.py
new file mode 100644
index 000000000..db75f16d2
--- /dev/null
+++ b/account_credit_control_dunning_fees/tests/__init__.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Nicolas Bessi
+#    Copyright 2014 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from . import test_fees_generation
+
+checks = [test_fees_generation]
diff --git a/account_credit_control_dunning_fees/tests/test_fees_generation.py b/account_credit_control_dunning_fees/tests/test_fees_generation.py
new file mode 100644
index 000000000..bb5ff3609
--- /dev/null
+++ b/account_credit_control_dunning_fees/tests/test_fees_generation.py
@@ -0,0 +1,95 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Nicolas Bessi
+#    Copyright 2014 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from mock import MagicMock
+import openerp.tests.common as test_common
+
+
+class FixedFeesTester(test_common.TransactionCase):
+
+    def setUp(self):
+        """Initialaize level mock to test fees computations"""
+        super(FixedFeesTester, self).setUp()
+        self.currency_model = self.registry('res.currency')
+        self.euro = self.currency_model.search(self.cr, self.uid,
+                                               [('name', '=', 'EUR')])
+        self.assertTrue(self.euro)
+        self.euro = self.registry('res.currency').browse(self.cr,
+                                                         self.uid,
+                                                         self.euro[0])
+
+        self.usd = self.currency_model.search(self.cr, self.uid,
+                                              [('name', '=', 'USD')])
+        self.assertTrue(self.usd)
+        self.usd = self.registry('res.currency').browse(self.cr,
+                                                         self.uid,
+                                                         self.usd[0])
+
+        self.euro_level = MagicMock(name='Euro policy level')
+        self.euro_level.dunning_fixed_amount = 5.0
+        self.euro_level.dunning_currency_id = self.euro
+        self.euro_level.dunning_type = 'fixed'
+
+        self.usd_level = MagicMock(name='Euro policy level')
+        self.usd_level.dunning_fixed_amount = 5.0
+        self.usd_level.dunning_currency_id = self.usd
+        self.usd_level.dunning_type = 'fixed'
+        self.dunning_model = self.registry('credit.control.dunning.fees.computer')
+
+    def test_type_getter(self):
+        """Test that correct compute function is returned for "fixed" type"""
+        c_fun = self.dunning_model._get_compute_fun('fixed')
+        self.assertEqual(c_fun, self.dunning_model.compute_fixed_fees)
+
+    def test_unknow_type(self):
+        """Test that non implemented error is raised if invalide fees type"""
+        with self.assertRaises(NotImplementedError):
+            self.dunning_model._get_compute_fun('bang')
+
+    def test_computation_same_currency(self):
+        """Test that fees are correctly computed with same currency"""
+        credit_line = MagicMock(name='Euro credit line')
+        credit_line.policy_level_id = self.euro_level
+        credit_line.currency_id = self.euro
+        fees = self.dunning_model.compute_fixed_fees(self.cr, self.uid,
+                                                     credit_line,
+                                                     {})
+        self.assertEqual(fees, self.euro_level.dunning_fixed_amount)
+
+    def test_computation_different_currency(self):
+        """Test that fees are correctly computed with different currency"""
+        credit_line = MagicMock(name='USD credit line')
+        credit_line.policy_level_id = self.euro_level
+        credit_line.currency_id = self.usd
+        fees = self.dunning_model.compute_fixed_fees(self.cr, self.uid,
+                                                     credit_line,
+                                                     {})
+        self.assertNotEqual(fees, self.euro_level.dunning_fixed_amount)
+
+    def test_no_fees(self):
+        """Test that fees are not generated if no amount defined on level"""
+        credit_line = MagicMock(name='USD credit line')
+        credit_line.policy_level_id = self.euro_level
+        self.euro_level.dunning_fixed_amount = 0.0
+        credit_line.currency_id = self.usd
+        fees = self.dunning_model.compute_fixed_fees(self.cr, self.uid,
+                                                     credit_line,
+                                                     {})
+        self.assertEqual(fees, 0.0)
diff --git a/account_credit_control_dunning_fees/view/line_view.xml b/account_credit_control_dunning_fees/view/line_view.xml
new file mode 100644
index 000000000..9d4688bd5
--- /dev/null
+++ b/account_credit_control_dunning_fees/view/line_view.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+
+    <record id="add_fees_on_credit_control_line" model="ir.ui.view">
+      <field name="name">add fees on credit control line</field>
+      <field name="model">credit.control.line</field>
+      <field name="inherit_id" ref="account_credit_control.credit_control_line_tree" />
+      <field name="arch" type="xml">
+        <field name="balance_due" position="after">
+          <field name="dunning_fees_amount"
+                 attrs="{'readonly': [('state', '!=', 'draft')]}"/>
+        </field>
+      </field>
+    </record>
+
+    <record id="add_fees_on_credit_control_line_from" model="ir.ui.view">
+      <field name="name">add fees on credit control line form</field>
+      <field name="model">credit.control.line</field>
+      <field name="inherit_id" ref="account_credit_control.credit_control_line_form"/>
+      <field name="arch" type="xml">
+        <field name="balance_due" position="after">
+          <field name="dunning_fees_amount"
+                 attrs="{'readonly': [('state', '!=', 'draft')]}"/>
+        </field>
+      </field>
+    </record>
+
+  </data>
+</openerp>
diff --git a/account_credit_control_dunning_fees/view/policy_view.xml b/account_credit_control_dunning_fees/view/policy_view.xml
new file mode 100644
index 000000000..02e9ac618
--- /dev/null
+++ b/account_credit_control_dunning_fees/view/policy_view.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+    <record id="add_dunning_fees_on_policy" model="ir.ui.view">
+      <field name="name">add dunning fees on policy</field>
+      <field name="model">credit.control.policy</field>
+      <field name="inherit_id" ref="account_credit_control.credit_control_policy_form" />
+      <field name="arch" type="xml">
+        <page string="Mail and reporting" position="after">
+          <page string="Fees">
+            <group>
+              <group>
+                <field name="dunning_fixed_amount"/>
+                <field name="dunning_product_id"
+                       attrs="{'required': [('dunning_fixed_amount', '!=', False)]}"/>
+                <field name="dunning_currency_id"
+                       attrs="{'required': [('dunning_fixed_amount', '!=', False)]}"/>
+              </group>
+            </group>
+          </page>
+        </page>
+      </field>
+    </record>
+
+  </data>
+</openerp>

From b37155d3a752001760c426ec0f20b166be2b9b7b Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Mon, 14 Apr 2014 14:19:41 +0200
Subject: [PATCH 11/57] [ADD] docstring

---
 .../model/dunning.py                          | 52 ++++++++++++++++++-
 .../model/line.py                             |  2 +-
 .../model/run.py                              |  2 +-
 3 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/account_credit_control_dunning_fees/model/dunning.py b/account_credit_control_dunning_fees/model/dunning.py
index dc383c6dd..5400bab97 100644
--- a/account_credit_control_dunning_fees/model/dunning.py
+++ b/account_credit_control_dunning_fees/model/dunning.py
@@ -23,17 +23,47 @@ from openerp.tools.translate import _
 
 
 class FeesComputer(orm.TransientModel):
+    """Model that compute dunnig fees.
+
+    This class does not need any database storage as
+    it contains pure logic.
+
+    It inherits form `TransientModel` to benefit of orm facility
+
+    I could have created a new Class that inherit form BaseModel
+    but it did not look pertinent on this context
+
+    """
+
     _name = 'credit.control.dunning.fees.computer'
     _auto = False
     _log_access = True
 
     def _get_compute_fun(self, level_fees_type):
+        """Retrieve function of class that should compute the fees based on type
+
+        :param level_fee_type: type exisiting in model `credit.control.policy.level`
+                               for field dunning_fees_type
+
+        :returns: a function of class :class:`FeesComputer` with following signature
+                 self, cr, uid, credit_line (record), context
+
+        """
         if level_fees_type == 'fixed':
             return self.compute_fixed_fees
         else:
             raise NotImplementedError('fees type %s is not supported' % level_fees_type)
 
     def _compute_fees(self, cr, uid, credit_line_ids, context=None):
+        """Compute fees for `credit_line_ids` parameter
+
+        Fees amount is writen on credit line in fields dunning_fees_amount
+
+        :param credit_line_ids: list of `credit.control.line` ids
+
+        :returns: `credit_line_ids` list of `credit.control.line` ids
+
+        """
         if context is None:
             context = {}
         if not credit_line_ids:
@@ -47,15 +77,35 @@ class FeesComputer(orm.TransientModel):
         return credit_line_ids
 
     def _compute(self, cr, uid, credit_line, context=None):
-        """Compute fees for a given credit line"""
+        """Compute fees for a given credit line
+
+        Fees amount is writen on credit line in fields dunning_fees_amount
+
+        :param credit_line: credit line record
+
+        :returns: `credit_line` record
+        """
         fees_type = credit_line.policy_level_id.dunning_fees_type
         compute = self._get_compute_fun(fees_type)
         fees = compute(cr, uid, credit_line, context=context)
         if fees:
             credit_line.write({'dunning_fees_amount': fees},
                               context=context)
+        return credit_line
 
     def compute_fixed_fees(self, cr, uid, credit_line, context=None):
+        """Compute fees amount for fixed fees.
+        Correspond to the fixed dunning fees type
+
+        if currency of the fees is not the same as the currency
+        of the credit line, fees amount is converted to
+        currency of credit line.
+
+        :param credit_line: credit line record
+
+        :return: fees amount float (in credit line currency)
+
+        """
         currency_model = self.pool['res.currency']
         credit_currency = credit_line.currency_id
         level = credit_line.policy_level_id
diff --git a/account_credit_control_dunning_fees/model/line.py b/account_credit_control_dunning_fees/model/line.py
index 9cc853326..5e4a3f782 100644
--- a/account_credit_control_dunning_fees/model/line.py
+++ b/account_credit_control_dunning_fees/model/line.py
@@ -22,7 +22,7 @@ from openerp.osv import orm, fields
 
 
 class credit_control_line(orm.Model):
-    """Add fees computations"""
+    """Add dunning_fees_amount_fees field"""
 
     _inherit = "credit.control.line"
 
diff --git a/account_credit_control_dunning_fees/model/run.py b/account_credit_control_dunning_fees/model/run.py
index a01b43f61..2d6585e58 100644
--- a/account_credit_control_dunning_fees/model/run.py
+++ b/account_credit_control_dunning_fees/model/run.py
@@ -27,7 +27,7 @@ class credit_control_run(orm.Model):
     _inherit = "credit.control.run"
 
     def  _generate_credit_lines(self, cr, uid, run_id, context=None):
-
+        """Override method to add fees computation"""
         credit_line_ids = super(credit_control_run, self)._generate_credit_lines(
             cr,
             uid,

From 09bfe1afa4013f86934e808a82a38e1978a4748f Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Mon, 28 Apr 2014 10:42:01 +0200
Subject: [PATCH 12/57] [FIX] FeesComputer model specification to act as a
 abstract class without needing overriding

---
 account_credit_control_dunning_fees/model/dunning.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/account_credit_control_dunning_fees/model/dunning.py b/account_credit_control_dunning_fees/model/dunning.py
index 5400bab97..f780ce2a6 100644
--- a/account_credit_control_dunning_fees/model/dunning.py
+++ b/account_credit_control_dunning_fees/model/dunning.py
@@ -22,22 +22,22 @@ from openerp.osv import orm
 from openerp.tools.translate import _
 
 
-class FeesComputer(orm.TransientModel):
+class FeesComputer(orm.BaseModel):
     """Model that compute dunnig fees.
 
     This class does not need any database storage as
     it contains pure logic.
 
-    It inherits form `TransientModel` to benefit of orm facility
-
-    I could have created a new Class that inherit form BaseModel
-    but it did not look pertinent on this context
+    It inherits form ``orm.BaseModel`` to benefit of orm facility
 
+    Similar to AbstractModel but log access and actions
     """
 
     _name = 'credit.control.dunning.fees.computer'
     _auto = False
     _log_access = True
+    _register = False
+    _transient = False
 
     def _get_compute_fun(self, level_fees_type):
         """Retrieve function of class that should compute the fees based on type

From dfb0f372ac081a40a438fb84e72c9bbd8f6d6125 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Mon, 28 Apr 2014 10:43:19 +0200
Subject: [PATCH 13/57] [IMP] fees column in report and mail

---
 .../__openerp__.py                            |   5 +-
 .../report/credit_control_summary.html.mako   | 246 ++++++++++++++++++
 .../report/report.xml                         |  12 +
 3 files changed, 261 insertions(+), 2 deletions(-)
 create mode 100644 account_credit_control_dunning_fees/report/credit_control_summary.html.mako
 create mode 100644 account_credit_control_dunning_fees/report/report.xml

diff --git a/account_credit_control_dunning_fees/__openerp__.py b/account_credit_control_dunning_fees/__openerp__.py
index 36ceb3944..ce82a897e 100644
--- a/account_credit_control_dunning_fees/__openerp__.py
+++ b/account_credit_control_dunning_fees/__openerp__.py
@@ -53,14 +53,15 @@ on the generated credit lines.
 
 Fees can be manually edited as long credit line is draft
 
-To Come
+Credit control Summary report includes a new fee columns.
 -------
 Support of fees price list
 
 """,
  'website': 'http://www.camptocamp.com',
  'data': ['view/policy_view.xml',
-          'view/line_view.xml'],
+          'view/line_view.xml',
+          'report/report.xml'],
  'demo': [],
  'test': [],
  'installable': True,
diff --git a/account_credit_control_dunning_fees/report/credit_control_summary.html.mako b/account_credit_control_dunning_fees/report/credit_control_summary.html.mako
new file mode 100644
index 000000000..985a93403
--- /dev/null
+++ b/account_credit_control_dunning_fees/report/credit_control_summary.html.mako
@@ -0,0 +1,246 @@
+## -*- coding: utf-8 -*-
+<html>
+  <head>
+    <style type="text/css">
+      ${css}
+body {
+    font-family: helvetica;
+    font-size: 12px;
+}
+
+.custom_text {
+    font-family: helvetica;
+    font-size: 12px;
+}
+
+table {
+    font-family: helvetica;
+    font-size: 12px;
+}
+
+.header {
+    margin-left: 0px;
+    text-align: left;
+    width: 300px;
+    font-size: 12px;
+}
+
+.title {
+    font-size: 16px;
+    font-weight: bold;
+}
+
+.basic_table{
+    text-align: center;
+    border: 1px solid lightGrey;
+    border-collapse: collapse;
+    font-family: helvetica;
+    font-size: 12px;
+}
+
+.basic_table th {
+    border: 1px solid lightGrey;
+    font-size: 11px;
+    font-weight: bold;
+
+}
+
+.basic_table td {
+    border: 1px solid lightGrey;
+    font-size: 12px;
+}
+
+.list_table {
+    border-color: black;
+    text-align: center;
+    border-collapse: collapse;
+}
+
+.list_table td {
+    border-color: gray;
+    border-top: 1px solid gray;
+    text-align: left;
+    font-size: 12px;
+    padding-right: 3px;
+    padding-left: 3px;
+    padding-top: 3px;
+    padding-bottom:3px;
+}
+
+.list_table th {
+    border-bottom: 2px solid black;
+    text-align: left;
+    font-size: 11px;
+    font-weight: bold;
+    padding-right: 3px
+    padding-left: 3px
+}
+
+.list_table thead {
+    display: table-header-group;
+}
+
+.address table {
+    font-size: 11px;
+    border-collapse: collapse;
+    margin: 0px;
+    padding: 0px;
+}
+
+.address .shipping {
+
+}
+
+.address .invoice {
+    margin-top: 10px;
+}
+
+.address .recipient {
+    font-size: 13px;
+    margin-right: 120px;
+    margin-left: 350px;
+    float: right;
+}
+
+
+table .address_title {
+    font-weight: bold;
+}
+
+.address td.name {
+    font-weight: bold;
+}
+
+td.amount, th.amount {
+    text-align: right;
+    padding-right:2px;
+}
+
+h1 {
+    font-size: 16px;
+    font-weight: bold;
+}
+
+tr.line .note {
+    border-style: none;
+    font-size: 9px;
+    padding-left: 10px;
+}
+
+tr.line {
+    margin-bottom: 10px;
+}
+    </style>
+  </head>
+  <body>
+
+    %for comm in objects :
+    <% setLang(comm.get_contact_address().lang) %>
+    <div class="address">
+        <table class="recipient">
+          <%
+             add = comm.get_contact_address()
+          %>
+            %if comm.partner_id.id == add.id:
+              <tr><td class="name">${comm.partner_id.title and comm.partner_id.title.name or ''} ${comm.partner_id.name }</td></tr>
+              <% address_lines = comm.partner_id.contact_address.split("\n") %>
+
+            %else:
+              <tr><td class="name">${comm.partner_id.name or ''}</td></tr>
+              <tr><td>${add.title and add.title.name or ''} ${add.name}</td></tr>
+              <% address_lines = add.contact_address.split("\n")[1:] %>
+            %endif
+            %for part in address_lines:
+                %if part:
+                <tr><td>${part}</td></tr>
+                %endif
+            %endfor
+        </table>
+        <br/>
+        <br/>
+        <br/>
+        <br/>
+
+    </div>
+        <br/>
+        <br/>
+        <br/>
+    <div>
+
+      <h3 style="clear: both; padding-top: 20px;">
+          ${_('Reminder')}: ${comm.current_policy_level.name or '' }
+      </h3>
+
+      <p>${_('Dear')},</p>
+      <p class="custom_text" width="95%">${comm.current_policy_level.custom_text.replace('\n', '<br />')}</p>
+
+      <br/>
+      <br/>
+      <p><b>${_('Summary')}<br/></b></p>
+      <table class="basic_table" style="width: 100%;">
+      <tr>
+        <th width="200">${_('Invoice number')}</th>
+        <th>${_('Invoice date')}</th>
+        <th>${_('Date due')}</th>
+        <th>${_('Invoiced amount')}</th>
+        <th>${_('Open amount')}</th>
+        <th>${_('Fees')}</th>
+        <th>${_('Currency')}</th>
+
+      </tr>
+%for line in comm.credit_control_line_ids:
+      <tr>
+      %if line.invoice_id:
+          <td width="200">${line.invoice_id.number}
+              %if line.invoice_id.name:
+              <br/>
+              ${line.invoice_id.name}
+              %endif
+          </td>
+      %else:
+          <td width="200">${line.move_line_id.name}</td>
+      %endif
+        <td class="date">${line.date_entry}</td>
+        <td class="date">${line.date_due}</td>
+        <td class="amount">${line.amount_due}</td>
+        <td class="amount">${line.balance_due}</td>
+        <td class="amount">${line.dunning_fees_amount}</td>
+        <td class="amount">${line.currency_id.name or comm.company_id.currency_id.name}</td>
+      </tr>
+%endfor
+      </table>
+      <br/>
+      <br/>
+<%doc>
+      <!-- uncomment to have info after summary -->
+      <p>${_('If you have any question, do not hesitate to contact us.')}</p>
+
+      <p>${comm.user_id.name} ${comm.user_id.email and '<%s>'%(comm.user_id.email) or ''}<br/>
+      ${comm.company_id.name}<br/>
+      % if comm.company_id.street:
+      ${comm.company_id.street or ''}<br/>
+
+      % endif
+
+      % if comm.company_id.street2:
+      ${comm.company_id.street2}<br/>
+      % endif
+      % if comm.company_id.city or comm.company_id.zip:
+      ${comm.company_id.zip or ''} ${comm.company_id.city or ''}<br/>
+      % endif
+      % if comm.company_id.country_id:
+      ${comm.company_id.state_id and ('%s, ' % comm.company_id.state_id.name) or ''} ${comm.company_id.country_id.name or ''}<br/>
+      % endif
+      % if comm.company_id.phone:
+      Phone: ${comm.company_id.phone}<br/>
+      % endif
+      % if comm.company_id.website:
+      ${comm.company_id.website or ''}<br/>
+      % endif
+</%doc>
+
+      <p style="page-break-after:always"></p>
+    %endfor
+
+  </body>
+</html>
diff --git a/account_credit_control_dunning_fees/report/report.xml b/account_credit_control_dunning_fees/report/report.xml
new file mode 100644
index 000000000..89a9874a6
--- /dev/null
+++ b/account_credit_control_dunning_fees/report/report.xml
@@ -0,0 +1,12 @@
+<openerp>
+  <data>
+    <report auto="False"
+            id="account_credit_control.report_webkit_html"
+            model="credit.control.communication"
+            name="credit_control_summary"
+            file="account_credit_control_dunning_fees/report/credit_control_summary.html.mako"
+            string="Credit Summary"
+            report_type="webkit"
+            webkit_header="report_webkit.ir_header_webkit_basesample0"/>
+  </data>
+</openerp>

From e1a8f0aa432e66c9efaa40a76fd091b2b5f56ba7 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Mon, 28 Apr 2014 10:59:56 +0200
Subject: [PATCH 14/57] [FIX] multicurrency in communication

We add an aggregation level to aggregate credit_control_line by currency too.
So communication (letter, mail) are aggregated by partner, level, currency
---
 .../wizard/credit_control_communication.py                 | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/account_credit_control/wizard/credit_control_communication.py b/account_credit_control/wizard/credit_control_communication.py
index 4b0e3cdee..7e5677c43 100644
--- a/account_credit_control/wizard/credit_control_communication.py
+++ b/account_credit_control/wizard/credit_control_communication.py
@@ -83,11 +83,12 @@ class CreditCommunication(TransientModel):
         if not line_ids:
             return []
         comms = []
-        sql = ("SELECT distinct partner_id, policy_level_id, credit_control_policy_level.level"
+        sql = ("SELECT distinct partner_id, policy_level_id, "
+               " credit_control_line.currency_id, credit_control_policy_level.level"
                " FROM credit_control_line JOIN credit_control_policy_level "
                "   ON (credit_control_line.policy_level_id = credit_control_policy_level.id)"
                " WHERE credit_control_line.id in %s"
-               " ORDER by credit_control_policy_level.level")
+               " ORDER by credit_control_policy_level.level, credit_control_line.currency_id")
 
         cr.execute(sql, (tuple(line_ids),))
         res = cr.dictfetchall()
@@ -101,8 +102,6 @@ class CreditCommunication(TransientModel):
             data['partner_id'] = level_assoc['partner_id']
             data['current_policy_level'] = level_assoc['policy_level_id']
             comm_id = self.create(cr, uid, data, context=context)
-
-
             comms.append(self.browse(cr, uid, comm_id, context=context))
         return comms
 

From de2fd6ac26a318fb6ec812741113cae7d2476b77 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Mon, 28 Apr 2014 11:01:29 +0200
Subject: [PATCH 15/57] [ADD] docstring

---
 account_credit_control/wizard/credit_control_communication.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/account_credit_control/wizard/credit_control_communication.py b/account_credit_control/wizard/credit_control_communication.py
index 7e5677c43..0121ee330 100644
--- a/account_credit_control/wizard/credit_control_communication.py
+++ b/account_credit_control/wizard/credit_control_communication.py
@@ -80,6 +80,9 @@ class CreditCommunication(TransientModel):
         return cr_l_ids
 
     def _generate_comm_from_credit_line_ids(self, cr, uid, line_ids, context=None):
+        """Aggregate credit control line by partner, level, and currency
+        It also generate a communication object for aggregation.
+        """
         if not line_ids:
             return []
         comms = []

From 60039d1b7d5f3bda179f0b2228e95f24b8cb666f Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Mon, 28 Apr 2014 11:05:18 +0200
Subject: [PATCH 16/57] [TYPO]

---
 account_credit_control/wizard/credit_control_communication.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/account_credit_control/wizard/credit_control_communication.py b/account_credit_control/wizard/credit_control_communication.py
index 0121ee330..2584660dd 100644
--- a/account_credit_control/wizard/credit_control_communication.py
+++ b/account_credit_control/wizard/credit_control_communication.py
@@ -81,7 +81,7 @@ class CreditCommunication(TransientModel):
 
     def _generate_comm_from_credit_line_ids(self, cr, uid, line_ids, context=None):
         """Aggregate credit control line by partner, level, and currency
-        It also generate a communication object for aggregation.
+        It also generate a communication object per aggregation.
         """
         if not line_ids:
             return []

From 0aa8d8e1e7a92839a3a1f4d34d9e8ac9920e53ae Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Mon, 28 Apr 2014 11:23:40 +0200
Subject: [PATCH 17/57] [FIX] credit control run date must not be editable once
 launch

---
 account_credit_control/run_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/account_credit_control/run_view.xml b/account_credit_control/run_view.xml
index 2ca3e6827..59c99b9a5 100644
--- a/account_credit_control/run_view.xml
+++ b/account_credit_control/run_view.xml
@@ -19,7 +19,8 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Credit control run">
-          <field name="date"/>
+          <field name="date"
+                 attrs="{'readonly': [('state', '!=', 'draft')]}"/>
           <newline/>
           <notebook colspan="4">
             <page string="Policies">

From b89ada6a0aca406dc882f8fc32544e01031a9581 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Mon, 28 Apr 2014 11:32:00 +0200
Subject: [PATCH 18/57] [FIX] run date coherence to also test date of run not
 only date of credit lines

---
 account_credit_control/run.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/account_credit_control/run.py b/account_credit_control/run.py
index 05e8915be..817643cd7 100644
--- a/account_credit_control/run.py
+++ b/account_credit_control/run.py
@@ -81,9 +81,13 @@ class CreditControlRun(orm.Model):
 
     def _check_run_date(self, cr, uid, ids, controlling_date, context=None):
         """Ensure that there is no credit line in the future using controlling_date"""
-        line_obj =  self.pool.get('credit.control.line')
-        lines = line_obj.search(cr, uid, [('date', '>', controlling_date)],
-                                order='date DESC', limit=1, context=context)
+        run_obj = self.pool['credit.control.run']
+        lines = run_obj.search(cr, uid, [('date', '>', controlling_date)],
+                               order='date DESC', limit=1, context=context)
+        if not lines:
+            line_obj =  self.pool['credit.control.line']
+            lines = line_obj.search(cr, uid, [('date', '>', controlling_date)],
+                                    order='date DESC', limit=1, context=context)
         if lines:
             line = line_obj.browse(cr, uid, lines[0], context=context)
             raise orm.except_orm(_('Error'),

From 4c67871ac88d53d0da0df82b1776dd4cfa8e6d89 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Mon, 28 Apr 2014 13:18:37 +0200
Subject: [PATCH 19/57] [IMP] redability of error message

---
 account_credit_control/run.py | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/account_credit_control/run.py b/account_credit_control/run.py
index 817643cd7..9a050655b 100644
--- a/account_credit_control/run.py
+++ b/account_credit_control/run.py
@@ -82,17 +82,22 @@ class CreditControlRun(orm.Model):
     def _check_run_date(self, cr, uid, ids, controlling_date, context=None):
         """Ensure that there is no credit line in the future using controlling_date"""
         run_obj = self.pool['credit.control.run']
-        lines = run_obj.search(cr, uid, [('date', '>', controlling_date)],
-                               order='date DESC', limit=1, context=context)
-        if not lines:
-            line_obj =  self.pool['credit.control.line']
-            lines = line_obj.search(cr, uid, [('date', '>', controlling_date)],
-                                    order='date DESC', limit=1, context=context)
+        runs = run_obj.search(cr, uid, [('date', '>', controlling_date)],
+                              order='date DESC', limit=1, context=context)
+        if runs:
+            run = run_obj.browse(cr, uid, runs[0], context=context)
+            raise orm.except_orm(_('Error'),
+                                 _('A run has already been executed more '
+                                   'recently than %s') % (run.date))
+
+        line_obj = self.pool['credit.control.line']
+        lines = line_obj.search(cr, uid, [('date', '>', controlling_date)],
+                                order='date DESC', limit=1, context=context)
         if lines:
             line = line_obj.browse(cr, uid, lines[0], context=context)
             raise orm.except_orm(_('Error'),
-                                 _('A run has already been executed more '
-                                   'recently than %s') % (line.date))
+                                 _('A credit control line more '
+                                   'recent than %s exists') % (line.date))
         return True
 
     def _generate_credit_lines(self, cr, uid, run_id, context=None):
@@ -153,7 +158,7 @@ class CreditControlRun(orm.Model):
         """
         try:
             cr.execute('SELECT id FROM credit_control_run'
-                           ' LIMIT 1 FOR UPDATE NOWAIT')
+                       ' LIMIT 1 FOR UPDATE NOWAIT')
         except Exception as exc:
             # in case of exception openerp will do a rollback for us and free the lock
             raise orm.except_orm(_('Error'),

From e893d20abbc1dff502c17d2a19d71580eb25bd20 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Mon, 28 Apr 2014 13:20:24 +0200
Subject: [PATCH 20/57] [FIX] key in domain. By hazard test where green but it
 was because level (field) and level_id where the same

---
 account_credit_control/line.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/account_credit_control/line.py b/account_credit_control/line.py
index e2c63cf78..09437620e 100644
--- a/account_credit_control/line.py
+++ b/account_credit_control/line.py
@@ -202,7 +202,7 @@ class CreditControlLine(orm.Model):
             previous_draft_ids = self.search(
                 cr, uid,
                 [('move_line_id', '=', line.id),
-                 ('level', '=', level.id),
+                 ('policy_level_id', '=', level.id),
                  ('state', '=', 'draft'),
                  ('id', '!=', line_id)],
                 context=context)

From a73936328800921c0dab1769173bb318fea1dcec Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Mon, 28 Apr 2014 15:38:32 +0200
Subject: [PATCH 21/57] [PEP8]

---
 account_credit_control/line.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/account_credit_control/line.py b/account_credit_control/line.py
index 09437620e..b7767d302 100644
--- a/account_credit_control/line.py
+++ b/account_credit_control/line.py
@@ -143,7 +143,7 @@ class CreditControlLine(orm.Model):
 
     def create_or_update_from_mv_lines(self, cr, uid, ids, lines,
                                        level_id, controlling_date,
-                                       check_tolerance=True,  context=None):
+                                       check_tolerance=True, context=None):
         """Create or update line based on levels
 
         if check_tolerance is true credit line will not be

From 0dd11594bde6f441765c539b57e9d4b78b0a8f08 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Mon, 28 Apr 2014 15:40:36 +0200
Subject: [PATCH 22/57] [IMP] ensure that no credit are generated on refund or
 payment line

---
 account_credit_control/policy.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/account_credit_control/policy.py b/account_credit_control/policy.py
index a01cae83b..8d2a19abf 100644
--- a/account_credit_control/policy.py
+++ b/account_credit_control/policy.py
@@ -42,7 +42,7 @@ class CreditControlPolicy(Model):
                 'account_ids': fields.many2many('account.account',
                                                 string='Accounts',
                                                 required=True,
-                                                domain="[('reconcile', '=', True)]",
+                                                domain="[('type', '=', 'receivable')]",
                                                 help="This policy will be active only"
                                                      " for the selected accounts"),
                 'active': fields.boolean('Active'),
@@ -323,7 +323,8 @@ class CreditControlPolicyLevel(Model):
                # or manually overriden
                # have to be generated again for the previous level
                "                 AND NOT manually_overriden\n"
-               "                 AND state NOT IN ('draft', 'ignored'))")
+               "                 AND state NOT IN ('draft', 'ignored'))"
+               " AND (mv_line.debit IS NOT NULL AND mv_line.debit != 0.0)\n")
         sql += " AND"
         sql += self._get_sql_date_boundary_for_computation_mode(cr, uid, level,
                                                                 controlling_date, context)
@@ -352,6 +353,7 @@ class CreditControlPolicyLevel(Model):
                "                            AND NOT manually_overriden"
                "                              ORDER BY credit_control_line.level desc limit 1)\n"
                " AND cr_line.level = %(previous_level)s\n"
+               " AND (mv_line.debit IS NOT NULL AND mv_line.debit != 0.0)\n"
                # lines from a previous level with a draft or ignored state
                # or manually overriden
                # have to be generated again for the previous level

From 41a1a4eff8c1b7317e9dd4b80ba3bd6fe2fee2e7 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Mon, 28 Apr 2014 15:41:36 +0200
Subject: [PATCH 23/57] [FIX] Manual policy wizard should not be launched
 against customer refund

---
 account_credit_control/wizard/credit_control_policy_changer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/account_credit_control/wizard/credit_control_policy_changer.py b/account_credit_control/wizard/credit_control_policy_changer.py
index 89a331b68..de331c001 100644
--- a/account_credit_control/wizard/credit_control_policy_changer.py
+++ b/account_credit_control/wizard/credit_control_policy_changer.py
@@ -60,7 +60,7 @@ class credit_control_policy_changer(orm.TransientModel):
             return False
             # raise ValueError('No active_ids passed in context')
         for invoice in inv_model.browse(cr, uid, active_ids, context=context):
-            if invoice.type in ('in_invoice', 'in_refund'):
+            if invoice.type in ('in_invoice', 'in_refund', 'out_refund'):
                 raise orm.except_orm(_('User error'),
                                      _('Please use wizard on cutomer invoices'))
 

From ca2f49b15593da812888747d7be2f9d02ff03481 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Mon, 28 Apr 2014 15:42:17 +0200
Subject: [PATCH 24/57] [FIX] view group is missing so no label shown

---
 .../wizard/credit_control_printer_view.xml                  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/account_credit_control/wizard/credit_control_printer_view.xml b/account_credit_control/wizard/credit_control_printer_view.xml
index 021bd242e..b708cbd6e 100644
--- a/account_credit_control/wizard/credit_control_printer_view.xml
+++ b/account_credit_control/wizard/credit_control_printer_view.xml
@@ -9,7 +9,11 @@
         <form string="Lines report" version="7.0">
           <separator string="Print the selected lines" colspan="4"/>
           <newline/>
-          <field name="mark_as_sent" colspan="4" attrs="{'invisible': [('state', '=', 'done')]}"/>
+          <group>
+            <field name="mark_as_sent"
+                   colspan="4"
+                   attrs="{'invisible': [('state', '=', 'done')]}"/>
+          </group>
           <newline/>
           <notebook>
             <page string="Lines" attrs="{'invisible': [('state', '=', 'done')]}">

From 52132749fcdc7e77f729fa259138dbd2d68edf50 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Mon, 28 Apr 2014 15:42:40 +0200
Subject: [PATCH 25/57] [IMP] better error message

---
 account_credit_control/run.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/account_credit_control/run.py b/account_credit_control/run.py
index 9a050655b..91b4f63ba 100644
--- a/account_credit_control/run.py
+++ b/account_credit_control/run.py
@@ -97,7 +97,8 @@ class CreditControlRun(orm.Model):
             line = line_obj.browse(cr, uid, lines[0], context=context)
             raise orm.except_orm(_('Error'),
                                  _('A credit control line more '
-                                   'recent than %s exists') % (line.date))
+                                   'recent than %s exists at %s') %
+                                 (controlling_date, line.date))
         return True
 
     def _generate_credit_lines(self, cr, uid, run_id, context=None):
@@ -123,7 +124,6 @@ class CreditControlRun(orm.Model):
         for policy in policies:
             if policy.do_nothing:
                 continue
-
             lines = policy._get_move_lines_to_process(run.date, context=context)
             manual_lines = policy._lines_different_policy(lines, context=context)
             lines.difference_update(manual_lines)

From a3215170682acd932ff0a5f7fdcab523f6e2e476 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Tue, 29 Apr 2014 11:06:09 +0200
Subject: [PATCH 26/57] [IMP] new constraint to ensure a filtering mechanisme
 between account and policies

---
 account_credit_control/partner.py | 48 +++++++++++++++++++++++--------
 account_credit_control/policy.py  | 29 ++++++++++++++++---
 2 files changed, 61 insertions(+), 16 deletions(-)

diff --git a/account_credit_control/partner.py b/account_credit_control/partner.py
index 0e4605081..3887180fe 100644
--- a/account_credit_control/partner.py
+++ b/account_credit_control/partner.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 from openerp.osv import orm, fields
+from openerp.tools.translate import _
 
 
 class ResPartner(orm.Model):
@@ -28,21 +29,44 @@ class ResPartner(orm.Model):
     _inherit = "res.partner"
 
     _columns = {
-        'credit_policy_id':
-            fields.many2one('credit.control.policy',
-                            'Credit Control Policy',
-                            help=("The Credit Control Policy used for this "
-                                  "partner. This setting can be forced on the "
-                                  "invoice. If nothing is defined, it will use "
-                                  "the company setting.")),
-        'credit_control_line_ids':
-            fields.one2many('credit.control.line',
-                            'invoice_id',
-                            string='Credit Control Lines',
-                            readonly=True)
+        'credit_policy_id': fields.many2one(
+            'credit.control.policy',
+            'Credit Control Policy',
+            domain="[('account_ids', 'in', property_account_receivable)]",
+            help=("The Credit Control Policy used for this "
+                  "partner. This setting can be forced on the "
+                  "invoice. If nothing is defined, it will use "
+                  "the company setting.")
+        ),
+        'credit_control_line_ids': fields.one2many(
+            'credit.control.line',
+            'invoice_id',
+            string='Credit Control Lines',
+            readonly=True
+        )
     }
 
+    def _check_credit_policy(self, cr, uid, part_ids, context=None):
+        """Ensure that policy on partner are limited to the account policy"""
+        if isinstance(part_ids, (int, long)):
+            part_ids = [part_ids]
+        policy_obj = self.pool['credit.control.policy']
+        for partner in self.browse(cr, uid, part_ids, context):
+            account = partner.property_account_receivable
+            policy_obj.check_policy_against_account(
+                cr, uid,
+                account.id,
+                partner.credit_policy_id.id,
+                context=context
+            )
+        return True
+
+    _constraints = [(_check_credit_policy,
+                     'The policy must be related to the receivable account',
+                     ['credit_policy_id'])]
+
     def copy_data(self, cr, uid, id, default=None, context=None):
+        """Remove credit lines when copying partner"""
         if default is None:
             default = {}
         else:
diff --git a/account_credit_control/policy.py b/account_credit_control/policy.py
index 8d2a19abf..194a48d59 100644
--- a/account_credit_control/policy.py
+++ b/account_credit_control/policy.py
@@ -18,11 +18,11 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from openerp.osv.orm import Model, fields
+from openerp.osv import orm, fields
 from openerp.tools.translate import _
 
 
-class CreditControlPolicy(Model):
+class CreditControlPolicy(orm.Model):
     """Define a policy of reminder"""
 
     _name = "credit.control.policy"
@@ -103,7 +103,10 @@ class CreditControlPolicy(Model):
         my_obj = self.pool.get(model)
         move_l_obj = self.pool.get('account.move.line')
 
-        default_domain = self._move_lines_domain(cr, uid, policy, controlling_date, context=context)
+        default_domain = self._move_lines_domain(cr, uid,
+                                                 policy,
+                                                 controlling_date,
+                                                 context=context)
         to_add_ids = set()
         to_remove_ids = set()
 
@@ -206,8 +209,26 @@ class CreditControlPolicy(Model):
             different_lines.update([x[0] for x in res])
         return different_lines
 
+    def check_policy_against_account(self, cr, uid, account_id, policy_id,
+                                     context=None):
+        """Ensure that policy correspond to account relation"""
+        policy = self.browse(cr, uid, policy_id, context=context)
+        account = self.pool['account.account'].browse(cr, uid, account_id,
+                                                      context=context)
+        policies_id = self.search(cr, uid, [],
+                                  context=context)
+        policies = self.browse(cr, uid, policies_id, context=context)
+        allowed = [x for x in policies if
+                   account in x.account_ids or x.do_nothing]
+        if policy not in allowed:
+            allowed_names = u"\n".join(x.name for x in allowed)
+            raise orm.except_orm(
+                _('You can only use a policy set on  account %s') % account.name,
+                _("Please choose one of the following policies:\n %s") % allowed_names)
+        return True
 
-class CreditControlPolicyLevel(Model):
+
+class CreditControlPolicyLevel(orm.Model):
     """Define a policy level. A level allows to determine if
     a move line is due and the level of overdue of the line"""
 

From 6a4eebd9e67e729cc05093fd169a19a035abf35f Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Tue, 29 Apr 2014 11:23:42 +0200
Subject: [PATCH 27/57] [ADD] account, policy constraint on policy changer

---
 .../wizard/credit_control_policy_changer.py      | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/account_credit_control/wizard/credit_control_policy_changer.py b/account_credit_control/wizard/credit_control_policy_changer.py
index de331c001..ec339fc8d 100644
--- a/account_credit_control/wizard/credit_control_policy_changer.py
+++ b/account_credit_control/wizard/credit_control_policy_changer.py
@@ -100,6 +100,17 @@ class credit_control_policy_changer(orm.TransientModel):
                             {'credit_policy_id': policy_level.policy_id.id},
                             context=context)
 
+    def _check_accounts_policies(self, cr, uid, lines, policy, context=None):
+        policy_obj = self.pool['credit.control.policy']
+        for line in lines:
+            policy_obj.check_policy_against_account(
+                cr, uid,
+                line.account_id.id,
+                policy.id,
+                context=context
+            )
+        return True
+
     def set_new_policy(self, cr, uid, wizard_id, context=None):
         """Set new policy on an invoice.
 
@@ -118,6 +129,11 @@ class credit_control_policy_changer(orm.TransientModel):
         ui_act_model = self.pool['ir.actions.act_window']
         wizard = self.browse(cr, uid, wizard_id, context=context)
         controlling_date = fields.date.today()
+        self._check_accounts_policies(
+            cr,
+            uid,
+            wizard.move_line_ids,
+            wizard.new_policy_level_id.policy_id)
         self._mark_as_overriden(cr,
                                 uid,
                                 wizard.move_line_ids,

From 8cdf59c1719979f310c5584e9952465bf29604be Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Tue, 29 Apr 2014 13:37:01 +0200
Subject: [PATCH 28/57] [ADD] constraint management on credit level changer
 wizard It nows support no follow policy and ensure coherence between account
 and policies

---
 .../wizard/credit_control_policy_changer.py   | 46 ++++++++++++-------
 .../credit_control_policy_changer_view.xml    |  8 +++-
 2 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/account_credit_control/wizard/credit_control_policy_changer.py b/account_credit_control/wizard/credit_control_policy_changer.py
index ec339fc8d..d6678cffb 100644
--- a/account_credit_control/wizard/credit_control_policy_changer.py
+++ b/account_credit_control/wizard/credit_control_policy_changer.py
@@ -23,6 +23,7 @@ from openerp.tools.translate import _
 from openerp.osv import orm, fields
 logger = logging.getLogger(__name__)
 
+
 class credit_control_policy_changer(orm.TransientModel):
     """Wizard that is run from invoices and allows to set manually a policy
     Policy are actually apply to related move lines availabe
@@ -32,11 +33,12 @@ class credit_control_policy_changer(orm.TransientModel):
     _name = "credit.control.policy.changer"
     _columns = {
         'new_policy_id': fields.many2one('credit.control.policy',
-                                      'New Policy to Apply',
-                                      required=True),
+                                         'New Policy to Apply',
+                                         required=True),
         'new_policy_level_id': fields.many2one('credit.control.policy.level',
-                                            'New level to apply',
-                                            required=True),
+                                               'New level to apply'),
+        # Only used to provide dynamic filtering on form
+        'do_nothing': fields.boolean('No follow  policy'),
         'move_line_ids': fields.many2many('account.move.line',
                                           rel='credit_changer_ml_rel',
                                           string='Move line to change'),
@@ -73,6 +75,14 @@ class credit_control_policy_changer(orm.TransientModel):
 
     _defaults = {'move_line_ids': _get_default_lines}
 
+    def onchange_policy_id(self, cr, uid, ids, new_policy_id, context=None):
+        if not new_policy_id:
+            return {}
+        policy = self.pool['credit.control.policy'].browse(cr, uid,
+                                                           new_policy_id,
+                                                           context=context)
+        return {'value': {'do_nothing': policy.do_nothing}}
+
     def _mark_as_overriden(self, cr, uid, move_lines, context=None):
         """Mark `move_lines` related credit control line as overriden
         This is done by setting manually_overriden fields to True
@@ -91,13 +101,13 @@ class credit_control_policy_changer(orm.TransientModel):
                            context)
         return credits_ids
 
-    def _set_invoice_policy(self, cr, uid, move_line_ids, policy_level,
+    def _set_invoice_policy(self, cr, uid, move_line_ids, policy,
                             context=None):
         """Force policy on invoice"""
         invoice_model = self.pool['account.invoice']
         invoice_ids = set([x.invoice.id for x in move_line_ids if x.invoice])
         invoice_model.write(cr, uid, list(invoice_ids),
-                            {'credit_policy_id': policy_level.policy_id.id},
+                            {'credit_policy_id': policy.id},
                             context=context)
 
     def _check_accounts_policies(self, cr, uid, lines, policy, context=None):
@@ -133,7 +143,7 @@ class credit_control_policy_changer(orm.TransientModel):
             cr,
             uid,
             wizard.move_line_ids,
-            wizard.new_policy_level_id.policy_id)
+            wizard.new_policy_id)
         self._mark_as_overriden(cr,
                                 uid,
                                 wizard.move_line_ids,
@@ -143,18 +153,22 @@ class credit_control_policy_changer(orm.TransientModel):
         # if same level as the new one
         # As it is a manual action
         # We also ignore rounding tolerance
-        generated_ids = credit_line_model.create_or_update_from_mv_lines(
-            cr, uid, [],
-            [x.id for x in wizard.move_line_ids],
-            wizard.new_policy_level_id.id,
-            controlling_date,
-            check_tolerance=False,
-            context=None
-        )
+        generated_ids = None
+        if not wizard.new_policy_id.do_nothing:
+            generated_ids = credit_line_model.create_or_update_from_mv_lines(
+                cr, uid, [],
+                [x.id for x in wizard.move_line_ids],
+                wizard.new_policy_level_id.id,
+                controlling_date,
+                check_tolerance=False,
+                context=None
+            )
         self._set_invoice_policy(cr, uid,
                                  wizard.move_line_ids,
-                                 wizard.new_policy_level_id,
+                                 wizard.new_policy_id,
                                  context=context)
+        if not generated_ids:
+            return {}
         view_id = ir_model.get_object_reference(cr, uid,
                                                 "account_credit_control",
                                                 "credit_control_line_action")
diff --git a/account_credit_control/wizard/credit_control_policy_changer_view.xml b/account_credit_control/wizard/credit_control_policy_changer_view.xml
index ae383d8ec..61a81db63 100644
--- a/account_credit_control/wizard/credit_control_policy_changer_view.xml
+++ b/account_credit_control/wizard/credit_control_policy_changer_view.xml
@@ -11,9 +11,13 @@
           <newline/>
          <group>
            <group>
-             <field name="new_policy_id"/>
+             <field name="new_policy_id"
+                    on_change="onchange_policy_id(new_policy_id)"/>
+             <field name="do_nothing"
+                    invisible="1"/>
              <field name="new_policy_level_id"
-                    domain="[('policy_id', '=', new_policy_id)]"/>
+                    domain="[('policy_id', '=', new_policy_id)]"
+                    attrs="{'required': [('do_nothing', '=', False)]}"/>
            </group>
            <group></group>
          </group>

From 210c1487805293983867f49a3af586bd902f2e96 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Tue, 29 Apr 2014 13:39:18 +0200
Subject: [PATCH 29/57] [IMP] Invoice credit control policy field is now
 readonly

---
 account_credit_control/account.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/account_credit_control/account.py b/account_credit_control/account.py
index 9e8011b0b..d09b646f6 100644
--- a/account_credit_control/account.py
+++ b/account_credit_control/account.py
@@ -55,7 +55,8 @@ class AccountInvoice(orm.Model):
                             help=("The Credit Control Policy used for this "
                                   "invoice. If nothing is defined, it will "
                                   "use the account setting or the partner "
-                                  "setting.")
+                                  "setting."),
+                            readonly=True,
                             ),
         'credit_control_line_ids':
             fields.one2many('credit.control.line',

From 9d5ffb85fee3bd93eacd3195677ecfed5b9cfb37 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Tue, 29 Apr 2014 13:42:04 +0200
Subject: [PATCH 30/57] [REFACTOR] move code related to invoice into invoice.py
 module

---
 account_credit_control/account.py | 32 -------------------------------
 account_credit_control/invoice.py | 29 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/account_credit_control/account.py b/account_credit_control/account.py
index d09b646f6..edaac3e17 100644
--- a/account_credit_control/account.py
+++ b/account_credit_control/account.py
@@ -42,35 +42,3 @@ class AccountAccount(orm.Model):
         default['credit_control_line_ids'] = False
         return super(AccountAccount, self).copy_data(
             cr, uid, id, default=default, context=context)
-
-
-class AccountInvoice(orm.Model):
-    """Add a link to a credit control policy on account.account"""
-
-    _inherit = "account.invoice"
-    _columns = {
-        'credit_policy_id':
-            fields.many2one('credit.control.policy',
-                            'Credit Control Policy',
-                            help=("The Credit Control Policy used for this "
-                                  "invoice. If nothing is defined, it will "
-                                  "use the account setting or the partner "
-                                  "setting."),
-                            readonly=True,
-                            ),
-        'credit_control_line_ids':
-            fields.one2many('credit.control.line',
-                            'invoice_id',
-                            string='Credit Lines',
-                            readonly=True),
-        }
-
-    def copy_data(self, cr, uid, id, default=None, context=None):
-        if default is None:
-            default = {}
-        else:
-            default = default.copy()
-        default = default.copy()
-        default['credit_control_line_ids'] = False
-        return super(AccountInvoice, self).copy_data(
-            cr, uid, id, default=default, context=context)
diff --git a/account_credit_control/invoice.py b/account_credit_control/invoice.py
index c296854ea..98b730b11 100644
--- a/account_credit_control/invoice.py
+++ b/account_credit_control/invoice.py
@@ -26,7 +26,36 @@ class AccountInvoice(orm.Model):
     """Check on cancelling of an invoice"""
     _inherit = 'account.invoice'
 
+    _columns = {
+        'credit_policy_id':
+            fields.many2one('credit.control.policy',
+                            'Credit Control Policy',
+                            help=("The Credit Control Policy used for this "
+                                  "invoice. If nothing is defined, it will "
+                                  "use the account setting or the partner "
+                                  "setting."),
+                            readonly=True,
+                            ),
+        'credit_control_line_ids':
+            fields.one2many('credit.control.line',
+                            'invoice_id',
+                            string='Credit Lines',
+                            readonly=True),
+        }
+
+    def copy_data(self, cr, uid, id, default=None, context=None):
+        """Ensure that credit lines are not duplicated when copy"""
+        if default is None:
+            default = {}
+        else:
+            default = default.copy()
+        default = default.copy()
+        default['credit_control_line_ids'] = False
+        return super(AccountInvoice, self).copy_data(
+            cr, uid, id, default=default, context=context)
+
     def action_cancel(self, cr, uid, ids, context=None):
+        """Prevent to cancel invoice related to credit line"""
         # We will search if this invoice is linked with credit
         cc_line_obj = self.pool.get('credit.control.line')
         for invoice_id in ids:

From cc0953824ffc8421ced83ebdaca208b52859b6e3 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Tue, 29 Apr 2014 13:43:35 +0200
Subject: [PATCH 31/57] [FIX] copy of account invoice did not reset related 
 policy

---
 account_credit_control/invoice.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/account_credit_control/invoice.py b/account_credit_control/invoice.py
index 98b730b11..a8e90f024 100644
--- a/account_credit_control/invoice.py
+++ b/account_credit_control/invoice.py
@@ -44,13 +44,14 @@ class AccountInvoice(orm.Model):
         }
 
     def copy_data(self, cr, uid, id, default=None, context=None):
-        """Ensure that credit lines are not duplicated when copy"""
+        """Ensure that credit lines and policcy are not copied"""
         if default is None:
             default = {}
         else:
             default = default.copy()
         default = default.copy()
         default['credit_control_line_ids'] = False
+        default['credit_policy_id'] = False
         return super(AccountInvoice, self).copy_data(
             cr, uid, id, default=default, context=context)
 

From f07b3f4ed6ecae56544b5596e598f8378ee90a31 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Tue, 29 Apr 2014 13:48:48 +0200
Subject: [PATCH 32/57] [FIX] missing import

---
 account_credit_control/invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/account_credit_control/invoice.py b/account_credit_control/invoice.py
index a8e90f024..d361f7a2e 100644
--- a/account_credit_control/invoice.py
+++ b/account_credit_control/invoice.py
@@ -18,7 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from openerp.osv import orm
+from openerp.osv import orm, fields
 from openerp.tools.translate import _
 
 

From 98f7b3f3cdf154e34b124b968a2c168d57323ba0 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Tue, 29 Apr 2014 13:49:00 +0200
Subject: [PATCH 33/57] [PEP(]

---
 account_credit_control/account.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/account_credit_control/account.py b/account_credit_control/account.py
index edaac3e17..7a2ef4071 100644
--- a/account_credit_control/account.py
+++ b/account_credit_control/account.py
@@ -27,11 +27,11 @@ class AccountAccount(orm.Model):
     _inherit = "account.account"
 
     _columns = {
-        'credit_control_line_ids':
-            fields.one2many('credit.control.line',
-                            'account_id',
-                            string='Credit Lines',
-                            readonly=True),
+        'credit_control_line_ids': fields.one2many(
+            'credit.control.line',
+            'account_id',
+            string='Credit Lines',
+            readonly=True),
         }
 
     def copy_data(self, cr, uid, id, default=None, context=None):

From 35e40f9c43191478434ef219ad7113fb164553b3 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Tue, 29 Apr 2014 14:34:05 +0200
Subject: [PATCH 34/57] [ADD] credit line default order

---
 account_credit_control/line.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/account_credit_control/line.py b/account_credit_control/line.py
index b7767d302..7d64123fd 100644
--- a/account_credit_control/line.py
+++ b/account_credit_control/line.py
@@ -38,9 +38,11 @@ class CreditControlLine(orm.Model):
     _name = "credit.control.line"
     _description = "A credit control line"
     _rec_name = "id"
-
+    _order = "date DESC"
     _columns = {
-        'date': fields.date('Controlling date', required=True),
+        'date': fields.date('Controlling date',
+                            required=True,
+                            select=True),
         # maturity date of related move line we do not use a related field in order to
         # allow manual changes
         'date_due': fields.date('Due date',

From c40a0d15fdc27904483bc955cd574d8eeb575de2 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Tue, 29 Apr 2014 14:37:27 +0200
Subject: [PATCH 35/57] [FIX] missing label in search views

---
 account_credit_control/line_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/account_credit_control/line_view.xml b/account_credit_control/line_view.xml
index 0d4e7c0b8..f1a1c6898 100644
--- a/account_credit_control/line_view.xml
+++ b/account_credit_control/line_view.xml
@@ -33,7 +33,7 @@
       <field name="type">search</field>
       <field name="arch" type="xml">
         <search string="Control Credit Lines">
-          <group>
+          <group string="Filters">
             <filter name="filter_draft" icon="terp-mail-message-new"
                     string="Draft" domain="[('state', '=', 'draft')]"
                     help="Draft lines have to be triaged."/>

From 5a25e61622624394ed5aea8b54813e3b620898da Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Tue, 29 Apr 2014 16:56:52 +0200
Subject: [PATCH 36/57] [FIX] name of credit report generated file

---
 account_credit_control/wizard/credit_control_printer.py    | 5 ++++-
 .../wizard/credit_control_printer_view.xml                 | 7 ++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/account_credit_control/wizard/credit_control_printer.py b/account_credit_control/wizard/credit_control_printer.py
index c67f908aa..5eecad4c6 100644
--- a/account_credit_control/wizard/credit_control_printer.py
+++ b/account_credit_control/wizard/credit_control_printer.py
@@ -43,6 +43,7 @@ class CreditControlPrinter(orm.TransientModel):
         'mark_as_sent': fields.boolean('Mark letter lines as sent',
                                        help="Only letter lines will be marked."),
         'report_file': fields.binary('Generated Report', readonly=True),
+        'report_name': fields.char('Report name'),
         'state': fields.char('state', size=32),
         'line_ids': fields.many2many(
             'credit.control.line',
@@ -78,7 +79,9 @@ class CreditControlPrinter(orm.TransientModel):
                                                              context=context)
         report_file = comm_obj._generate_report(cr, uid, comms, context=context)
 
-        form.write({'report_file': base64.b64encode(report_file), 'state': 'done'})
+        form.write({'report_file': base64.b64encode(report_file),
+                    'report_name': 'credit_control_letters_%s.pdf' % form.id,
+                    'state': 'done'})
 
         if form.mark_as_sent:
             comm_obj._mark_credit_line_as_sent(cr, uid, comms, context=context)
diff --git a/account_credit_control/wizard/credit_control_printer_view.xml b/account_credit_control/wizard/credit_control_printer_view.xml
index b708cbd6e..64b4c249c 100644
--- a/account_credit_control/wizard/credit_control_printer_view.xml
+++ b/account_credit_control/wizard/credit_control_printer_view.xml
@@ -21,7 +21,12 @@
             attrs="{'invisible': [('state', '=', 'done')]}" />
             </page>
           </notebook>
-          <field name="report_file" colspan="4" attrs="{'invisible': [('state', '!=', 'done')]}"/>
+          <field name="report_name"
+                 invisible="1"/>
+          <field name="report_file"
+                 colspan="4"
+                 filename="report_name"
+                 attrs="{'invisible': [('state', '!=', 'done')]}"/>
           <field name="state" invisible="1" />
           <newline/>
           <footer>

From 79928995aabc832c4744adf1a367046c1a46211b Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Tue, 29 Apr 2014 16:57:27 +0200
Subject: [PATCH 37/57] [FIX] dunning fees computer to register itself

---
 account_credit_control_dunning_fees/model/dunning.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/account_credit_control_dunning_fees/model/dunning.py b/account_credit_control_dunning_fees/model/dunning.py
index f780ce2a6..6e8a91f32 100644
--- a/account_credit_control_dunning_fees/model/dunning.py
+++ b/account_credit_control_dunning_fees/model/dunning.py
@@ -36,7 +36,7 @@ class FeesComputer(orm.BaseModel):
     _name = 'credit.control.dunning.fees.computer'
     _auto = False
     _log_access = True
-    _register = False
+    _register = True
     _transient = False
 
     def _get_compute_fun(self, level_fees_type):

From 882b969d44a29faf73c9e6c5c7e0b21a258d12a1 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Tue, 29 Apr 2014 17:12:42 +0200
Subject: [PATCH 38/57] [IMP] file name to use datetime

---
 account_credit_control/wizard/credit_control_printer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/account_credit_control/wizard/credit_control_printer.py b/account_credit_control/wizard/credit_control_printer.py
index 5eecad4c6..3d67ec66b 100644
--- a/account_credit_control/wizard/credit_control_printer.py
+++ b/account_credit_control/wizard/credit_control_printer.py
@@ -80,7 +80,7 @@ class CreditControlPrinter(orm.TransientModel):
         report_file = comm_obj._generate_report(cr, uid, comms, context=context)
 
         form.write({'report_file': base64.b64encode(report_file),
-                    'report_name': 'credit_control_letters_%s.pdf' % form.id,
+                    'report_name': 'credit_control_esr_bvr_%s.pdf' % fields.datetime.now(),
                     'state': 'done'})
 
         if form.mark_as_sent:

From 94a9aac73a384dea5d26135594234c1c07b2dbc8 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Tue, 6 May 2014 13:33:21 +0200
Subject: [PATCH 39/57] [FIX] credit control partner constraint to allows
 creation of partner

---
 account_credit_control/partner.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/account_credit_control/partner.py b/account_credit_control/partner.py
index 3887180fe..078e2da51 100644
--- a/account_credit_control/partner.py
+++ b/account_credit_control/partner.py
@@ -52,6 +52,9 @@ class ResPartner(orm.Model):
             part_ids = [part_ids]
         policy_obj = self.pool['credit.control.policy']
         for partner in self.browse(cr, uid, part_ids, context):
+            if not partner.property_account_receivable or \
+               not partner.credit_policy_id:
+                return True
             account = partner.property_account_receivable
             policy_obj.check_policy_against_account(
                 cr, uid,

From c945621a56e8e895a925ba896850ed6bfb250ec1 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Wed, 7 May 2014 09:42:59 +0200
Subject: [PATCH 40/57] [FIX] test in credit scenario use set instead list in
 comparison

---
 .../scenarios/features/steps/account_credit_control.py          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/account_credit_control/scenarios/features/steps/account_credit_control.py b/account_credit_control/scenarios/features/steps/account_credit_control.py
index 2bceb1d9b..f8718e7c0 100644
--- a/account_credit_control/scenarios/features/steps/account_credit_control.py
+++ b/account_credit_control/scenarios/features/steps/account_credit_control.py
@@ -142,4 +142,4 @@ def impl(ctx, partner, number, level, move_line_name, amount):
                                                     ('state', 'in', ('draft', 'ignored'))])
     assert_equal(len(to_check), int(number), msg="More than %s found" % number)
     lines = model('credit.control.line').browse(to_check)
-    assert ['ignored', 'draft'] == lines.state
+    assert set(['ignored', 'draft']) == set(lines.state)

From 18f03e4e47b8146adf14804e20d8e851b1badc98 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Wed, 7 May 2014 13:33:41 +0200
Subject: [PATCH 41/57] [RM] unused import

---
 account_credit_control_dunning_fees/model/dunning.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/account_credit_control_dunning_fees/model/dunning.py b/account_credit_control_dunning_fees/model/dunning.py
index 6e8a91f32..fe14c1479 100644
--- a/account_credit_control_dunning_fees/model/dunning.py
+++ b/account_credit_control_dunning_fees/model/dunning.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 from openerp.osv import orm
-from openerp.tools.translate import _
 
 
 class FeesComputer(orm.BaseModel):

From d0ff71253cd66d5b255a842de6e858d0b7c82008 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Wed, 7 May 2014 13:34:33 +0200
Subject: [PATCH 42/57] [PEP8]

---
 .../tests/test_fees_generation.py                           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 bb5ff3609..b26326ef7 100644
--- a/account_credit_control_dunning_fees/tests/test_fees_generation.py
+++ b/account_credit_control_dunning_fees/tests/test_fees_generation.py
@@ -25,7 +25,7 @@ import openerp.tests.common as test_common
 class FixedFeesTester(test_common.TransactionCase):
 
     def setUp(self):
-        """Initialaize level mock to test fees computations"""
+        """Initialaize credit control level mock to test fees computations"""
         super(FixedFeesTester, self).setUp()
         self.currency_model = self.registry('res.currency')
         self.euro = self.currency_model.search(self.cr, self.uid,
@@ -39,8 +39,8 @@ class FixedFeesTester(test_common.TransactionCase):
                                               [('name', '=', 'USD')])
         self.assertTrue(self.usd)
         self.usd = self.registry('res.currency').browse(self.cr,
-                                                         self.uid,
-                                                         self.usd[0])
+                                                        self.uid,
+                                                        self.usd[0])
 
         self.euro_level = MagicMock(name='Euro policy level')
         self.euro_level.dunning_fixed_amount = 5.0

From b4ddaddff304cca2c04f0f0ca08aa2150acd3de1 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Wed, 7 May 2014 13:36:06 +0200
Subject: [PATCH 43/57] [IMP] module documentation

---
 account_credit_control_dunning_fees/__openerp__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/account_credit_control_dunning_fees/__openerp__.py b/account_credit_control_dunning_fees/__openerp__.py
index ce82a897e..d219bb7ce 100644
--- a/account_credit_control_dunning_fees/__openerp__.py
+++ b/account_credit_control_dunning_fees/__openerp__.py
@@ -36,7 +36,7 @@ Configuration
 -------------
 For release 0.1 only fixed fees are supported.
 
-You can specifiy a fees fixed a product and a currency
+You can specifiy a fixed fees amount, a product and a currency
 on the credit control level form.
 
 The amount will be used as fees values the currency will determine
@@ -53,7 +53,7 @@ on the generated credit lines.
 
 Fees can be manually edited as long credit line is draft
 
-Credit control Summary report includes a new fee columns.
+Credit control Summary report includes a new fees column.
 -------
 Support of fees price list
 

From 85aa1ba5aa55a5c0ff8ecfd170c8f672ca4844b2 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Wed, 7 May 2014 13:49:48 +0200
Subject: [PATCH 44/57] [ADD] dunniing fees translations

---
 .../account_credit_control_dunning_fees.pot   | 81 +++++++++++++++++++
 .../i18n/fr.po                                | 80 ++++++++++++++++++
 2 files changed, 161 insertions(+)
 create mode 100644 account_credit_control_dunning_fees/i18n/account_credit_control_dunning_fees.pot
 create mode 100644 account_credit_control_dunning_fees/i18n/fr.po

diff --git a/account_credit_control_dunning_fees/i18n/account_credit_control_dunning_fees.pot b/account_credit_control_dunning_fees/i18n/account_credit_control_dunning_fees.pot
new file mode 100644
index 000000000..6282315c6
--- /dev/null
+++ b/account_credit_control_dunning_fees/i18n/account_credit_control_dunning_fees.pot
@@ -0,0 +1,81 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_credit_control_dunning_fees
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-05-07 11:44+0000\n"
+"PO-Revision-Date: 2014-05-07 11:44+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_credit_control_dunning_fees
+#: code:_description:0
+#: model:ir.model,name:account_credit_control_dunning_fees.model_credit_control_line
+#, python-format
+msgid "A credit control line"
+msgstr ""
+
+#. module: account_credit_control_dunning_fees
+#: code:_description:0
+#: model:ir.model,name:account_credit_control_dunning_fees.model_credit_control_policy_level
+#, python-format
+msgid "A credit control policy level"
+msgstr ""
+
+#. module: account_credit_control_dunning_fees
+#: code:_description:0
+#: model:ir.model,name:account_credit_control_dunning_fees.model_credit_control_run
+#, python-format
+msgid "Credit control line generator"
+msgstr ""
+
+#. module: account_credit_control_dunning_fees
+#: field:credit.control.line,dunning_fees_amount:0
+#: view:credit.control.policy:0
+msgid "Fees"
+msgstr ""
+
+#. module: account_credit_control_dunning_fees
+#: field:credit.control.policy.level,dunning_fixed_amount:0
+msgid "Fees Fixed Amount"
+msgstr ""
+
+#. module: account_credit_control_dunning_fees
+#: field:credit.control.policy.level,dunning_product_id:0
+msgid "Fees Product"
+msgstr ""
+
+#. module: account_credit_control_dunning_fees
+#: field:credit.control.policy.level,dunning_currency_id:0
+msgid "Fees currency"
+msgstr ""
+
+#. module: account_credit_control_dunning_fees
+#: selection:credit.control.policy.level,dunning_fees_type:0
+msgid "Fixed"
+msgstr ""
+
+#. module: account_credit_control_dunning_fees
+#: view:credit.control.policy:0
+msgid "Mail and reporting"
+msgstr ""
+
+#. module: account_credit_control_dunning_fees
+#: code:_description:0
+#: model:ir.model,name:account_credit_control_dunning_fees.model_credit_control_dunning_fees_computer
+#, python-format
+msgid "credit.control.dunning.fees.computer"
+msgstr ""
+
+#. module: account_credit_control_dunning_fees
+#: field:credit.control.policy.level,dunning_fees_type:0
+msgid "unknown"
+msgstr ""
+
diff --git a/account_credit_control_dunning_fees/i18n/fr.po b/account_credit_control_dunning_fees/i18n/fr.po
new file mode 100644
index 000000000..df2e9e0ba
--- /dev/null
+++ b/account_credit_control_dunning_fees/i18n/fr.po
@@ -0,0 +1,80 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * account_credit_control_dunning_fees
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-04-16 07:11+0000\n"
+"PO-Revision-Date: 2014-04-16 07:11+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_credit_control_dunning_fees
+#: code:_description:0
+#: model:ir.model,name:account_credit_control_dunning_fees.model_credit_control_line
+#, python-format
+msgid "A credit control line"
+msgstr "Ligne de relance"
+
+#. module: account_credit_control_dunning_fees
+#: code:_description:0
+#: model:ir.model,name:account_credit_control_dunning_fees.model_credit_control_policy_level
+#, python-format
+msgid "A credit control policy level"
+msgstr "Une politique de relance"
+
+#. module: account_credit_control_dunning_fees
+#: code:_description:0
+#: model:ir.model,name:account_credit_control_dunning_fees.model_credit_control_run
+#, python-format
+msgid "Credit control line generator"
+msgstr "Générateur de relance"
+
+#. module: account_credit_control_dunning_fees
+#: field:credit.control.line,dunning_fees_amount:0
+#: view:credit.control.policy:0
+msgid "Fees"
+msgstr "Frais de relance"
+
+#. module: account_credit_control_dunning_fees
+#: field:credit.control.policy.level,dunning_fixed_amount:0
+msgid "Fees Fixed Amount"
+msgstr "Montant des frais"
+
+#. module: account_credit_control_dunning_fees
+#: field:credit.control.policy.level,dunning_product_id:0
+msgid "Fees Product"
+msgstr "Article lié"
+
+#. module: account_credit_control_dunning_fees
+#: field:credit.control.policy.level,dunning_currency_id:0
+msgid "Fees currency"
+msgstr "Devises"
+
+#. module: account_credit_control_dunning_fees
+#: selection:credit.control.policy.level,dunning_fees_type:0
+msgid "Fixed"
+msgstr "Fixe"
+
+#. module: account_credit_control_dunning_fees
+#: view:credit.control.policy:0
+msgid "Mail and reporting"
+msgstr "Lettres et e-mails"
+
+#. module: account_credit_control_dunning_fees
+#: code:_description:0
+#: model:ir.model,name:account_credit_control_dunning_fees.model_credit_control_dunning_fees_computer
+#, python-format
+msgid "credit.control.dunning.fees.computer"
+msgstr "credit.control.dunning.fees.computer"
+
+#. module: account_credit_control_dunning_fees
+#: field:credit.control.policy.level,dunning_fees_type:0
+msgid "unknown"
+msgstr "inconnu"

From 102be83f869b6982e3728db98c640db3db43eaee Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Tue, 13 May 2014 09:11:57 +0200
Subject: [PATCH 45/57] [IMP] allows manual credit control changer to generate
 no follow credit control lines. This is done in order to keep a trace of all
 taken action on an invoice

---
 account_credit_control/data.xml               | 15 ++++++++++++++
 .../wizard/credit_control_policy_changer.py   | 20 +++++++++----------
 .../credit_control_policy_changer_view.xml    |  3 +--
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/account_credit_control/data.xml b/account_credit_control/data.xml
index aa46023da..09fc3cced 100644
--- a/account_credit_control/data.xml
+++ b/account_credit_control/data.xml
@@ -25,6 +25,21 @@
       <field name="do_nothing" eval="1"/>
     </record>
 
+    <!-- no follow policy -->
+    <record model="credit.control.policy.level"
+            id="no_follow_1">
+      <field name="name">No follow</field>
+      <field name="level" eval="1"/>
+      <field name="computation_mode">net_days</field>
+      <field name="delay_days" eval="0"/>
+      <field name="email_template_id" ref="email_template_credit_control_base"/>
+      <field name="policy_id" ref="credit_control_no_follow"/>
+      <field name="channel">email</field>
+      <field name="custom_text">Manual no follow</field>
+
+      <field name="custom_mail_text">Manual no follow</field>
+    </record>
+
     <!-- policy 1 -->
     <record model="credit.control.policy"
             id="credit_control_3_time">
diff --git a/account_credit_control/wizard/credit_control_policy_changer.py b/account_credit_control/wizard/credit_control_policy_changer.py
index d6678cffb..2c7113dd7 100644
--- a/account_credit_control/wizard/credit_control_policy_changer.py
+++ b/account_credit_control/wizard/credit_control_policy_changer.py
@@ -36,7 +36,8 @@ class credit_control_policy_changer(orm.TransientModel):
                                          'New Policy to Apply',
                                          required=True),
         'new_policy_level_id': fields.many2one('credit.control.policy.level',
-                                               'New level to apply'),
+                                               'New level to apply',
+                                               required=True),
         # Only used to provide dynamic filtering on form
         'do_nothing': fields.boolean('No follow  policy'),
         'move_line_ids': fields.many2many('account.move.line',
@@ -154,15 +155,14 @@ class credit_control_policy_changer(orm.TransientModel):
         # As it is a manual action
         # We also ignore rounding tolerance
         generated_ids = None
-        if not wizard.new_policy_id.do_nothing:
-            generated_ids = credit_line_model.create_or_update_from_mv_lines(
-                cr, uid, [],
-                [x.id for x in wizard.move_line_ids],
-                wizard.new_policy_level_id.id,
-                controlling_date,
-                check_tolerance=False,
-                context=None
-            )
+        generated_ids = credit_line_model.create_or_update_from_mv_lines(
+            cr, uid, [],
+            [x.id for x in wizard.move_line_ids],
+            wizard.new_policy_level_id.id,
+            controlling_date,
+            check_tolerance=False,
+            context=None
+        )
         self._set_invoice_policy(cr, uid,
                                  wizard.move_line_ids,
                                  wizard.new_policy_id,
diff --git a/account_credit_control/wizard/credit_control_policy_changer_view.xml b/account_credit_control/wizard/credit_control_policy_changer_view.xml
index 61a81db63..f65356ea0 100644
--- a/account_credit_control/wizard/credit_control_policy_changer_view.xml
+++ b/account_credit_control/wizard/credit_control_policy_changer_view.xml
@@ -16,8 +16,7 @@
              <field name="do_nothing"
                     invisible="1"/>
              <field name="new_policy_level_id"
-                    domain="[('policy_id', '=', new_policy_id)]"
-                    attrs="{'required': [('do_nothing', '=', False)]}"/>
+                    domain="[('policy_id', '=', new_policy_id)]"/>
            </group>
            <group></group>
          </group>

From 5ef98ad35e29f10a980f1e3dc3790eba708bd61c Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Thu, 22 May 2014 15:12:50 +0200
Subject: [PATCH 46/57] [REFACTOR] printer filter to be more polite and improve
 the way to get ids

---
 .../wizard/credit_control_printer.py          | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/account_credit_control/wizard/credit_control_printer.py b/account_credit_control/wizard/credit_control_printer.py
index 3d67ec66b..028f18e1c 100644
--- a/account_credit_control/wizard/credit_control_printer.py
+++ b/account_credit_control/wizard/credit_control_printer.py
@@ -23,6 +23,7 @@ import base64
 from openerp.osv import orm, fields
 from openerp.tools.translate import _
 
+
 class CreditControlPrinter(orm.TransientModel):
     """Print lines"""
 
@@ -34,9 +35,9 @@ class CreditControlPrinter(orm.TransientModel):
         if context is None:
             context = {}
         res = False
-        if (context.get('active_model') == 'credit.control.line' and
-                context.get('active_ids')):
-            res = context['active_ids']
+        if context.get('active_model') != 'credit.control.line':
+            return res
+        res = context.get('active_ids', False)
         return res
 
     _columns = {
@@ -63,6 +64,12 @@ class CreditControlPrinter(orm.TransientModel):
                   ('channel', '=', 'letter')]
         return line_obj.search(cr, uid, domain, context=context)
 
+    def _credit_line_predicate(self, cr, uid, line_record, context=None):
+        return True
+
+    def _get_line_ids(self, cr, uid, lines, predicate, context=None):
+        return [l.id for l in lines if predicate(cr, uid, l, context)]
+
     def print_lines(self, cr, uid, wiz_id, context=None):
         assert not (isinstance(wiz_id, list) and len(wiz_id) > 1), \
             "wiz_id: only one id expected"
@@ -72,9 +79,15 @@ class CreditControlPrinter(orm.TransientModel):
         form = self.browse(cr, uid, wiz_id, context)
 
         if not form.line_ids and not form.print_all:
-            raise orm.except_orm(_('Error'), _('No credit control lines selected.'))
+            raise orm.except_orm(_('Error'),
+                                 _('No credit control lines selected.'))
+
+        line_ids = self._get_line_ids(cr,
+                                      uid,
+                                      form.line_ids,
+                                      self._credit_line_predicate,
+                                      context=context)
 
-        line_ids = [l.id for l in form.line_ids]
         comms = comm_obj._generate_comm_from_credit_line_ids(cr, uid, line_ids,
                                                              context=context)
         report_file = comm_obj._generate_report(cr, uid, comms, context=context)

From 94524a0e824fb9e896b7679f6a4e6b55d4da572c Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Tue, 27 May 2014 08:33:50 +0200
Subject: [PATCH 47/57] [FIX] typo overriden -> overridden

---
 account_credit_control/line.py                            | 2 +-
 account_credit_control/line_view.xml                      | 8 ++++----
 account_credit_control/policy.py                          | 8 ++++----
 .../features/steps/account_credit_control_changer.py      | 6 +++---
 .../wizard/credit_control_policy_changer.py               | 4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/account_credit_control/line.py b/account_credit_control/line.py
index 7d64123fd..ffb940c98 100644
--- a/account_credit_control/line.py
+++ b/account_credit_control/line.py
@@ -118,7 +118,7 @@ class CreditControlLine(orm.Model):
                                 string='Level',
                                 store=True,
                                 readonly=True),
-        'manually_overriden': fields.boolean('Manually overriden')
+        'manually_overridden': fields.boolean('Manually overridden')
     }
 
 
diff --git a/account_credit_control/line_view.xml b/account_credit_control/line_view.xml
index f1a1c6898..370a9a136 100644
--- a/account_credit_control/line_view.xml
+++ b/account_credit_control/line_view.xml
@@ -10,7 +10,7 @@
           <field name="date_due"/>
           <field name="date_sent"/>
           <field name="level"/>
-          <field name="manually_overriden"/>
+          <field name="manually_overridden"/>
           <field name="state"/>
           <field name="channel"/>
           <field name="invoice_id"/>
@@ -50,7 +50,7 @@
                     domain="[('state', 'in', ('error', 'email_error'))]"
                     help="An error has occured during the sending of the email."/>
             <filter name="filter_manual" icon="terp-gtk-stop" string="Manual change"
-                    domain="[('manually_overriden', '=', True)]"
+                    domain="[('manually_overridden', '=', True)]"
                     help="The line was deprecated by a manual change of policy on invoice."/>
             <separator orientation="vertical"/>
 
@@ -93,7 +93,7 @@
             <separator orientation="vertical"/>
             <filter domain='[]' context="{'group_by': 'channel'}"
                     icon="terp-document-new" string="Channel"/>
-            <filter domain='[]' context="{'group_by': 'manually_overriden'}"
+            <filter domain='[]' context="{'group_by': 'manually_overridden'}"
                     icon="terp-document-new" string="Manual change"/>
           </group>
         </search>
@@ -109,7 +109,7 @@
           <field name="date"/>
           <field name="date_due"/>
           <field name="level"/>
-          <field name="manually_overriden"/>
+          <field name="manually_overridden"/>
           <field name="state"/>
           <field name="channel"/>
           <field name="invoice_id"/>
diff --git a/account_credit_control/policy.py b/account_credit_control/policy.py
index 194a48d59..3ab7f8be1 100644
--- a/account_credit_control/policy.py
+++ b/account_credit_control/policy.py
@@ -202,7 +202,7 @@ class CreditControlPolicy(orm.Model):
             policy_id = policy_id[0]
         cr.execute("SELECT move_line_id FROM credit_control_line"
                    "    WHERE policy_id != %s and move_line_id in %s"
-                   "    AND manually_overriden IS false",
+                   "    AND manually_overridden IS false",
                    (policy_id, tuple(lines)))
         res = cr.fetchall()
         if res:
@@ -343,7 +343,7 @@ class CreditControlPolicyLevel(orm.Model):
                # lines from a previous level with a draft or ignored state
                # or manually overriden
                # have to be generated again for the previous level
-               "                 AND NOT manually_overriden\n"
+               "                 AND NOT manually_overridden\n"
                "                 AND state NOT IN ('draft', 'ignored'))"
                " AND (mv_line.debit IS NOT NULL AND mv_line.debit != 0.0)\n")
         sql += " AND"
@@ -371,14 +371,14 @@ class CreditControlPolicyLevel(orm.Model):
                " WHERE cr_line.id = (SELECT credit_control_line.id FROM credit_control_line\n"
                "                            WHERE credit_control_line.move_line_id = mv_line.id\n"
                "                            AND state != 'ignored'"
-               "                            AND NOT manually_overriden"
+               "                            AND NOT manually_overridden"
                "                              ORDER BY credit_control_line.level desc limit 1)\n"
                " AND cr_line.level = %(previous_level)s\n"
                " AND (mv_line.debit IS NOT NULL AND mv_line.debit != 0.0)\n"
                # lines from a previous level with a draft or ignored state
                # or manually overriden
                # have to be generated again for the previous level
-               " AND NOT manually_overriden\n"
+               " AND NOT manually_overridden\n"
                " AND cr_line.state NOT IN ('draft', 'ignored')\n"
                " AND mv_line.id in %(line_ids)s\n")
         sql += " AND "
diff --git a/account_credit_control/scenarios/features/steps/account_credit_control_changer.py b/account_credit_control/scenarios/features/steps/account_credit_control_changer.py
index b3625b1c0..6a5311f30 100644
--- a/account_credit_control/scenarios/features/steps/account_credit_control_changer.py
+++ b/account_credit_control/scenarios/features/steps/account_credit_control_changer.py
@@ -31,7 +31,7 @@ def impl(ctx, line_number):
     assert_true(ctx.wizard)
     move_ids = [x.id for x in ctx.wizard.move_line_ids]
     overriden = model('credit.control.line').search([('move_line_id', 'in', move_ids),
-                                                     ('manually_overriden', '=', True)])
+                                                     ('manually_overridden', '=', True)])
 #    assert len(overriden) == line_number
 
 @when(u'one new credit control line of level "{level_name}" related to invoice "{invoice_name}"')
@@ -43,7 +43,7 @@ def impl(ctx, level_name, invoice_name):
    assert_true(ctx.wizard)
    move_ids = [x.id for x in ctx.wizard.move_line_ids]
    created_id = model('credit.control.line').search([('move_line_id', 'in', move_ids),
-                                                     ('manually_overriden', '=', False)])
+                                                     ('manually_overridden', '=', False)])
 
    assert len(created_id) == 1
    created = model('credit.control.line').get(created_id[0])
@@ -61,7 +61,7 @@ def impl(ctx, date):
 def impl(ctx, invoice_name):
    invoice = model('account.invoice').get([('number', '=', invoice_name)])
    assert_true(invoice, msg='No invoices found')
-   man_lines = (x for x in invoice.credit_control_line_ids if x.manually_overriden)
+   man_lines = (x for x in invoice.credit_control_line_ids if x.manually_overridden)
    assert_true(next(man_lines, None), 'No manual change on the invoice')
    ctx.invoice = invoice
 
diff --git a/account_credit_control/wizard/credit_control_policy_changer.py b/account_credit_control/wizard/credit_control_policy_changer.py
index 2c7113dd7..4fd61d7ce 100644
--- a/account_credit_control/wizard/credit_control_policy_changer.py
+++ b/account_credit_control/wizard/credit_control_policy_changer.py
@@ -86,7 +86,7 @@ class credit_control_policy_changer(orm.TransientModel):
 
     def _mark_as_overriden(self, cr, uid, move_lines, context=None):
         """Mark `move_lines` related credit control line as overriden
-        This is done by setting manually_overriden fields to True
+        This is done by setting manually_overridden fields to True
 
         :param move_lines: move line to mark as overriden
 
@@ -98,7 +98,7 @@ class credit_control_policy_changer(orm.TransientModel):
         credits_ids = credit_model.search(cr, uid, domain, context=context)
         credit_model.write(cr, uid,
                            credits_ids,
-                           {'manually_overriden': True},
+                           {'manually_overridden': True},
                            context)
         return credits_ids
 

From f53aa637c0ec4803d0b756d45044e186a2b9091e Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Tue, 27 May 2014 08:34:47 +0200
Subject: [PATCH 48/57] [TYPO]

---
 account_credit_control/invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/account_credit_control/invoice.py b/account_credit_control/invoice.py
index d361f7a2e..d21fc9d71 100644
--- a/account_credit_control/invoice.py
+++ b/account_credit_control/invoice.py
@@ -44,7 +44,7 @@ class AccountInvoice(orm.Model):
         }
 
     def copy_data(self, cr, uid, id, default=None, context=None):
-        """Ensure that credit lines and policcy are not copied"""
+        """Ensure that credit lines and policy are not copied"""
         if default is None:
             default = {}
         else:

From b910bb1355771f15c016bc549691696e611f88bf Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Tue, 27 May 2014 08:37:31 +0200
Subject: [PATCH 49/57] [FIX] double identic statement

---
 account_credit_control/invoice.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/account_credit_control/invoice.py b/account_credit_control/invoice.py
index d21fc9d71..078df90f4 100644
--- a/account_credit_control/invoice.py
+++ b/account_credit_control/invoice.py
@@ -49,7 +49,6 @@ class AccountInvoice(orm.Model):
             default = {}
         else:
             default = default.copy()
-        default = default.copy()
         default['credit_control_line_ids'] = False
         default['credit_policy_id'] = False
         return super(AccountInvoice, self).copy_data(

From 3da2b8ade556488bc370fa7a905078928c58096e Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Tue, 27 May 2014 08:38:30 +0200
Subject: [PATCH 50/57] [FIX] english comment

---
 account_credit_control/policy.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/account_credit_control/policy.py b/account_credit_control/policy.py
index 3ab7f8be1..e61535334 100644
--- a/account_credit_control/policy.py
+++ b/account_credit_control/policy.py
@@ -211,7 +211,7 @@ class CreditControlPolicy(orm.Model):
 
     def check_policy_against_account(self, cr, uid, account_id, policy_id,
                                      context=None):
-        """Ensure that policy correspond to account relation"""
+        """Ensure that the policy corresponds to account relation"""
         policy = self.browse(cr, uid, policy_id, context=context)
         account = self.pool['account.account'].browse(cr, uid, account_id,
                                                       context=context)

From af30fe3c24abcc3c844fded0e9f9b33b022888e3 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Tue, 27 May 2014 08:40:40 +0200
Subject: [PATCH 51/57] [PEP8]

---
 account_credit_control/policy.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/account_credit_control/policy.py b/account_credit_control/policy.py
index e61535334..3413be6c5 100644
--- a/account_credit_control/policy.py
+++ b/account_credit_control/policy.py
@@ -218,8 +218,8 @@ class CreditControlPolicy(orm.Model):
         policies_id = self.search(cr, uid, [],
                                   context=context)
         policies = self.browse(cr, uid, policies_id, context=context)
-        allowed = [x for x in policies if
-                   account in x.account_ids or x.do_nothing]
+        allowed = [x for x in policies
+                   if account in x.account_ids or x.do_nothing]
         if policy not in allowed:
             allowed_names = u"\n".join(x.name for x in allowed)
             raise orm.except_orm(

From 846b8d93c0f1bee0b57742f654d36d067abd91b7 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Tue, 27 May 2014 08:41:37 +0200
Subject: [PATCH 52/57] [TYPO]

---
 account_credit_control/wizard/credit_control_policy_changer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/account_credit_control/wizard/credit_control_policy_changer.py b/account_credit_control/wizard/credit_control_policy_changer.py
index 4fd61d7ce..4fdb65f36 100644
--- a/account_credit_control/wizard/credit_control_policy_changer.py
+++ b/account_credit_control/wizard/credit_control_policy_changer.py
@@ -150,7 +150,7 @@ class credit_control_policy_changer(orm.TransientModel):
                                 wizard.move_line_ids,
                                 context=context)
         # As disscused with business expert
-        # draft line should be passed to ignored
+        # draft lines should be passed to ignored
         # if same level as the new one
         # As it is a manual action
         # We also ignore rounding tolerance

From 864a6356b96d17f100829daa68f9fc66858e76b6 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Tue, 27 May 2014 08:48:17 +0200
Subject: [PATCH 53/57] [TYPO] overriden -> overridden

---
 account_credit_control/company.py                      |  2 +-
 account_credit_control/i18n/de.po                      |  4 ++--
 account_credit_control/i18n/en.po                      |  6 +++---
 account_credit_control/i18n/es.po                      |  6 +++---
 account_credit_control/i18n/fr.po                      |  2 +-
 account_credit_control/policy.py                       |  4 ++--
 .../features/11_credit_control_manual_setting.feature  |  2 +-
 .../features/steps/account_credit_control_changer.py   |  6 +++---
 .../wizard/credit_control_policy_changer.py            | 10 +++++-----
 async_move_line_importer/model/move_line_importer.py   |  4 ++--
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/account_credit_control/company.py b/account_credit_control/company.py
index eb8187a4c..893b33bb5 100644
--- a/account_credit_control/company.py
+++ b/account_credit_control/company.py
@@ -31,7 +31,7 @@ class ResCompany(orm.Model):
                 'credit_policy_id': fields.many2one('credit.control.policy',
                                                     'Credit Control Policy',
                                                     help=("The Credit Control Policy used on partners"
-                                                          " by default. This setting can be overriden"
+                                                          " by default. This setting can be overridden"
                                                           " on partners or invoices.")),
                 }
 
diff --git a/account_credit_control/i18n/de.po b/account_credit_control/i18n/de.po
index 761cfb60a..6f3eaaf27 100644
--- a/account_credit_control/i18n/de.po
+++ b/account_credit_control/i18n/de.po
@@ -984,10 +984,10 @@ msgstr "60 days last reminder"
 #: help:res.company,credit_policy_id:0
 msgid ""
 "The Credit Control Policy used on partners by default. This setting can be "
-"overriden on partners or invoices."
+"overridden on partners or invoices."
 msgstr ""
 "The Credit Control Policy used on partners by default. This setting can be "
-"overriden on partners or invoices."
+"overridden on partners or invoices."
 
 #. module: account_credit_control
 #: field:credit.control.line,policy_level_id:0
diff --git a/account_credit_control/i18n/en.po b/account_credit_control/i18n/en.po
index a485dd7c4..4ab005650 100644
--- a/account_credit_control/i18n/en.po
+++ b/account_credit_control/i18n/en.po
@@ -984,10 +984,10 @@ msgstr "60 days last reminder"
 #: help:res.company,credit_policy_id:0
 msgid ""
 "The Credit Control Policy used on partners by default. This setting can be "
-"overriden on partners or invoices."
+"overridden on partners or invoices."
 msgstr ""
 "The Credit Control Policy used on partners by default. This setting can be "
-"overriden on partners or invoices."
+"overridden on partners or invoices."
 
 #. module: account_credit_control
 #: field:credit.control.line,policy_level_id:0
@@ -1042,4 +1042,4 @@ msgstr "Currency"
 #. module: account_credit_control
 #: report:addons/account_credit_control/report/credit_control_summary.html.mako:211
 msgid "If you have any question, do not hesitate to contact us."
-msgstr "If you have any question, do not hesitate to contact us."
\ No newline at end of file
+msgstr "If you have any question, do not hesitate to contact us."
diff --git a/account_credit_control/i18n/es.po b/account_credit_control/i18n/es.po
index 8c6ef96d9..76d47c904 100644
--- a/account_credit_control/i18n/es.po
+++ b/account_credit_control/i18n/es.po
@@ -982,10 +982,10 @@ msgstr "60 days last reminder"
 #: help:res.company,credit_policy_id:0
 msgid ""
 "The Credit Control Policy used on partners by default. This setting can be "
-"overriden on partners or invoices."
+"overridden on partners or invoices."
 msgstr ""
 "The Credit Control Policy used on partners by default. This setting can be "
-"overriden on partners or invoices."
+"overridden on partners or invoices."
 
 #. module: account_credit_control
 #: field:credit.control.line,policy_level_id:0
@@ -1040,4 +1040,4 @@ msgstr "Currency"
 #. module: account_credit_control
 #: report:addons/account_credit_control/report/credit_control_summary.html.mako:211
 msgid "If you have any question, do not hesitate to contact us."
-msgstr "If you have any question, do not hesitate to contact us."
\ No newline at end of file
+msgstr "If you have any question, do not hesitate to contact us."
diff --git a/account_credit_control/i18n/fr.po b/account_credit_control/i18n/fr.po
index 85867283b..6f0e83980 100644
--- a/account_credit_control/i18n/fr.po
+++ b/account_credit_control/i18n/fr.po
@@ -965,7 +965,7 @@ msgstr "Dernier rappel à 60 jours"
 #: help:res.company,credit_policy_id:0
 msgid ""
 "The Credit Control Policy used on partners by default. This setting can be "
-"overriden on partners or invoices."
+"overridden on partners or invoices."
 msgstr ""
 "Politique de relance par défaut du client. (Ce paramétrage peut être "
 "défini plus spécifiquement au niveau de la facture)."
diff --git a/account_credit_control/policy.py b/account_credit_control/policy.py
index 3413be6c5..34b8bc69c 100644
--- a/account_credit_control/policy.py
+++ b/account_credit_control/policy.py
@@ -341,7 +341,7 @@ class CreditControlPolicyLevel(orm.Model):
                "                 FROM credit_control_line\n"
                "                 WHERE move_line_id = mv_line.id\n"
                # lines from a previous level with a draft or ignored state
-               # or manually overriden
+               # or manually overridden
                # have to be generated again for the previous level
                "                 AND NOT manually_overridden\n"
                "                 AND state NOT IN ('draft', 'ignored'))"
@@ -376,7 +376,7 @@ class CreditControlPolicyLevel(orm.Model):
                " AND cr_line.level = %(previous_level)s\n"
                " AND (mv_line.debit IS NOT NULL AND mv_line.debit != 0.0)\n"
                # lines from a previous level with a draft or ignored state
-               # or manually overriden
+               # or manually overridden
                # have to be generated again for the previous level
                " AND NOT manually_overridden\n"
                " AND cr_line.state NOT IN ('draft', 'ignored')\n"
diff --git a/account_credit_control/scenarios/features/11_credit_control_manual_setting.feature b/account_credit_control/scenarios/features/11_credit_control_manual_setting.feature
index bfe2aa811..6702990fe 100644
--- a/account_credit_control/scenarios/features/11_credit_control_manual_setting.feature
+++ b/account_credit_control/scenarios/features/11_credit_control_manual_setting.feature
@@ -19,7 +19,7 @@ Feature: Ensure that manually changing  an invoice level feature works as expect
       | name  |
       | SI_4  |
     When I confirm the level change
-    And I should have "3" credit control lines overriden
+    And I should have "3" credit control lines overridden
     And one new credit control line of level "10 days net" related to invoice "SAJ/2014/0004"
     Then I force date of generated credit line to "2013-09-15"
 
diff --git a/account_credit_control/scenarios/features/steps/account_credit_control_changer.py b/account_credit_control/scenarios/features/steps/account_credit_control_changer.py
index 6a5311f30..0597438b6 100644
--- a/account_credit_control/scenarios/features/steps/account_credit_control_changer.py
+++ b/account_credit_control/scenarios/features/steps/account_credit_control_changer.py
@@ -26,13 +26,13 @@ def impl(ctx):
     assert_true(ctx.wizard)
     ctx.wizard.set_new_policy()
 
-@when(u'I should have "{line_number:d}" credit control lines overriden')
+@when(u'I should have "{line_number:d}" credit control lines overridden')
 def impl(ctx, line_number):
     assert_true(ctx.wizard)
     move_ids = [x.id for x in ctx.wizard.move_line_ids]
-    overriden = model('credit.control.line').search([('move_line_id', 'in', move_ids),
+    overridden = model('credit.control.line').search([('move_line_id', 'in', move_ids),
                                                      ('manually_overridden', '=', True)])
-#    assert len(overriden) == line_number
+#    assert len(overridden) == line_number
 
 @when(u'one new credit control line of level "{level_name}" related to invoice "{invoice_name}"')
 def impl(ctx, level_name, invoice_name):
diff --git a/account_credit_control/wizard/credit_control_policy_changer.py b/account_credit_control/wizard/credit_control_policy_changer.py
index 4fdb65f36..41dbea5f7 100644
--- a/account_credit_control/wizard/credit_control_policy_changer.py
+++ b/account_credit_control/wizard/credit_control_policy_changer.py
@@ -84,13 +84,13 @@ class credit_control_policy_changer(orm.TransientModel):
                                                            context=context)
         return {'value': {'do_nothing': policy.do_nothing}}
 
-    def _mark_as_overriden(self, cr, uid, move_lines, context=None):
-        """Mark `move_lines` related credit control line as overriden
+    def _mark_as_overridden(self, cr, uid, move_lines, context=None):
+        """Mark `move_lines` related credit control line as overridden
         This is done by setting manually_overridden fields to True
 
-        :param move_lines: move line to mark as overriden
+        :param move_lines: move line to mark as overridden
 
-        :retun: list of credit line ids that where marked as overriden
+        :retun: list of credit line ids that where marked as overridden
 
         """
         credit_model = self.pool['credit.control.line']
@@ -145,7 +145,7 @@ class credit_control_policy_changer(orm.TransientModel):
             uid,
             wizard.move_line_ids,
             wizard.new_policy_id)
-        self._mark_as_overriden(cr,
+        self._mark_as_overridden(cr,
                                 uid,
                                 wizard.move_line_ids,
                                 context=context)
diff --git a/async_move_line_importer/model/move_line_importer.py b/async_move_line_importer/model/move_line_importer.py
index 2ae7c725c..f515bf8fe 100644
--- a/async_move_line_importer/model/move_line_importer.py
+++ b/async_move_line_importer/model/move_line_importer.py
@@ -41,7 +41,7 @@ class move_line_importer(orm.Model):
 
     It will parse the saved CSV file using orm.BaseModel.load
     in a thread. If you set bypass_orm to True then the load function
-    will use a totally overriden create function that is a lot faster
+    will use a totally overridden create function that is a lot faster
     but that totally bypass the ORM
 
     """
@@ -303,7 +303,7 @@ class move_line_importer(orm.Model):
         Will generate an success/failure report and generate some
         maile threads. It uses BaseModel.load to lookup CSV.
         If you set bypass_orm to True then the load function
-        will use a totally overriden create function that is a lot faster
+        will use a totally overridden create function that is a lot faster
         but that totally bypass the ORM
 
         """

From 3dd7f9c7cd1a8e168cf7eaa85ca63aac49baa27d Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Tue, 24 Jun 2014 14:20:10 +0200
Subject: [PATCH 54/57] [FIX] deprecated tag in view

---
 account_credit_control/wizard/credit_control_emailer_view.xml | 1 -
 account_credit_control/wizard/credit_control_marker_view.xml  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/account_credit_control/wizard/credit_control_emailer_view.xml b/account_credit_control/wizard/credit_control_emailer_view.xml
index 3d8ea9574..2c299a64b 100644
--- a/account_credit_control/wizard/credit_control_emailer_view.xml
+++ b/account_credit_control/wizard/credit_control_emailer_view.xml
@@ -4,7 +4,6 @@
     <record id="credit_line_emailer_form" model="ir.ui.view">
       <field name="name">credit.line.emailer.form</field>
       <field name="model">credit.control.emailer</field>
-      <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Mailer" version="7.0">
           <separator string="Send emails for the selected lines" colspan="4"/>
diff --git a/account_credit_control/wizard/credit_control_marker_view.xml b/account_credit_control/wizard/credit_control_marker_view.xml
index 03af8dbb8..c32cc8e18 100644
--- a/account_credit_control/wizard/credit_control_marker_view.xml
+++ b/account_credit_control/wizard/credit_control_marker_view.xml
@@ -4,7 +4,6 @@
     <record id="credit_line_marker_form" model="ir.ui.view">
       <field name="name">credit.line.marker.form</field>
       <field name="model">credit.control.marker</field>
-      <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Lines marker" version="7.0">
           <separator string="Change the state of the selected lines" colspan="4"/>

From 72dc23735a5e8b81be041045beaf1452c2bb26a9 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Tue, 24 Jun 2014 14:22:33 +0200
Subject: [PATCH 55/57] [FIX] name of level in tests

---
 .../tests/test_fees_generation.py                               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 b26326ef7..d272420fc 100644
--- a/account_credit_control_dunning_fees/tests/test_fees_generation.py
+++ b/account_credit_control_dunning_fees/tests/test_fees_generation.py
@@ -47,7 +47,7 @@ class FixedFeesTester(test_common.TransactionCase):
         self.euro_level.dunning_currency_id = self.euro
         self.euro_level.dunning_type = 'fixed'
 
-        self.usd_level = MagicMock(name='Euro policy level')
+        self.usd_level = MagicMock(name='USD policy level')
         self.usd_level.dunning_fixed_amount = 5.0
         self.usd_level.dunning_currency_id = self.usd
         self.usd_level.dunning_type = 'fixed'

From 2a6ae7cb0d55f86a34bd12ccc627094075789cdc Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Tue, 24 Jun 2014 14:24:55 +0200
Subject: [PATCH 56/57] [FIX] Typo in domain

---
 account_credit_control/wizard/credit_control_printer_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/account_credit_control/wizard/credit_control_printer_view.xml b/account_credit_control/wizard/credit_control_printer_view.xml
index 64b4c249c..68b67aa31 100644
--- a/account_credit_control/wizard/credit_control_printer_view.xml
+++ b/account_credit_control/wizard/credit_control_printer_view.xml
@@ -30,8 +30,8 @@
           <field name="state" invisible="1" />
           <newline/>
           <footer>
-            <button class="oe_highlight" name="print_lines" string="Print" type="object"  attrs="{'invisible': [('state', '==', 'done')]}"/>
-            <button special="cancel" string="Cancel" icon='gtk-cancel' attrs="{'invisible': [('state', '==', 'done')]}"/>
+            <button class="oe_highlight" name="print_lines" string="Print" type="object"  attrs="{'invisible': [('state', '=', 'done')]}"/>
+            <button special="cancel" string="Cancel" icon='gtk-cancel' attrs="{'invisible': [('state', '=', 'done')]}"/>
             <button special="cancel" string="Close" icon='gtk-close' attrs="{'invisible': [('state', '!=', 'done')]}"/>
           </footer>
         </form>

From eeffca3b3a3f5d84003438105a0ebc43c85489a5 Mon Sep 17 00:00:00 2001
From: Nicolas Bessi <nicolas.bessi@camptocamp.com>
Date: Tue, 24 Jun 2014 14:33:52 +0200
Subject: [PATCH 57/57] [TYPOS]

---
 .../features/11_credit_control_manual_setting.feature         | 4 ++--
 account_credit_control_dunning_fees/model/dunning.py          | 4 ++--
 .../tests/test_fees_generation.py                             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/account_credit_control/scenarios/features/11_credit_control_manual_setting.feature b/account_credit_control/scenarios/features/11_credit_control_manual_setting.feature
index 6702990fe..1a34ac71a 100644
--- a/account_credit_control/scenarios/features/11_credit_control_manual_setting.feature
+++ b/account_credit_control/scenarios/features/11_credit_control_manual_setting.feature
@@ -10,7 +10,7 @@
 
 @account_credit_control  @account_credit_control_run  @account_credit_control_run_change_level
 
-Feature: Ensure that manually changing  an invoice level feature works as expected
+Feature: Ensure that manually changing an invoice level feature works as expected
 
   @account_credit_control_change_level
   Scenario: Change level
@@ -36,7 +36,7 @@ Feature: Ensure that manually changing  an invoice level feature works as expect
     Then my credit run should be in state "done"
 
   @account_credit_control_manual_next_step
-  Scenario: Check manually  managed line on run
+  Scenario: Check manually managed line on run
     Given the invoice "SAJ/2014/0004" with manual changes
     And the invoice has "1" line of level "1" for policy "3 time policy"
     And the invoice has "1" line of level "2" for policy "3 time policy"
diff --git a/account_credit_control_dunning_fees/model/dunning.py b/account_credit_control_dunning_fees/model/dunning.py
index fe14c1479..b0a75cdd2 100644
--- a/account_credit_control_dunning_fees/model/dunning.py
+++ b/account_credit_control_dunning_fees/model/dunning.py
@@ -56,7 +56,7 @@ class FeesComputer(orm.BaseModel):
     def _compute_fees(self, cr, uid, credit_line_ids, context=None):
         """Compute fees for `credit_line_ids` parameter
 
-        Fees amount is writen on credit line in fields dunning_fees_amount
+        Fees amount is written on credit line in field dunning_fees_amount
 
         :param credit_line_ids: list of `credit.control.line` ids
 
@@ -78,7 +78,7 @@ class FeesComputer(orm.BaseModel):
     def _compute(self, cr, uid, credit_line, context=None):
         """Compute fees for a given credit line
 
-        Fees amount is writen on credit line in fields dunning_fees_amount
+        Fees amount is written on credit line in field dunning_fees_amount
 
         :param credit_line: credit line record
 
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 d272420fc..0d7037a9a 100644
--- a/account_credit_control_dunning_fees/tests/test_fees_generation.py
+++ b/account_credit_control_dunning_fees/tests/test_fees_generation.py
@@ -25,7 +25,7 @@ import openerp.tests.common as test_common
 class FixedFeesTester(test_common.TransactionCase):
 
     def setUp(self):
-        """Initialaize credit control level mock to test fees computations"""
+        """Initialize credit control level mock to test fees computations"""
         super(FixedFeesTester, self).setUp()
         self.currency_model = self.registry('res.currency')
         self.euro = self.currency_model.search(self.cr, self.uid,