diff --git a/account_credit_control/i18n/account_credit_control.pot b/account_credit_control/i18n/account_credit_control.pot
index f17f89453..e23733290 100644
--- a/account_credit_control/i18n/account_credit_control.pot
+++ b/account_credit_control/i18n/account_credit_control.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-13 13:11+0000\n"
-"PO-Revision-Date: 2015-01-13 13:11+0000\n"
+"POT-Creation-Date: 2015-01-26 10:32+0000\n"
+"PO-Revision-Date: 2015-01-26 10:32+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -68,7 +68,7 @@ msgid "A credit control line"
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/run.py:93
+#: code:addons/account_credit_control/run.py:87
 #, python-format
 msgid "A credit control line more recent than %s exists at %s"
 msgstr ""
@@ -79,13 +79,13 @@ msgid "A credit control policy level"
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/run.py:161
+#: code:addons/account_credit_control/run.py:154
 #, python-format
 msgid "A credit control run is already running in background, please try later."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/run.py:86
+#: code:addons/account_credit_control/run.py:80
 #, python-format
 msgid "A run has already been executed more recently than %s"
 msgstr ""
@@ -371,11 +371,6 @@ msgstr ""
 msgid "Date due"
 msgstr ""
 
-#. module: account_credit_control
-#: view:website:account_credit_control.report_credit_control_summary_document
-msgid "Dear,"
-msgstr ""
-
 #. module: account_credit_control
 #: model:ir.model,name:account_credit_control.model_credit_control_policy
 msgid "Define a reminder policy"
@@ -890,7 +885,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/run.py:109
+#: code:addons/account_credit_control/run.py:103
 #, python-format
 msgid "Please select a policy"
 msgstr ""
@@ -1124,7 +1119,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/line.py:226
+#: code:addons/account_credit_control/line.py:223
 #, python-format
 msgid "You are not allowed to delete a credit control line that is not in draft state."
 msgstr ""
diff --git a/account_credit_control/i18n/de.po b/account_credit_control/i18n/de.po
new file mode 100644
index 000000000..c68bfdb9a
--- /dev/null
+++ b/account_credit_control/i18n/de.po
@@ -0,0 +1,1190 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* account_credit_control
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 8.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-01-26 10:32+0000\n"
+"PO-Revision-Date: 2014-10-30 14:59+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"Language: \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
+#: model:credit.control.policy.level,custom_text:account_credit_control.3_time_3
+msgid ""
+"\n"
+"        Our records indicate that we still have not received the payment of "
+"the above mentioned invoice despite our two reminders.\n"
+"        If payment have already been sent, please disregard this notice. If "
+"not, please proceed with payment.\n"
+"        If your payment has not been received in the next 5 days, your file "
+"will be transfered to our debt collection agency.\n"
+"\n"
+"        Should you need us to arrange a payment plan for you, please "
+"advise.\n"
+"        A customer account statement is enclosed for you convenience.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
+msgstr ""
+
+#. module: account_credit_control
+#: model:email.template,body_html:account_credit_control.email_template_credit_control_base
+msgid ""
+"\n"
+"      Dear ${object.contact_address.name or ''}\n"
+"      <br/>\n"
+"      <br/>\n"
+"      ${object.current_policy_level.custom_mail_text}\n"
+"      "
+msgstr ""
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,name:account_credit_control.3_time_3
+msgid "10 days last reminder"
+msgstr ""
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,name:account_credit_control.3_time_1
+msgid "10 days net"
+msgstr ""
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,name:account_credit_control.2_time_1
+#: model:credit.control.policy.level,name:account_credit_control.3_time_2
+msgid "30 days end of month"
+msgstr ""
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,name:account_credit_control.2_time_2
+msgid "60 days last reminder"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_credit_control_line
+msgid "A credit control line"
+msgstr ""
+
+#. module: account_credit_control
+#: code:addons/account_credit_control/run.py:87
+#, python-format
+msgid "A credit control line more recent than %s exists at %s"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_credit_control_policy_level
+msgid "A credit control policy level"
+msgstr ""
+
+#. module: account_credit_control
+#: code:addons/account_credit_control/run.py:154
+#, python-format
+msgid ""
+"A credit control run is already running in background, please try later."
+msgstr ""
+
+#. module: account_credit_control
+#: code:addons/account_credit_control/run.py:80
+#, python-format
+msgid "A run has already been executed more recently than %s"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.line:account_credit_control.credit_control_line_search
+#: field:credit.control.line,account_id:0
+#: model:ir.model,name:account_credit_control.model_account_account
+msgid "Account"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.policy:account_credit_control.credit_control_policy_form
+#: field:credit.control.policy,account_ids:0
+msgid "Accounts"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.policy,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.actions.act_window,help:account_credit_control.action_wizard_credit_policy_changer
+msgid "Allows to manually change credit level"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.line:account_credit_control.credit_control_line_search
+msgid "An error has occured during the sending of the email."
+msgstr ""
+
+#. module: account_credit_control
+#: code:addons/account_credit_control/policy.py:308
+#, python-format
+msgid "Can not get function for computation mode: %s is not implemented"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.emailer:account_credit_control.credit_line_emailer_form
+#: view:credit.control.marker:account_credit_control.credit_line_marker_form
+#: view:credit.control.policy.changer:account_credit_control.credit_control_policy_changer_form
+#: view:credit.control.printer:account_credit_control.credit_line_printer_form
+msgid "Cancel"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.marker:account_credit_control.credit_line_marker_form
+#: model:ir.actions.act_window,name:account_credit_control.open_credit_line_marker_wizard
+#: model:ir.actions.act_window,name:account_credit_control.open_credit_line_marker_wizard_menu_action
+msgid "Change Lines' State"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_wizard_credit_policy_changer
+#: model:ir.actions.act_window,name:account_credit_control.action_wizard_credit_policy_changer_menu_action
+msgid "Change current credit policy"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.policy.changer:account_credit_control.credit_control_policy_changer_form
+msgid "Change the overdue level of current invoice"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.marker:account_credit_control.credit_line_marker_form
+msgid "Change the state of the selected lines"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.actions.act_window,help:account_credit_control.open_credit_line_marker_wizard
+msgid "Change the state of the selected lines."
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.line:account_credit_control.credit_control_line_search
+#: field:credit.control.line,channel:0
+#: field:credit.control.policy.level,channel:0
+msgid "Channel"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.communication,company_id:0
+#: field:credit.control.line,company_id:0
+#: field:credit.control.policy,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.run:account_credit_control.credit_control_run_form
+msgid "Compute Credit Control Lines"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.policy.level,computation_mode:0
+msgid "Compute Mode"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.communication,contact_address:0
+msgid "Contact Address"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.line:account_credit_control.credit_control_line_form
+#: view:credit.control.line:account_credit_control.credit_control_line_search
+#: view:credit.control.line:account_credit_control.credit_control_line_tree
+msgid "Control Credit Lines"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.run,date:0
+msgid "Controlling Date"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.line,date:0
+msgid "Controlling date"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.communication,create_uid:0
+#: field:credit.control.emailer,create_uid:0
+#: field:credit.control.line,create_uid:0
+#: field:credit.control.marker,create_uid:0
+#: field:credit.control.policy,create_uid:0
+#: field:credit.control.policy.changer,create_uid:0
+#: field:credit.control.policy.level,create_uid:0
+#: field:credit.control.printer,create_uid:0
+#: field:credit.control.run,create_uid:0
+msgid "Created by"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.communication,create_date:0
+#: field:credit.control.emailer,create_date:0
+#: field:credit.control.line,create_date:0
+#: field:credit.control.marker,create_date:0
+#: field:credit.control.policy,create_date:0
+#: field:credit.control.policy.changer,create_date:0
+#: field:credit.control.policy.level,create_date:0
+#: field:credit.control.printer,create_date:0
+#: field:credit.control.run,create_date:0
+msgid "Created on"
+msgstr ""
+
+#. module: account_credit_control
+#: view:account.invoice:account_credit_control.invoice_followup_form_view
+#: model:ir.ui.menu,name:account_credit_control.base_credit_control_configuration_menu
+#: model:ir.ui.menu,name:account_credit_control.base_credit_control_menu
+msgid "Credit Control"
+msgstr ""
+
+#. module: account_credit_control
+#: model:res.groups,name:account_credit_control.group_account_credit_control_info
+msgid "Credit Control Info"
+msgstr ""
+
+#. module: account_credit_control
+#: view:account.invoice:account_credit_control.invoice_followup_form_view
+#: field:credit.control.emailer,line_ids:0
+#: field:credit.control.marker,line_ids:0
+#: field:credit.control.printer,line_ids:0
+#: model:ir.actions.act_window,name:account_credit_control.credit_control_line_action
+#: model:ir.ui.menu,name:account_credit_control.credit_control_line_action_menu
+#: field:res.partner,credit_control_line_ids:0
+msgid "Credit Control Lines"
+msgstr ""
+
+#. module: account_credit_control
+#: model:res.groups,name:account_credit_control.group_account_credit_control_manager
+msgid "Credit Control Manager"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.credit_policy_configuration_action
+#: model:ir.ui.menu,name:account_credit_control.credit_policy_configuration_action_menu
+msgid "Credit Control Policies"
+msgstr ""
+
+#. module: account_credit_control
+#: field:account.invoice,credit_policy_id:0
+#: field:res.company,credit_policy_id:0 field:res.partner,credit_policy_id:0
+msgid "Credit Control Policy"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.credit_control_run
+#: model:ir.ui.menu,name:account_credit_control.credit_control_run_menu
+msgid "Credit Control Run"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.actions.report.xml,name:account_credit_control.credit_control_summary
+msgid "Credit Control Summary"
+msgstr ""
+
+#. module: account_credit_control
+#: field:res.company,credit_control_tolerance:0
+msgid "Credit Control Tolerance"
+msgstr ""
+
+#. module: account_credit_control
+#: model:res.groups,name:account_credit_control.group_account_credit_control_user
+msgid "Credit Control User"
+msgstr ""
+
+#. module: account_credit_control
+#: model:email.template,subject:account_credit_control.email_template_credit_control_base
+msgid "Credit Control: (${object.current_policy_level.name or 'n/a'})"
+msgstr ""
+
+#. module: account_credit_control
+#: field:account.account,credit_control_line_ids:0
+#: field:account.invoice,credit_control_line_ids:0
+#: field:credit.control.communication,credit_control_line_ids:0
+#: model:ir.actions.act_window,name:account_credit_control.act_account_credit_relation_relation
+#: model:ir.actions.act_window,name:account_credit_control.act_partner_credit_relation_relation
+msgid "Credit Lines"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_credit_control_run
+msgid "Credit control line generator"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.policy:account_credit_control.credit_control_policy_form
+#: view:credit.control.policy:account_credit_control.credit_control_policy_tree
+msgid "Credit control policy"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.policy:account_credit_control.credit_control_policy_form
+msgid "Credit control policy Level"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.policy.level:account_credit_control.credit_control_policy_level_tree
+msgid "Credit control policy level"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.run:account_credit_control.credit_control_run_form
+#: view:credit.control.run:account_credit_control.credit_control_run_tree
+msgid "Credit control run"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.line:account_credit_control.credit_control_line_search
+msgid "Credit policy"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.line:account_credit_control.credit_control_line_search
+msgid "Credit policy level"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.line,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.policy.level,custom_mail_text:0
+msgid "Custom Mail Message"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.policy.level,custom_text:0
+msgid "Custom Message"
+msgstr ""
+
+#. module: account_credit_control
+#: view:website:account_credit_control.report_credit_control_summary_document
+msgid "Date due"
+msgstr "Rechnungdatum"
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_credit_control_policy
+msgid "Define a reminder policy"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.policy.level,delay_days:0
+msgid "Delay (in days)"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.policy:account_credit_control.credit_control_policy_form
+#: view:credit.control.policy.level:account_credit_control.credit_mangement_policy_level_form
+msgid "Delay Setting"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.policy,do_nothing:0
+msgid "Do nothing"
+msgstr ""
+
+#. module: account_credit_control
+#: selection:credit.control.line,state:0
+#: selection:credit.control.marker,name:0 selection:credit.control.run,state:0
+msgid "Done"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.line:account_credit_control.credit_control_line_search
+#: selection:credit.control.line,state:0 selection:credit.control.run,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.line:account_credit_control.credit_control_line_search
+msgid "Draft lines have to be triaged."
+msgstr ""
+
+#. module: account_credit_control
+#: help:credit.control.line,state:0
+msgid ""
+"Draft lines need to be triaged.\n"
+"Ignored lines are lines for which we do not want to send something.\n"
+"Draft and ignored lines will be generated again on the next run."
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.line,amount_due:0
+msgid "Due Amount Tax incl."
+msgstr ""
+
+#. module: account_credit_control
+#: selection:credit.control.policy.level,computation_mode:0
+msgid "Due Date"
+msgstr ""
+
+#. module: account_credit_control
+#: selection:credit.control.policy.level,computation_mode:0
+msgid "Due Date, End Of Month"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.line,balance_due:0
+msgid "Due balance"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.line,date_due:0
+msgid "Due date"
+msgstr ""
+
+#. module: account_credit_control
+#: selection:credit.control.line,channel:0
+#: selection:credit.control.policy.level,channel:0
+msgid "Email"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.policy.level,email_template_id:0
+msgid "Email Template"
+msgstr ""
+
+#. module: account_credit_control
+#: selection:credit.control.line,state:0
+msgid "Emailing Error"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.line,date_entry:0
+msgid "Entry date"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.line:account_credit_control.credit_control_line_search
+#: selection:credit.control.line,state:0
+msgid "Error"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.line:account_credit_control.credit_control_line_search
+msgid "Filters"
+msgstr ""
+
+#. module: account_credit_control
+#: help:credit.control.policy,do_nothing:0
+msgid "For policies which should not generate lines or are obsolete"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.line:account_credit_control.credit_control_line_search
+msgid "Group By..."
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.communication,id:0 field:credit.control.emailer,id:0
+#: field:credit.control.line,id:0 field:credit.control.marker,id:0
+#: field:credit.control.policy,id:0 field:credit.control.policy.changer,id:0
+#: field:credit.control.policy.level,id:0 field:credit.control.printer,id:0
+#: field:credit.control.run,id:0
+msgid "ID"
+msgstr ""
+
+#. module: account_credit_control
+#: help:credit.control.run,manual_ids:0
+msgid ""
+"If a credit control line has been generatedon a policy and the policy has "
+"been changed in the meantime, it has to be handled manually"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.line:account_credit_control.credit_control_line_search
+#: selection:credit.control.line,state:0
+#: selection:credit.control.marker,name:0
+msgid "Ignored"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.line:account_credit_control.credit_control_line_search
+#: field:credit.control.line,invoice_id:0
+#: model:ir.model,name:account_credit_control.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_credit_control
+#: view:website:account_credit_control.report_credit_control_summary_document
+msgid "Invoice date"
+msgstr "Rechnungdatum"
+
+#. module: account_credit_control
+#: view:website:account_credit_control.report_credit_control_summary_document
+msgid "Invoice number"
+msgstr "Rechnungsnummer"
+
+#. module: account_credit_control
+#: view:website:account_credit_control.report_credit_control_summary_document
+msgid "Invoiced amount"
+msgstr "Betrag"
+
+#. module: account_credit_control
+#: view:account.invoice:account_credit_control.invoice_followup_form_view
+msgid "Issued Lines"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.communication,write_uid:0
+#: field:credit.control.emailer,write_uid:0
+#: field:credit.control.line,write_uid:0
+#: field:credit.control.marker,write_uid:0
+#: field:credit.control.policy,write_uid:0
+#: field:credit.control.policy.changer,write_uid:0
+#: field:credit.control.policy.level,write_uid:0
+#: field:credit.control.printer,write_uid:0
+#: field:credit.control.run,write_uid:0
+msgid "Last Updated by"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.communication,write_date:0
+#: field:credit.control.emailer,write_date:0
+#: field:credit.control.line,write_date:0
+#: field:credit.control.marker,write_date:0
+#: field:credit.control.policy,write_date:0
+#: field:credit.control.policy.changer,write_date:0
+#: field:credit.control.policy.level,write_date:0
+#: field:credit.control.printer,write_date:0
+#: field:credit.control.run,write_date:0
+msgid "Last Updated on"
+msgstr ""
+
+#. module: account_credit_control
+#: selection:credit.control.line,channel:0
+#: selection:credit.control.policy.level,channel:0
+msgid "Letter"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.communication,current_policy_level:0
+#: view:credit.control.line:account_credit_control.credit_control_line_search
+#: field:credit.control.policy.level,level:0
+msgid "Level"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.emailer:account_credit_control.credit_line_emailer_form
+#: view:credit.control.marker:account_credit_control.credit_line_marker_form
+#: view:credit.control.printer:account_credit_control.credit_line_printer_form
+msgid "Lines"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.line:account_credit_control.credit_control_line_search
+msgid "Lines already sent."
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.marker:account_credit_control.credit_line_marker_form
+msgid "Lines marker"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.printer:account_credit_control.credit_line_printer_form
+msgid "Lines report"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.run,manual_ids:0
+msgid "Lines to handle manually"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.line:account_credit_control.credit_control_line_search
+msgid "Lines which have been ignored from previous runs."
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.policy:account_credit_control.credit_control_policy_form
+#: view:credit.control.policy.level:account_credit_control.credit_mangement_policy_level_form
+msgid "Mail and reporting"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.emailer:account_credit_control.credit_line_emailer_form
+msgid "Mailer"
+msgstr ""
+
+#. module: account_credit_control
+#: view:account.invoice:account_credit_control.invoice_followup_form_view
+msgid "Manual Credit Control Policy"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.run:account_credit_control.credit_control_run_form
+msgid "Manual Lines"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.line:account_credit_control.credit_control_line_search
+msgid "Manual change"
+msgstr ""
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,custom_mail_text:account_credit_control.no_follow_1
+#: model:credit.control.policy.level,custom_text:account_credit_control.no_follow_1
+msgid "Manual no follow"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.line,manually_overridden:0
+msgid "Manually overridden"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.marker,name:0
+msgid "Mark as"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.printer,mark_as_sent:0
+msgid "Mark letter lines as sent"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_credit_control_emailer
+msgid "Mass credit line emailer"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_credit_control_marker
+msgid "Mass marker"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_credit_control_printer
+msgid "Mass printer"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.line:account_credit_control.credit_control_line_search
+msgid "More..."
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.line,move_line_id:0
+msgid "Move line"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.policy.changer,move_line_ids:0
+msgid "Move line to change"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.policy.changer:account_credit_control.credit_control_policy_changer_form
+msgid "Move lines to affect"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.policy,name:0 field:credit.control.policy.level,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.policy.changer,new_policy_id:0
+msgid "New Policy to Apply"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.policy.changer,new_policy_level_id:0
+msgid "New level to apply"
+msgstr ""
+
+#. module: account_credit_control
+#: code:addons/account_credit_control/wizard/credit_control_emailer.py:62
+#: code:addons/account_credit_control/wizard/credit_control_marker.py:74
+#: code:addons/account_credit_control/wizard/credit_control_printer.py:60
+#, python-format
+msgid "No credit control lines selected."
+msgstr ""
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,name:account_credit_control.no_follow_1
+msgid "No follow"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.policy.changer,do_nothing:0
+msgid "No follow  policy"
+msgstr ""
+
+#. module: account_credit_control
+#: code:addons/account_credit_control/wizard/credit_control_marker.py:78
+#, python-format
+msgid "No lines will be changed. All the selected lines are already done."
+msgstr ""
+
+#. module: account_credit_control
+#: help:credit.control.printer,mark_as_sent:0
+msgid "Only letter lines will be marked."
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.run:account_credit_control.credit_control_run_form
+msgid "Open Credit Control Lines"
+msgstr ""
+
+#. module: account_credit_control
+#: view:website:account_credit_control.report_credit_control_summary_document
+msgid "Open amount"
+msgstr "Offener Betrag"
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
+msgid ""
+"Our records indicate that we have not received the payment of the above "
+"mentioned invoice.\n"
+"        If it has already been sent, please disregard this notice. If not, "
+"please proceed with payment within 10 days.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
+msgstr ""
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,custom_text:account_credit_control.3_time_1
+msgid ""
+"Our records indicate that we have not received the payment of the above "
+"mentioned invoice.\n"
+"If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.\n"
+"\n"
+"Thank you in advance for your anticipated cooperation in this matter.\n"
+"\n"
+"Best regards\n"
+"      "
+msgstr ""
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,custom_mail_text:account_credit_control.3_time_1
+msgid ""
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.\n"
+"\n"
+"If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.\n"
+"\n"
+"Thank you in advance for your anticipated cooperation in this matter.\n"
+"\n"
+"Best regards\n"
+"      "
+msgstr ""
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,custom_mail_text:account_credit_control.2_time_1
+msgid ""
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.\n"
+"If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.\n"
+"\n"
+"Thank you in advance for your anticipated cooperation in this matter.\n"
+"\n"
+"Best regards\n"
+"      "
+msgstr ""
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,custom_text:account_credit_control.3_time_2
+msgid ""
+"Our records indicate that we have not yet received the payment of the above "
+"mentioned invoice despite our first reminder.\n"
+"        If it has already been sent, please disregard this notice. If not, "
+"please proceed with payment within 5 days.\n"
+"\n"
+"Thank you in advance for your anticipated cooperation in this matter.\n"
+"\n"
+"Best regards\n"
+"      "
+msgstr ""
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,custom_mail_text:account_credit_control.3_time_2
+msgid ""
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.\n"
+"        If it has already been sent, please disregard this notice. If not, "
+"please proceed with payment within 5 days.\n"
+"\n"
+"Thank you in advance for your anticipated cooperation in this matter.\n"
+"\n"
+"Best regards\n"
+"      "
+msgstr ""
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,custom_text:account_credit_control.2_time_2
+msgid ""
+"Our records indicate that we still have not received the payment of the "
+"above mentioned invoice despite our reminder.\n"
+"\n"
+"        If payment have already been sent, please disregard this notice. If "
+"not, please proceed with payment.\n"
+"        If your payment has not been received in the next 5 days, your file "
+"will be transfered to our debt\n"
+"        collection agency.\n"
+"\n"
+"        Should you need us to arrange a payment plan for you, please "
+"advise.\n"
+"        A customer account statement is enclosed for you convenience.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
+msgstr ""
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,custom_mail_text:account_credit_control.2_time_2
+msgid ""
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
+"\n"
+"If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.\n"
+"If your payment has not been received in the next 5 days, your file will be "
+"transfered to our debt\n"
+"        collection agency.\n"
+"\n"
+"        Should you need us to arrange a payment plan for you, please "
+"advise.\n"
+"        A customer account statement is enclosed for you convenience.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
+msgstr ""
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,custom_mail_text:account_credit_control.3_time_3
+msgid ""
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.\n"
+"        If payment have already been sent, please disregard this notice. If "
+"not, please proceed with payment.\n"
+"        If your payment has not been received in the next 5 days, your file "
+"will be transfered to our debt collection agency.\n"
+"\n"
+"        Should you need us to arrange a payment plan for you, please "
+"advise.\n"
+"        A customer account statement is enclosed for you convenience.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_mail_mail
+msgid "Outgoing Mails"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.line,policy_level_id:0
+msgid "Overdue Level"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.communication,partner_id:0
+#: view:credit.control.line:account_credit_control.credit_control_line_search
+#: field:credit.control.line,partner_id:0
+#: model:ir.model,name:account_credit_control.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: account_credit_control
+#: code:addons/account_credit_control/run.py:103
+#, python-format
+msgid "Please select a policy"
+msgstr ""
+
+#. module: account_credit_control
+#: code:addons/account_credit_control/wizard/credit_control_policy_changer.py:61
+#, python-format
+msgid "Please use wizard on customer invoices"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.run:account_credit_control.credit_control_run_form
+#: field:credit.control.run,policy_ids:0
+msgid "Policies"
+msgstr ""
+
+#. module: account_credit_control
+#: code:addons/account_credit_control/run.py:126
+#, python-format
+msgid "Policy \"%s\" has generated %d Credit Control Lines.\n"
+msgstr ""
+
+#. module: account_credit_control
+#: code:addons/account_credit_control/run.py:130
+#, python-format
+msgid "Policy \"%s\" has not generated any Credit Control Lines.\n"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.policy,level_ids:0
+msgid "Policy Levels"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.policy:account_credit_control.credit_control_policy_form
+#: view:credit.control.policy.level:account_credit_control.credit_mangement_policy_level_form
+msgid "Policy level"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.policy:account_credit_control.credit_control_policy_form
+msgid "Policy levels"
+msgstr ""
+
+#. module: account_credit_control
+#: selection:credit.control.policy.level,computation_mode:0
+msgid "Previous Reminder"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.printer:account_credit_control.credit_line_printer_form
+msgid "Print"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.open_credit_line_printer_wizard
+#: model:ir.actions.act_window,name:account_credit_control.open_credit_line_printer_wizard_menu_action
+msgid "Print Lines"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.actions.act_window,help:account_credit_control.open_credit_line_printer_wizard
+msgid "Print selected lines"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.printer:account_credit_control.credit_line_printer_form
+msgid "Print the selected lines"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.line:account_credit_control.credit_control_line_search
+#: selection:credit.control.line,state:0
+#: selection:credit.control.marker,name:0
+msgid "Ready To Send"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.line,policy_id:0
+#: field:credit.control.policy.level,policy_id:0
+msgid "Related Policy"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.run:account_credit_control.credit_control_run_form
+#: field:credit.control.run,report:0
+msgid "Report"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.line:account_credit_control.credit_control_line_search
+msgid "Run date"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.open_credit_line_emailer_wizard
+#: model:ir.actions.act_window,name:account_credit_control.open_credit_line_emailer_wizard_menu_action
+msgid "Send By Email"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.actions.act_window,help:account_credit_control.open_credit_line_emailer_wizard
+msgid "Send an email for the selected lines."
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.emailer:account_credit_control.credit_line_emailer_form
+msgid "Send emails for the selected lines"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.emailer:account_credit_control.credit_line_emailer_form
+msgid "Send the emails"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.line:account_credit_control.credit_control_line_search
+msgid "Sent"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.line,mail_message_id:0
+msgid "Sent Email"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.line,date_sent:0
+msgid "Sent date"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.policy.changer:account_credit_control.credit_control_policy_changer_form
+msgid "Set current credit level"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.policy.changer:account_credit_control.credit_control_policy_changer_form
+msgid "Set new policy"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.line,state:0 field:credit.control.run,state:0
+msgid "State"
+msgstr ""
+
+#. module: account_credit_control
+#: view:website:account_credit_control.report_credit_control_summary_document
+msgid "Summary"
+msgstr "Extrakt"
+
+#. module: account_credit_control
+#: help:account.invoice,credit_policy_id:0
+msgid ""
+"The Credit Control Policy used for this invoice. If nothing is defined, it "
+"will use the account setting or the partner setting."
+msgstr ""
+
+#. module: account_credit_control
+#: help:res.partner,credit_policy_id:0
+msgid ""
+"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."
+msgstr ""
+
+#. module: account_credit_control
+#: help:res.company,credit_policy_id:0
+msgid ""
+"The Credit Control Policy used on partners by default. This setting can be "
+"overridden on partners or invoices."
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.line:account_credit_control.credit_control_line_search
+msgid "The line was deprecated by a manual change of policy on invoice."
+msgstr ""
+
+#. module: account_credit_control
+#: help:credit.control.line,currency_id:0
+msgid "The optional other currency if it is a multi-currency entry."
+msgstr ""
+
+#. module: account_credit_control
+#: code:addons/account_credit_control/policy.py:258
+#, python-format
+msgid "The smallest level can not be of type Previous Reminder"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.line:account_credit_control.credit_control_line_search
+msgid "These lines are ready to send by email or by letter using the Actions."
+msgstr ""
+
+#. module: account_credit_control
+#: help:credit.control.policy,account_ids:0
+msgid "This policy will be active only for the selected accounts"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.policy.changer:account_credit_control.credit_control_policy_changer_form
+msgid ""
+"This wizard will let you set the overdue policy and level for selected "
+"invoices"
+msgstr ""
+
+#. module: account_credit_control
+#: view:website:account_credit_control.report_credit_control_summary_document
+msgid "Total Due"
+msgstr "Fälliger Restbetrag"
+
+#. module: account_credit_control
+#: view:website:account_credit_control.report_credit_control_summary_document
+msgid "Total Invoiced"
+msgstr "Endbetrag"
+
+#. module: account_credit_control
+#: field:credit.control.communication,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.marker:account_credit_control.credit_line_marker_form
+msgid "Warning: you will maybe not be able to revert this operation."
+msgstr ""
+
+#. module: account_credit_control
+#: code:addons/account_credit_control/line.py:223
+#, python-format
+msgid ""
+"You are not allowed to delete a credit control line that is not in draft "
+"state."
+msgstr ""
+
+#. module: account_credit_control
+#: code:addons/account_credit_control/policy.py:203
+#, python-format
+msgid ""
+"You can only use a policy set on account %s.\n"
+"Please choose one of the following policies:\n"
+" %s"
+msgstr ""
+
+#. module: account_credit_control
+#: code:addons/account_credit_control/invoice.py:57
+#, python-format
+msgid ""
+"You cannot cancel this invoice.\n"
+"A payment reminder has already been sent to the customer.\n"
+"You must create a credit note and issue a new invoice."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_credit_control_communication
+msgid "credit control communication"
+msgstr ""
+
+#. module: account_credit_control
+#: field:credit.control.line,level:0
+msgid "credit.control.policy.level"
+msgstr ""
+
+#. module: account_credit_control
+#: view:credit.control.emailer:account_credit_control.credit_line_emailer_form
+#: view:credit.control.marker:account_credit_control.credit_line_marker_form
+#: view:credit.control.policy.changer:account_credit_control.credit_control_policy_changer_form
+#: view:credit.control.printer:account_credit_control.credit_line_printer_form
+msgid "or"
+msgstr ""
diff --git a/account_credit_control/i18n/fr.po b/account_credit_control/i18n/fr.po
index 2bce01459..651ff4030 100644
--- a/account_credit_control/i18n/fr.po
+++ b/account_credit_control/i18n/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-13 13:11+0000\n"
+"POT-Creation-Date: 2015-01-26 10:32+0000\n"
 "PO-Revision-Date: 2014-10-30 14:59+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
@@ -96,7 +96,7 @@ msgid "A credit control line"
 msgstr "Ligne de relance"
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/run.py:93
+#: code:addons/account_credit_control/run.py:87
 #, python-format
 msgid "A credit control line more recent than %s exists at %s"
 msgstr "Une ligne plus récente que %s existe au %s"
@@ -107,7 +107,7 @@ msgid "A credit control policy level"
 msgstr "Une politique de relance"
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/run.py:161
+#: code:addons/account_credit_control/run.py:154
 #, python-format
 msgid ""
 "A credit control run is already running in background, please try later."
@@ -116,7 +116,7 @@ msgstr ""
 "d'essayer à nouveau plus tard."
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/run.py:86
+#: code:addons/account_credit_control/run.py:80
 #, python-format
 msgid "A run has already been executed more recently than %s"
 msgstr "Un contrôle a déjà été exécuté plus récemment que le %s "
@@ -401,11 +401,6 @@ msgstr "Message personnalisable"
 msgid "Date due"
 msgstr "Date d'échéance"
 
-#. module: account_credit_control
-#: view:website:account_credit_control.report_credit_control_summary_document
-msgid "Dear,"
-msgstr "Madame, Monsieur"
-
 #. module: account_credit_control
 #: model:ir.model,name:account_credit_control.model_credit_control_policy
 msgid "Define a reminder policy"
@@ -1054,7 +1049,7 @@ msgid "Partner"
 msgstr "Client"
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/run.py:109
+#: code:addons/account_credit_control/run.py:103
 #, python-format
 msgid "Please select a policy"
 msgstr "Choisissez une politique"
@@ -1312,7 +1307,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr "Attention: Cette opération ne peut pas être annulée"
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/line.py:226
+#: code:addons/account_credit_control/line.py:223
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/report/report_credit_control_summary.xml b/account_credit_control/report/report_credit_control_summary.xml
index d06cdbead..1b02093c8 100644
--- a/account_credit_control/report/report_credit_control_summary.xml
+++ b/account_credit_control/report/report_credit_control_summary.xml
@@ -17,11 +17,10 @@
           </div>
 
           <h2 id="policy_level">
-            <span>Reminder</span> <span t-field="o.current_policy_level.name"/>
+            <span t-field="o.current_policy_level.name"/>
           </h2>
 
-          <p>Dear,</p>
-          <p t-field="o.current_policy_level.custom_text"/>
+          <p class="mt32 mb32" t-field="o.current_policy_level.custom_text"/>
 
           <h3>Summary</h3>
 
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
index 6282315c6..a33c86d1e 100644
--- 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
@@ -1,13 +1,13 @@
-# Translation of OpenERP Server.
+# Translation of Odoo 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"
+"Project-Id-Version: Odoo Server 8.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"
+"POT-Creation-Date: 2014-12-22 11:00+0000\n"
+"PO-Revision-Date: 2014-12-22 11:00+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,29 +16,34 @@ msgstr ""
 "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
+#: field:credit.control.dunning.fees.computer,create_uid:0
+msgid "Created by"
+msgstr ""
+
+#. module: account_credit_control_dunning_fees
+#: field:credit.control.dunning.fees.computer,create_date:0
+msgid "Created on"
+msgstr ""
+
+#. module: account_credit_control_dunning_fees
 #: 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
+#: view:credit.control.policy:account_credit_control_dunning_fees.add_dunning_fees_on_policy
+#: view:website:account_credit_control.report_credit_control_summary_document
 msgid "Fees"
 msgstr ""
 
@@ -63,19 +68,27 @@ msgid "Fixed"
 msgstr ""
 
 #. module: account_credit_control_dunning_fees
-#: view:credit.control.policy:0
+#: field:credit.control.dunning.fees.computer,id:0
+msgid "ID"
+msgstr ""
+
+#. module: account_credit_control_dunning_fees
+#: field:credit.control.dunning.fees.computer,write_uid:0
+msgid "Last Updated by"
+msgstr ""
+
+#. module: account_credit_control_dunning_fees
+#: field:credit.control.dunning.fees.computer,write_date:0
+msgid "Last Updated on"
+msgstr ""
+
+#. module: account_credit_control_dunning_fees
+#: view:credit.control.policy:account_credit_control_dunning_fees.add_dunning_fees_on_policy
 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"
+msgid "Type"
 msgstr ""
 
diff --git a/account_credit_control_dunning_fees/i18n/de.po b/account_credit_control_dunning_fees/i18n/de.po
index f4fe9f0c3..bfc20cf23 100644
--- a/account_credit_control_dunning_fees/i18n/de.po
+++ b/account_credit_control_dunning_fees/i18n/de.po
@@ -77,5 +77,6 @@ msgstr "credit.control.dunning.fees.computer"
 
 #. module: account_credit_control_dunning_fees
 #: field:credit.control.policy.level,dunning_fees_type:0
-msgid "unknown"
-msgstr "unbekannt"
+msgid "Type"
+msgstr ""
+
diff --git a/account_credit_control_dunning_fees/i18n/fr.po b/account_credit_control_dunning_fees/i18n/fr.po
index df2e9e0ba..d8399fa54 100644
--- a/account_credit_control_dunning_fees/i18n/fr.po
+++ b/account_credit_control_dunning_fees/i18n/fr.po
@@ -6,39 +6,45 @@ 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"
+"POT-Creation-Date: 2014-12-22 11:00+0000\n"
 "PO-Revision-Date: 2014-04-16 07:11+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
+"Language: \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
+#: field:credit.control.dunning.fees.computer,create_uid:0
+msgid "Created by"
+msgstr ""
+
+#. module: account_credit_control_dunning_fees
+#: field:credit.control.dunning.fees.computer,create_date:0
+msgid "Created on"
+msgstr ""
+
+#. module: account_credit_control_dunning_fees
 #: 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
+#: view:credit.control.policy:account_credit_control_dunning_fees.add_dunning_fees_on_policy
+#: view:website:account_credit_control.report_credit_control_summary_document
 msgid "Fees"
 msgstr "Frais de relance"
 
@@ -63,18 +69,26 @@ msgid "Fixed"
 msgstr "Fixe"
 
 #. module: account_credit_control_dunning_fees
-#: view:credit.control.policy:0
+#: field:credit.control.dunning.fees.computer,id:0
+msgid "ID"
+msgstr ""
+
+#. module: account_credit_control_dunning_fees
+#: field:credit.control.dunning.fees.computer,write_uid:0
+msgid "Last Updated by"
+msgstr ""
+
+#. module: account_credit_control_dunning_fees
+#: field:credit.control.dunning.fees.computer,write_date:0
+msgid "Last Updated on"
+msgstr ""
+
+#. module: account_credit_control_dunning_fees
+#: view:credit.control.policy:account_credit_control_dunning_fees.add_dunning_fees_on_policy
 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"
+msgid "Type"
+msgstr "Type"
diff --git a/account_credit_control_dunning_fees/model/line.py b/account_credit_control_dunning_fees/model/line.py
index 699c38d45..23803ebac 100644
--- a/account_credit_control_dunning_fees/model/line.py
+++ b/account_credit_control_dunning_fees/model/line.py
@@ -18,7 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from openerp import models, fields
+from openerp import models, fields, api
 
 
 class CreditControlLine(models.Model):
@@ -27,3 +27,10 @@ class CreditControlLine(models.Model):
     _inherit = "credit.control.line"
 
     dunning_fees_amount = fields.Float(string='Fees')
+    balance_due_total = fields.Float(string='Balance due with fees',
+                                     compute='compute_balance_due')
+
+    @api.one
+    @api.depends('dunning_fees_amount', 'balance_due')
+    def compute_balance_due(self):
+        self.balance_due_total = self.balance_due + self.dunning_fees_amount
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
deleted file mode 100644
index 985a93403..000000000
--- a/account_credit_control_dunning_fees/report/credit_control_summary.html.mako
+++ /dev/null
@@ -1,246 +0,0 @@
-## -*- 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_credit_control_summary.xml b/account_credit_control_dunning_fees/report/report_credit_control_summary.xml
index 7bee3c5cf..e58ad2d9b 100644
--- a/account_credit_control_dunning_fees/report/report_credit_control_summary.xml
+++ b/account_credit_control_dunning_fees/report/report_credit_control_summary.xml
@@ -3,19 +3,19 @@
   <data>
     <template id="report_credit_control_summary_document_fees"
       inherit_id="account_credit_control.report_credit_control_summary_document">
-      <xpath expr="//table[@id='summary_table']/thead/tr/th[last()]" position="after">
+      <xpath expr="//table[@id='summary_table']/thead/tr/th[last()]" position="before">
         <th class="text-right">Fees</th>
       </xpath>
-      <xpath expr="//span[@t-field='l.balance_due']" position="replace">
-        <span t-field="l.balance_due"/>
-      </xpath>
-      <xpath expr="//table[@id='summary_table']/tbody/tr/td[last()]" position="after">
+      <xpath expr="//table[@id='summary_table']/tbody/tr/td[last()]" position="before">
         <td class="text-right">
-          <span t-field="l.dunning_fees_amount"
-            t-field-options='{"widget": "monetary",
-            "display_currency": "l.currency_id or l.company_id.currency_id"}'/>
+          <span t-field="l.dunning_fees_amount"/>
         </td>
       </xpath>
+      <xpath expr="//span[@t-field='l.balance_due']" position="replace">
+        <span t-field="l.balance_due_total"
+          t-field-options='{"widget": "monetary",
+          "display_currency": "l.currency_id or l.company_id.currency_id"}'/>
+      </xpath>
     </template>
 
   </data>