diff --git a/account_credit_control/i18n/account_credit_control.pot b/account_credit_control/i18n/account_credit_control.pot
new file mode 100644
index 000000000..dbf4654b3
--- /dev/null
+++ b/account_credit_control/i18n/account_credit_control.pot
@@ -0,0 +1,1254 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* account_credit_control
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0\n"
+"Report-Msgid-Bugs-To: \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
+#: 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 invoice mentioned below 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:mail.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 | safe}\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.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
+msgid "<strong>Total Due</strong>"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
+msgid "<strong>Total Invoiced</strong>"
+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/models/credit_control_run.py:78
+#, 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/models/credit_control_run.py:144
+#, 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/models/credit_control_run.py:71
+#, python-format
+msgid "A run has already been executed more recently than %s"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_account_account
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_account_id
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Account"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_account_ids
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_policy_form
+msgid "Accounts"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_active
+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
+#: model:ir.ui.view,arch_db: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/models/credit_control_policy.py:296
+#, python-format
+msgid "Can not get function for computation mode: %s is not implemented"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_policy_changer_form
+#: model:ir.ui.view,arch_db:account_credit_control.credit_line_emailer_form
+#: model:ir.ui.view,arch_db:account_credit_control.credit_line_marker_form
+#: model:ir.ui.view,arch_db:account_credit_control.credit_line_printer_form
+msgid "Cancel"
+msgstr ""
+
+#. module: account_credit_control
+#: 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
+#: model:ir.ui.view,arch_db:account_credit_control.credit_line_marker_form
+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
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_policy_changer_form
+msgid "Change the overdue level of current invoice"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db: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
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_channel
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_level_channel
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Channel"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_communication_company_id
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_company_id
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_company_id
+msgid "Company"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
+msgid "Compute Credit Control Lines"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_level_computation_mode
+msgid "Compute Mode"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_communication_contact_address
+msgid "Contact Address"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_form
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_tree
+msgid "Control Credit Lines"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_run_date
+msgid "Controlling Date"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_date
+msgid "Controlling date"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_communication_create_uid
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_emailer_create_uid
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_create_uid
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_marker_create_uid
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_changer_create_uid
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_create_uid
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_level_create_uid
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_printer_create_uid
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_run_create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_communication_create_date
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_emailer_create_date
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_create_date
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_marker_create_date
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_changer_create_date
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_create_date
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_level_create_date
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_printer_create_date
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_run_create_date
+msgid "Created on"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.module.category,name:account_credit_control.category_credit_control
+#: 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
+#: model:ir.ui.view,arch_db:account_credit_control.invoice_followup_form_view
+msgid "Credit Control"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.credit_control_line_action
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_emailer_line_ids
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_marker_line_ids
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_printer_line_ids
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_credit_control_line_ids
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_credit_control_line_ids
+#: model:ir.ui.menu,name:account_credit_control.credit_control_line_action_menu
+#: model:ir.ui.view,arch_db:account_credit_control.invoice_followup_form_view
+msgid "Credit Control Lines"
+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
+#: model:ir.model.fields,field_description:account_credit_control.field_account_invoice_credit_policy_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_company_credit_policy_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_credit_policy_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_credit_policy_id
+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
+#: model:ir.model.fields,field_description:account_credit_control.field_res_company_credit_control_tolerance
+msgid "Credit Control Tolerance"
+msgstr ""
+
+#. module: account_credit_control
+#: model:mail.template,subject:account_credit_control.email_template_credit_control_base
+msgid "Credit Control:\n"
+"            (${object.current_policy_level.name or 'n/a'})\n"
+"        "
+msgstr ""
+
+#. module: account_credit_control
+#: 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
+#: model:ir.model.fields,field_description:account_credit_control.field_account_account_credit_control_line_ids
+#: model:ir.model.fields,field_description:account_credit_control.field_account_invoice_credit_control_line_ids
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_communication_credit_control_line_ids
+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
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_policy_form
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_policy_tree
+msgid "Credit control policy"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_policy_form
+msgid "Credit control policy Level"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_policy_level_tree
+msgid "Credit control policy level"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_tree
+msgid "Credit control run"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Credit policy"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Credit policy level"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_communication_currency_id
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_level_custom_mail_text
+msgid "Custom Mail Message"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_level_custom_text
+msgid "Custom Message"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_level_custom_text_after_details
+msgid "Custom Message after details"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
+msgid "Date due"
+msgstr ""
+
+#. 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
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_level_delay_days
+msgid "Delay (in days)"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_policy_form
+#: model:ir.ui.view,arch_db:account_credit_control.credit_mangement_policy_level_form
+msgid "Delay Setting"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_communication_display_name
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_emailer_display_name
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_display_name
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_marker_display_name
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_changer_display_name
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_display_name
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_level_display_name
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_printer_display_name
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_run_display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
+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
+#: selection:credit.control.line,state:0
+#: selection:credit.control.run,state:0
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Draft"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Draft lines have to be triaged."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_credit_control_line_state
+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
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_amount_due
+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
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_balance_due
+msgid "Due balance"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_date_due
+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
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_level_email_template_id
+msgid "Email Template"
+msgstr ""
+
+#. module: account_credit_control
+#: selection:credit.control.line,state:0
+msgid "Emailing Error"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_date_entry
+msgid "Entry date"
+msgstr ""
+
+#. module: account_credit_control
+#: selection:credit.control.line,state:0
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Error"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Filters"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
+msgid "For policies which should not generate lines or are obsolete"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_run_line_ids
+msgid "Generated lines"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Group By"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_communication_id
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_emailer_id
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_id
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_marker_id
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_changer_id
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_id
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_level_id
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_printer_id
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_run_id
+msgid "ID"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_credit_control_run_manual_ids
+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
+#: selection:credit.control.line,state:0
+#: selection:credit.control.marker,name:0
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Ignored"
+msgstr ""
+
+#. module: account_credit_control
+#: model:res.groups,name:account_credit_control.group_account_credit_control_info
+msgid "Info"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_account_invoice
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_invoice_id
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Invoice"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
+msgid "Invoice date"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
+msgid "Invoice number"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
+msgid "Invoiced amount"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.invoice_followup_form_view
+msgid "Issued Lines"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_communication___last_update
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_emailer___last_update
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line___last_update
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_marker___last_update
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy___last_update
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_changer___last_update
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_level___last_update
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_printer___last_update
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_run___last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_communication_write_uid
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_emailer_write_uid
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_write_uid
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_marker_write_uid
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_changer_write_uid
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_level_write_uid
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_write_uid
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_printer_write_uid
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_run_write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_communication_write_date
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_emailer_write_date
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_write_date
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_marker_write_date
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_changer_write_date
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_level_write_date
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_write_date
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_printer_write_date
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_run_write_date
+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
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_communication_current_policy_level
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_level
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_level_level
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Level"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_line_emailer_form
+#: model:ir.ui.view,arch_db:account_credit_control.credit_line_marker_form
+#: model:ir.ui.view,arch_db:account_credit_control.credit_line_printer_form
+msgid "Lines"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Lines already sent."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_line_marker_form
+msgid "Lines marker"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_line_printer_form
+msgid "Lines report"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_run_manual_ids
+msgid "Lines to handle manually"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Lines which have been ignored from previous runs."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_policy_form
+#: model:ir.ui.view,arch_db:account_credit_control.credit_mangement_policy_level_form
+msgid "Mail and reporting"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_line_emailer_form
+msgid "Mailer"
+msgstr ""
+
+#. module: account_credit_control
+#: model:res.groups,name:account_credit_control.group_account_credit_control_manager
+msgid "Manager"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.invoice_followup_form_view
+msgid "Manual Credit Control Policy"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
+msgid "Manual Lines"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual change"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manually_overridden
+msgid "Manually overridden"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_marker_name
+msgid "Mark as"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_printer_mark_as_sent
+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
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_move_line_id
+msgid "Move line"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_changer_move_line_ids
+msgid "Move line to change"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_policy_changer_form
+msgid "Move lines to affect"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_level_name
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_name
+msgid "Name"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_changer_new_policy_id
+msgid "New Policy to Apply"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_changer_new_policy_level_id
+msgid "New level to apply"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
+#. module: account_credit_control
+#: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
+#: code:addons/account_credit_control/wizard/credit_control_marker.py:59
+#: code:addons/account_credit_control/wizard/credit_control_printer.py:45
+#, 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
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_changer_do_nothing
+msgid "No follow  policy"
+msgstr ""
+
+#. module: account_credit_control
+#: code:addons/account_credit_control/wizard/credit_control_marker.py:63
+#, python-format
+msgid "No lines will be changed. All the selected lines are already done."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_credit_control_printer_mark_as_sent
+msgid "Only letter lines will be marked."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
+msgid "Open Credit Control Lines"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
+msgid "Open amount"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid "Optionally you can assign a user to this field, which will make him responsible for the action."
+msgstr ""
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
+#: 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 invoice mentioned below.\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.<br>\n"
+"  <br>\n"
+"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  <br>\n"
+"  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
+"  <br>\n"
+"  Best regards"
+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.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  <br>\n"
+"  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
+"  <br>\n"
+"  Best regards"
+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 invoice mentioned below 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.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"  <br>\n"
+"  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
+"  <br>\n"
+"  Best regards"
+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"
+"  <br>\n"
+"  <br>\n"
+"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  collection agency.<br>\n"
+"  <br>\n"
+"  Should you need us to arrange a payment plan for you, please advise.<br>\n"
+"  A customer account statement is enclosed for you convenience.<br>\n"
+"  <br>\n"
+"  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
+"  <br>\n"
+"  Best regards"
+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.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"  <br>\n"
+"  Should you need us to arrange a payment plan for you, please advise.<br>\n"
+"  A customer account statement is enclosed for you convenience.<br>\n"
+"  <br>\n"
+"  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
+"  <br>\n"
+"  Best regards"
+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 mentioned below 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 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
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_policy_level_id
+msgid "Overdue Level"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_res_partner
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_communication_partner_id
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_partner_id
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Partner"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
+#. module: account_credit_control
+#: code:addons/account_credit_control/models/credit_control_run.py:92
+#, python-format
+msgid "Please select a policy"
+msgstr ""
+
+#. module: account_credit_control
+#: code:addons/account_credit_control/wizard/credit_control_policy_changer.py:47
+#, python-format
+msgid "Please use wizard on customer invoices"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_run_policy_ids
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
+msgid "Policies"
+msgstr ""
+
+#. module: account_credit_control
+#: code:addons/account_credit_control/models/credit_control_run.py:115
+#, python-format
+msgid "Policy \"<b>%s</b>\" has generated <b>%d Credit Control Lines.</b><br/>"
+msgstr ""
+
+#. module: account_credit_control
+#: code:addons/account_credit_control/models/credit_control_run.py:119
+#, python-format
+msgid "Policy \"<b>%s</b>\" has not generated any Credit Control Lines.<br/>"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_level_ids
+msgid "Policy Levels"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_policy_form
+#: model:ir.ui.view,arch_db:account_credit_control.credit_mangement_policy_level_form
+msgid "Policy level"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db: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
+#: model:ir.ui.view,arch_db: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
+#: model:ir.ui.view,arch_db:account_credit_control.credit_line_printer_form
+msgid "Print the selected lines"
+msgstr ""
+
+#. module: account_credit_control
+#: selection:credit.control.line,state:0
+#: selection:credit.control.marker,name:0
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Ready To Send"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_policy_id
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_level_policy_id
+msgid "Related Policy"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_run_report
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
+msgid "Report"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_communication_report_date
+msgid "Report Date"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db: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
+#: model:ir.ui.view,arch_db:account_credit_control.credit_line_emailer_form
+msgid "Send emails for the selected lines"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_line_emailer_form
+msgid "Send the emails"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Sent"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_mail_message_id
+msgid "Sent Email"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_date_sent
+msgid "Sent date"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_policy_changer_form
+msgid "Set current credit level"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_policy_changer_form
+msgid "Set new policy"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_run_id
+msgid "Source"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_state
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_run_state
+msgid "State"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
+msgid "Summary"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_account_invoice_credit_policy_id
+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
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_credit_policy_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_credit_policy_id
+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
+#: model:ir.model.fields,help:account_credit_control.field_res_company_credit_policy_id
+msgid "The Credit Control Policy used on partners by default. This setting can be overridden on partners or invoices."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db: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
+#: model:ir.model.fields,help:account_credit_control.field_credit_control_line_currency_id
+msgid "The optional other currency if it is a multi-currency entry."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
+#. module: account_credit_control
+#: code:addons/account_credit_control/models/credit_control_policy.py:246
+#, python-format
+msgid "The smallest level can not be of type Previous Reminder"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db: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
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
+msgid "This policy will be active only for the selected accounts"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db: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
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_communication_total_due
+msgid "Total Due"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_communication_total_invoiced
+msgid "Total Invoiced"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_communication_user_id
+#: model:res.groups,name:account_credit_control.group_account_credit_control_user
+msgid "User"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db: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/models/credit_control_line.py:217
+#, 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/models/credit_control_policy.py:186
+#, 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/models/account_invoice.py:45
+#, 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
+#: model:ir.model,name:account_credit_control.model_credit_control_policy_changer
+msgid "credit.control.policy.changer"
+msgstr ""
+
diff --git a/account_credit_control/i18n/am.po b/account_credit_control/i18n/am.po
index 9d76a6ee8..96fa007f4 100644
--- a/account_credit_control/i18n/am.po
+++ b/account_credit_control/i18n/am.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,29 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Amharic (https://www.transifex.com/oca/teams/23907/am/)\n"
+"Language: am\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: am\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +383,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +428,11 @@ msgstr ""
 msgid "Display Name"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +520,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +711,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +733,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +805,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +856,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +883,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +897,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +910,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +925,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +938,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +959,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +977,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1014,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1215,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1231,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1277,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/ar.po b/account_credit_control/i18n/ar.po
index 24b84679b..4152926e7 100644
--- a/account_credit_control/i18n/ar.po
+++ b/account_credit_control/i18n/ar.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,30 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/oca/teams/23907/ar/)\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "اسم العرض"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr "الشريك"
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/bg.po b/account_credit_control/i18n/bg.po
index b3aa5a8f8..6e53640a6 100644
--- a/account_credit_control/i18n/bg.po
+++ b/account_credit_control/i18n/bg.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,29 @@ msgstr ""
 "PO-Revision-Date: 2017-12-22 03:41+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Bulgarian (https://www.transifex.com/oca/teams/23907/bg/)\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +383,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +428,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Име за показване"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +520,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +711,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +733,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +805,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +856,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +883,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +897,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +910,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +925,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +938,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +959,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +977,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1014,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1215,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1231,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1277,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/bs.po b/account_credit_control/i18n/bs.po
index a05e8b229..48d398cd1 100644
--- a/account_credit_control/i18n/bs.po
+++ b/account_credit_control/i18n/bs.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,30 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Bosnian (https://www.transifex.com/oca/teams/23907/bs/)\n"
+"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: bs\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Prikaži naziv"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr "Partner"
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/ca.po b/account_credit_control/i18n/ca.po
index 1019e1cf0..a9a79ca97 100644
--- a/account_credit_control/i18n/ca.po
+++ b/account_credit_control/i18n/ca.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,29 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +383,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +428,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Veure el nom"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +520,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +711,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +733,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +805,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +856,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +883,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +897,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +910,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +925,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +938,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +959,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +977,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1014,12 @@ msgstr ""
 msgid "Partner"
 msgstr "Empresa"
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1215,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1231,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1277,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/ca_ES.po b/account_credit_control/i18n/ca_ES.po
index 3fe49e82f..f485fae86 100644
--- a/account_credit_control/i18n/ca_ES.po
+++ b/account_credit_control/i18n/ca_ES.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,25 +11,31 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:23+0000\n"
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Catalan (Spain) (https://www.transifex.com/oca/teams/23907/ca_ES/)\n"
+"Language-Team: Catalan (Spain) (https://www.transifex.com/oca/teams/23907/"
+"ca_ES/)\n"
+"Language: ca_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ca_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/cs.po b/account_credit_control/i18n/cs.po
index d8eafef21..12ed31111 100644
--- a/account_credit_control/i18n/cs.po
+++ b/account_credit_control/i18n/cs.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,29 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Czech (https://www.transifex.com/oca/teams/23907/cs/)\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +383,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +428,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Zobrazovaný název"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +520,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +711,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +733,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +805,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +856,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +883,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +897,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +910,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +925,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +938,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +959,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +977,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1014,12 @@ msgstr ""
 msgid "Partner"
 msgstr "Společník"
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1215,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1231,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1277,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/da.po b/account_credit_control/i18n/da.po
index 471b5483c..80a82fbe5 100644
--- a/account_credit_control/i18n/da.po
+++ b/account_credit_control/i18n/da.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,29 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/oca/teams/23907/da/)\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +383,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +428,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Vist navn"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +520,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +711,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +733,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +805,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +856,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +883,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +897,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +910,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +925,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +938,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +959,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +977,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1014,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1215,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1231,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1277,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/da_DK.po b/account_credit_control/i18n/da_DK.po
index eb829b65b..e98cb7c77 100644
--- a/account_credit_control/i18n/da_DK.po
+++ b/account_credit_control/i18n/da_DK.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* account_credit_control
+# 	* account_credit_control
 #
 msgid ""
 msgstr ""
@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2017-11-08 21:20+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"
@@ -380,6 +381,11 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
 #: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
@@ -420,14 +426,19 @@ msgstr ""
 msgid "Display Name"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 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
+#: selection:credit.control.line,state:0
+#: selection:credit.control.marker,name:0 selection:credit.control.run,state:0
 msgid "Done"
 msgstr ""
 
@@ -507,6 +518,11 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
 #: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
@@ -549,7 +565,8 @@ msgid ""
 msgstr ""
 
 #. module: account_credit_control
-#: selection:credit.control.line,state:0 selection:credit.control.marker,name:0
+#: selection:credit.control.line,state:0
+#: selection:credit.control.marker,name:0
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
 msgid "Ignored"
 msgstr ""
@@ -692,6 +709,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -702,6 +731,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -1057,7 +1091,8 @@ msgid "Print the selected lines"
 msgstr ""
 
 #. module: account_credit_control
-#: selection:credit.control.line,state:0 selection:credit.control.marker,name:0
+#: selection:credit.control.line,state:0
+#: selection:credit.control.marker,name:0
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
 msgid "Ready To Send"
 msgstr ""
@@ -1178,6 +1213,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1235,7 +1275,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/de.po b/account_credit_control/i18n/de.po
index 8f2c96353..390158990 100644
--- a/account_credit_control/i18n/de.po
+++ b/account_credit_control/i18n/de.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
@@ -13,32 +13,43 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: Rudolf Schnapka <rs@techno-flex.de>, 2017\n"
 "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
 msgstr ""
 "\n"
-"Unsere Buchhaltung weist aus, dass wir, trotz zweier Erinnerungen, die Zahlung zu unten aufgeführten Rechnungen bei uns nicht eingegangen ist.\n"
-"  Sollten die Zahlungen zwischenzeitlich erfolgt sein, so betrachten Sie dieses Schreiben bitte als gegenstandslos. Ansonsten nehmen Sie die Zahlung bitte vor. Können wir nicht innerhalb der kommenden 5 Werktage einen entsprechenden Zahlungseingang verbuchen, werden wir die Forderung an eine beauftragte Agentur abtreten.\n"
-"   Wünschen Sie geänderte Zahlungsmodalitäten, sprechen Sie uns bitte an. Ein Kunden-Kontoauszug wurde für Sie beigefügt.\n"
+"Unsere Buchhaltung weist aus, dass wir, trotz zweier Erinnerungen, die "
+"Zahlung zu unten aufgeführten Rechnungen bei uns nicht eingegangen ist.\n"
+"  Sollten die Zahlungen zwischenzeitlich erfolgt sein, so betrachten Sie "
+"dieses Schreiben bitte als gegenstandslos. Ansonsten nehmen Sie die Zahlung "
+"bitte vor. Können wir nicht innerhalb der kommenden 5 Werktage einen "
+"entsprechenden Zahlungseingang verbuchen, werden wir die Forderung an eine "
+"beauftragte Agentur abtreten.\n"
+"   Wünschen Sie geänderte Zahlungsmodalitäten, sprechen Sie uns bitte an. "
+"Ein Kunden-Kontoauszug wurde für Sie beigefügt.\n"
 "  Vielen Dank für Ihre mutmaßliche Zusammenarbeit in dieser Angelegenheit.\n"
 "\n"
 "Mit freundlichem Gruß"
@@ -877,10 +888,13 @@ msgstr ""
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -889,9 +903,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -901,8 +917,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -912,10 +930,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -924,8 +945,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -935,11 +958,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -953,9 +979,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -968,15 +997,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -1263,7 +1297,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:216
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/el_GR.po b/account_credit_control/i18n/el_GR.po
index f50f41ce8..2a23a7df9 100644
--- a/account_credit_control/i18n/el_GR.po
+++ b/account_credit_control/i18n/el_GR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,25 +11,31 @@ msgstr ""
 "POT-Creation-Date: 2017-12-22 03:41+0000\n"
 "PO-Revision-Date: 2017-12-22 03:41+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Greek (Greece) (https://www.transifex.com/oca/teams/23907/el_GR/)\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/oca/teams/23907/"
+"el_GR/)\n"
+"Language: el_GR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/en_AU.po b/account_credit_control/i18n/en_AU.po
index 0f4d746e5..299afca9f 100644
--- a/account_credit_control/i18n/en_AU.po
+++ b/account_credit_control/i18n/en_AU.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,25 +11,31 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:23+0000\n"
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: English (Australia) (https://www.transifex.com/oca/teams/23907/en_AU/)\n"
+"Language-Team: English (Australia) (https://www.transifex.com/oca/"
+"teams/23907/en_AU/)\n"
+"Language: en_AU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: en_AU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/en_GB.po b/account_credit_control/i18n/en_GB.po
index 3ff98d7e6..9125f8dc1 100644
--- a/account_credit_control/i18n/en_GB.po
+++ b/account_credit_control/i18n/en_GB.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,25 +11,31 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:23+0000\n"
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: English (United Kingdom) (https://www.transifex.com/oca/teams/23907/en_GB/)\n"
+"Language-Team: English (United Kingdom) (https://www.transifex.com/oca/"
+"teams/23907/en_GB/)\n"
+"Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Display Name"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr "Partner"
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/es.po b/account_credit_control/i18n/es.po
index 7678a2fe0..582222afe 100644
--- a/account_credit_control/i18n/es.po
+++ b/account_credit_control/i18n/es.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2017
@@ -13,24 +13,29 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: Pedro M. Baeza <pedro.baeza@gmail.com>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -379,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -413,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -500,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -680,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -690,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -757,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -796,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -812,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -824,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -835,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -847,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -858,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -876,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -891,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -923,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr "Empresa"
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1118,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1129,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1163,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/es_AR.po b/account_credit_control/i18n/es_AR.po
index fc4fd30f9..d6107f1b5 100644
--- a/account_credit_control/i18n/es_AR.po
+++ b/account_credit_control/i18n/es_AR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,25 +11,31 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:23+0000\n"
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Argentina) (https://www.transifex.com/oca/teams/23907/es_AR/)\n"
+"Language-Team: Spanish (Argentina) (https://www.transifex.com/oca/"
+"teams/23907/es_AR/)\n"
+"Language: es_AR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Mostrar Nombre"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/es_CL.po b/account_credit_control/i18n/es_CL.po
index 3b9d5816d..bf07982fa 100644
--- a/account_credit_control/i18n/es_CL.po
+++ b/account_credit_control/i18n/es_CL.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,25 +11,31 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:23+0000\n"
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Chile) (https://www.transifex.com/oca/teams/23907/es_CL/)\n"
+"Language-Team: Spanish (Chile) (https://www.transifex.com/oca/teams/23907/"
+"es_CL/)\n"
+"Language: es_CL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_CL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/es_CO.po b/account_credit_control/i18n/es_CO.po
index a5c9d531f..c79b0d002 100644
--- a/account_credit_control/i18n/es_CO.po
+++ b/account_credit_control/i18n/es_CO.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,25 +11,31 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:23+0000\n"
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Colombia) (https://www.transifex.com/oca/teams/23907/es_CO/)\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/oca/teams/23907/"
+"es_CO/)\n"
+"Language: es_CO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Nombre Público"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/es_CR.po b/account_credit_control/i18n/es_CR.po
index c32983e41..0f51e7e40 100644
--- a/account_credit_control/i18n/es_CR.po
+++ b/account_credit_control/i18n/es_CR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,25 +11,31 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:23+0000\n"
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Costa Rica) (https://www.transifex.com/oca/teams/23907/es_CR/)\n"
+"Language-Team: Spanish (Costa Rica) (https://www.transifex.com/oca/"
+"teams/23907/es_CR/)\n"
+"Language: es_CR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_CR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr "Empresa"
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/es_DO.po b/account_credit_control/i18n/es_DO.po
index cfa980203..bf58f70f4 100644
--- a/account_credit_control/i18n/es_DO.po
+++ b/account_credit_control/i18n/es_DO.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,25 +11,31 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:23+0000\n"
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Dominican Republic) (https://www.transifex.com/oca/teams/23907/es_DO/)\n"
+"Language-Team: Spanish (Dominican Republic) (https://www.transifex.com/oca/"
+"teams/23907/es_DO/)\n"
+"Language: es_DO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_DO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/es_EC.po b/account_credit_control/i18n/es_EC.po
index 577139413..5411737b1 100644
--- a/account_credit_control/i18n/es_EC.po
+++ b/account_credit_control/i18n/es_EC.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 # Cristian Salamea <ovnicraft@gmail.com>, 2017
@@ -12,25 +12,31 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:23+0000\n"
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: Cristian Salamea <ovnicraft@gmail.com>, 2017\n"
-"Language-Team: Spanish (Ecuador) (https://www.transifex.com/oca/teams/23907/es_EC/)\n"
+"Language-Team: Spanish (Ecuador) (https://www.transifex.com/oca/teams/23907/"
+"es_EC/)\n"
+"Language: es_EC\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_EC\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -379,6 +385,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -413,6 +430,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -500,6 +522,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -680,6 +713,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -690,6 +735,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -757,6 +807,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -796,14 +858,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -812,9 +885,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -824,8 +899,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -835,10 +912,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -847,8 +927,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -858,11 +940,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -876,9 +961,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -891,15 +979,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -923,6 +1016,12 @@ msgstr ""
 msgid "Partner"
 msgstr "Empresa"
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1118,6 +1217,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1129,6 +1233,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1163,7 +1279,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/es_ES.po b/account_credit_control/i18n/es_ES.po
index b27caf4aa..4521c16e6 100644
--- a/account_credit_control/i18n/es_ES.po
+++ b/account_credit_control/i18n/es_ES.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,25 +11,31 @@ msgstr ""
 "POT-Creation-Date: 2018-02-01 03:44+0000\n"
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Spain) (https://www.transifex.com/oca/teams/23907/es_ES/)\n"
+"Language-Team: Spanish (Spain) (https://www.transifex.com/oca/teams/23907/"
+"es_ES/)\n"
+"Language: es_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -863,10 +869,13 @@ msgstr ""
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -875,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -887,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -898,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -910,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -921,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -939,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -954,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -1249,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:216
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/es_MX.po b/account_credit_control/i18n/es_MX.po
index ed4acbe0f..e61b31e30 100644
--- a/account_credit_control/i18n/es_MX.po
+++ b/account_credit_control/i18n/es_MX.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,25 +11,31 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:23+0000\n"
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Mexico) (https://www.transifex.com/oca/teams/23907/es_MX/)\n"
+"Language-Team: Spanish (Mexico) (https://www.transifex.com/oca/teams/23907/"
+"es_MX/)\n"
+"Language: es_MX\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Nombre desplegado"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr "Empresa"
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/es_PE.po b/account_credit_control/i18n/es_PE.po
index ea4ae4454..b7d347bfb 100644
--- a/account_credit_control/i18n/es_PE.po
+++ b/account_credit_control/i18n/es_PE.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,25 +11,31 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:23+0000\n"
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Peru) (https://www.transifex.com/oca/teams/23907/es_PE/)\n"
+"Language-Team: Spanish (Peru) (https://www.transifex.com/oca/teams/23907/"
+"es_PE/)\n"
+"Language: es_PE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_PE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Nombre a Mostrar"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/es_PY.po b/account_credit_control/i18n/es_PY.po
index 257a5ad00..e6fa30604 100644
--- a/account_credit_control/i18n/es_PY.po
+++ b/account_credit_control/i18n/es_PY.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,25 +11,31 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:23+0000\n"
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Paraguay) (https://www.transifex.com/oca/teams/23907/es_PY/)\n"
+"Language-Team: Spanish (Paraguay) (https://www.transifex.com/oca/teams/23907/"
+"es_PY/)\n"
+"Language: es_PY\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_PY\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/es_VE.po b/account_credit_control/i18n/es_VE.po
index 835ae8af1..b54950958 100644
--- a/account_credit_control/i18n/es_VE.po
+++ b/account_credit_control/i18n/es_VE.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,25 +11,31 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:23+0000\n"
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Venezuela) (https://www.transifex.com/oca/teams/23907/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/oca/"
+"teams/23907/es_VE/)\n"
+"Language: es_VE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Mostrar nombre"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr "Empresa"
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/et.po b/account_credit_control/i18n/et.po
index f787e3b15..d65b8e0cb 100644
--- a/account_credit_control/i18n/et.po
+++ b/account_credit_control/i18n/et.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,29 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Estonian (https://www.transifex.com/oca/teams/23907/et/)\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +383,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +428,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Näidatav nimi"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +520,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +711,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +733,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +805,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +856,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +883,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +897,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +910,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +925,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +938,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +959,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +977,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1014,12 @@ msgstr ""
 msgid "Partner"
 msgstr "Partner"
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1215,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1231,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1277,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/eu.po b/account_credit_control/i18n/eu.po
index 9fd2375f2..7ac145915 100644
--- a/account_credit_control/i18n/eu.po
+++ b/account_credit_control/i18n/eu.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,29 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Basque (https://www.transifex.com/oca/teams/23907/eu/)\n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +383,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +428,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Izena erakutsi"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +520,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +711,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +733,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +805,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +856,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +883,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +897,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +910,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +925,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +938,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +959,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +977,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1014,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1215,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1231,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1277,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/fa.po b/account_credit_control/i18n/fa.po
index 5b40aad1c..22527033b 100644
--- a/account_credit_control/i18n/fa.po
+++ b/account_credit_control/i18n/fa.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,29 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Persian (https://www.transifex.com/oca/teams/23907/fa/)\n"
+"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +383,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +428,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "نام نمایشی"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +520,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +711,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +733,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +805,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +856,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +883,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +897,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +910,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +925,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +938,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +959,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +977,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1014,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1215,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1231,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1277,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/fi.po b/account_credit_control/i18n/fi.po
index 1408aa307..37719e0c6 100644
--- a/account_credit_control/i18n/fi.po
+++ b/account_credit_control/i18n/fi.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,29 @@ msgstr ""
 "PO-Revision-Date: 2017-12-22 03:41+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Finnish (https://www.transifex.com/oca/teams/23907/fi/)\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +383,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +428,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Nimi"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +520,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +711,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +733,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +805,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +856,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +883,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +897,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +910,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +925,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +938,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +959,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +977,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1014,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1215,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1231,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1277,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/fr.po b/account_credit_control/i18n/fr.po
index 5ba5d3fae..fb1240235 100644
--- a/account_credit_control/i18n/fr.po
+++ b/account_credit_control/i18n/fr.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,29 @@ msgstr ""
 "PO-Revision-Date: 2018-02-23 01:41+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -463,7 +468,8 @@ msgid ""
 msgstr ""
 "Lignes brouillons à traiter.\n"
 "Les lignes ignorées ne seront pas traitées.\n"
-"Les lignes brouillons ou ignorées seront régénérées lors du prochain contrôle."
+"Les lignes brouillons ou ignorées seront régénérées lors du prochain "
+"contrôle."
 
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_amount_due
@@ -568,8 +574,8 @@ 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 ""
-"Si la ligne a été générée avec une politique de relance différente elle doit"
-" être traitée manuellement"
+"Si la ligne a été générée avec une politique de relance différente elle doit "
+"être traitée manuellement"
 
 #. module: account_credit_control
 #: selection:credit.control.line,state:0
@@ -875,10 +881,13 @@ msgstr ""
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -887,9 +896,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -899,8 +910,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -910,10 +923,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,8 +938,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -933,11 +951,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -951,9 +972,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -966,15 +990,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -1027,16 +1056,16 @@ msgstr "Politiques"
 #, python-format
 msgid "Policy \"<b>%s</b>\" has generated <b>%d Credit Control Lines.</b><br/>"
 msgstr ""
-"La politique de relance \"<b>%s</b>\" a généré <b>%d lignes de "
-"relance</b>.<br/>"
+"La politique de relance \"<b>%s</b>\" a généré <b>%d lignes de relance</b>."
+"<br/>"
 
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:119
 #, python-format
 msgid "Policy \"<b>%s</b>\" has not generated any Credit Control Lines.<br/>"
 msgstr ""
-"La politique de relance \"<b>%s</b>\" n'a pas généré de lignes de "
-"relance.<br/>"
+"La politique de relance \"<b>%s</b>\" n'a pas généré de lignes de relance."
+"<br/>"
 
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_level_ids
@@ -1294,7 +1323,8 @@ msgid ""
 "Please choose one of the following policies:\n"
 " %s"
 msgstr ""
-"Vous ne pouvez utiliser qu'une politique associée au compte %s.Vous pouvez choisir une des politique suivantes:\n"
+"Vous ne pouvez utiliser qu'une politique associée au compte %s.Vous pouvez "
+"choisir une des politique suivantes:\n"
 " %s"
 
 #. module: account_credit_control
diff --git a/account_credit_control/i18n/fr_CA.po b/account_credit_control/i18n/fr_CA.po
index 8c2afaa78..495fa60f0 100644
--- a/account_credit_control/i18n/fr_CA.po
+++ b/account_credit_control/i18n/fr_CA.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,25 +11,31 @@ msgstr ""
 "POT-Creation-Date: 2017-12-22 03:41+0000\n"
 "PO-Revision-Date: 2017-12-22 03:41+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: French (Canada) (https://www.transifex.com/oca/teams/23907/fr_CA/)\n"
+"Language-Team: French (Canada) (https://www.transifex.com/oca/teams/23907/"
+"fr_CA/)\n"
+"Language: fr_CA\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: fr_CA\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Afficher le nom"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/fr_CH.po b/account_credit_control/i18n/fr_CH.po
index 01d71bb47..619aeaa5a 100644
--- a/account_credit_control/i18n/fr_CH.po
+++ b/account_credit_control/i18n/fr_CH.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,25 +11,31 @@ msgstr ""
 "POT-Creation-Date: 2017-12-22 03:41+0000\n"
 "PO-Revision-Date: 2017-12-22 03:41+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: French (Switzerland) (https://www.transifex.com/oca/teams/23907/fr_CH/)\n"
+"Language-Team: French (Switzerland) (https://www.transifex.com/oca/"
+"teams/23907/fr_CH/)\n"
+"Language: fr_CH\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: fr_CH\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Nom affiché"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/fr_FR.po b/account_credit_control/i18n/fr_FR.po
index 71cb59ab1..8ac96fb5c 100644
--- a/account_credit_control/i18n/fr_FR.po
+++ b/account_credit_control/i18n/fr_FR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,25 +11,31 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:23+0000\n"
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: French (France) (https://www.transifex.com/oca/teams/23907/fr_FR/)\n"
+"Language-Team: French (France) (https://www.transifex.com/oca/teams/23907/"
+"fr_FR/)\n"
+"Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: fr_FR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/gl.po b/account_credit_control/i18n/gl.po
index 89fd39097..85f751a70 100644
--- a/account_credit_control/i18n/gl.po
+++ b/account_credit_control/i18n/gl.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,29 @@ msgstr ""
 "PO-Revision-Date: 2017-12-22 03:41+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Galician (https://www.transifex.com/oca/teams/23907/gl/)\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +383,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +428,11 @@ msgstr ""
 msgid "Display Name"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +520,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +711,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +733,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +805,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +856,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +883,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +897,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +910,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +925,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +938,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +959,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +977,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1014,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1215,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1231,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1277,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/gl_ES.po b/account_credit_control/i18n/gl_ES.po
index 598ef689f..b868d1106 100644
--- a/account_credit_control/i18n/gl_ES.po
+++ b/account_credit_control/i18n/gl_ES.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,25 +11,31 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:23+0000\n"
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Galician (Spain) (https://www.transifex.com/oca/teams/23907/gl_ES/)\n"
+"Language-Team: Galician (Spain) (https://www.transifex.com/oca/teams/23907/"
+"gl_ES/)\n"
+"Language: gl_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: gl_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/gu.po b/account_credit_control/i18n/gu.po
index 9f21fbb77..14965708a 100644
--- a/account_credit_control/i18n/gu.po
+++ b/account_credit_control/i18n/gu.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,29 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Gujarati (https://www.transifex.com/oca/teams/23907/gu/)\n"
+"Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: gu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +383,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +428,11 @@ msgstr ""
 msgid "Display Name"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +520,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +711,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +733,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +805,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +856,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +883,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +897,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +910,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +925,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +938,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +959,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +977,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1014,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1215,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1231,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1277,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/he.po b/account_credit_control/i18n/he.po
index 72c54457d..2f0cbf27a 100644
--- a/account_credit_control/i18n/he.po
+++ b/account_credit_control/i18n/he.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,29 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Hebrew (https://www.transifex.com/oca/teams/23907/he/)\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +383,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +428,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "השם המוצג"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +520,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +711,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +733,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +805,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +856,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +883,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +897,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +910,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +925,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +938,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +959,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +977,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1014,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1215,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1231,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1277,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/hi.po b/account_credit_control/i18n/hi.po
index 936a93b6e..2517370f6 100644
--- a/account_credit_control/i18n/hi.po
+++ b/account_credit_control/i18n/hi.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,29 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Hindi (https://www.transifex.com/oca/teams/23907/hi/)\n"
+"Language: hi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +383,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +428,11 @@ msgstr ""
 msgid "Display Name"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +520,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +711,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +733,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +805,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +856,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +883,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +897,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +910,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +925,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +938,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +959,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +977,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1014,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1215,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1231,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1277,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/hr.po b/account_credit_control/i18n/hr.po
index b90ac18ed..754644385 100644
--- a/account_credit_control/i18n/hr.po
+++ b/account_credit_control/i18n/hr.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 # Bole <bole@dajmi5.com>, 2017
@@ -13,24 +13,30 @@ msgstr ""
 "PO-Revision-Date: 2018-02-23 01:41+0000\n"
 "Last-Translator: Bole <bole@dajmi5.com>, 2017\n"
 "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n"
+"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: hr\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -865,10 +871,13 @@ msgstr ""
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -877,9 +886,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -889,8 +900,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -900,10 +913,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -912,8 +928,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -923,11 +941,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -941,9 +962,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -956,15 +980,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
diff --git a/account_credit_control/i18n/hr_HR.po b/account_credit_control/i18n/hr_HR.po
index d4e46f215..f41b87dd1 100644
--- a/account_credit_control/i18n/hr_HR.po
+++ b/account_credit_control/i18n/hr_HR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 # Bole <bole@dajmi5.com>, 2017
@@ -12,25 +12,32 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:23+0000\n"
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: Bole <bole@dajmi5.com>, 2017\n"
-"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/hr_HR/)\n"
+"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/"
+"hr_HR/)\n"
+"Language: hr_HR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: hr_HR\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -379,6 +386,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -413,6 +431,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Naziv"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -500,6 +523,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -680,6 +714,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -690,6 +736,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -757,6 +808,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -796,14 +859,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -812,9 +886,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -824,8 +900,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -835,10 +913,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -847,8 +928,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -858,11 +941,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -876,9 +962,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -891,15 +980,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -923,6 +1017,12 @@ msgstr ""
 msgid "Partner"
 msgstr "Partner"
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1118,6 +1218,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1129,6 +1234,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1163,7 +1280,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/hu.po b/account_credit_control/i18n/hu.po
index 3c2a1c87b..e65e10703 100644
--- a/account_credit_control/i18n/hu.po
+++ b/account_credit_control/i18n/hu.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,29 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Hungarian (https://www.transifex.com/oca/teams/23907/hu/)\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +383,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +428,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Név megjelenítése"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +520,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +711,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +733,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +805,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +856,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +883,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +897,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +910,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +925,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +938,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +959,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +977,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1014,12 @@ msgstr ""
 msgid "Partner"
 msgstr "Partner"
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1215,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1231,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1277,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/id.po b/account_credit_control/i18n/id.po
index 3c78d9576..1c445ee8d 100644
--- a/account_credit_control/i18n/id.po
+++ b/account_credit_control/i18n/id.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,29 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Indonesian (https://www.transifex.com/oca/teams/23907/id/)\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +383,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +428,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Nama Tampilan"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +520,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +711,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +733,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +805,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +856,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +883,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +897,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +910,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +925,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +938,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +959,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +977,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1014,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1215,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1231,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1277,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/it.po b/account_credit_control/i18n/it.po
index 690f1a7ad..8e7b7c43f 100644
--- a/account_credit_control/i18n/it.po
+++ b/account_credit_control/i18n/it.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,29 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -863,10 +868,13 @@ msgstr ""
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -875,9 +883,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -887,8 +897,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -898,10 +910,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -910,8 +925,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -921,11 +938,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -939,9 +959,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -954,15 +977,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -1249,7 +1277,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:216
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/ja.po b/account_credit_control/i18n/ja.po
index 85959bb28..54aaef916 100644
--- a/account_credit_control/i18n/ja.po
+++ b/account_credit_control/i18n/ja.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,29 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Japanese (https://www.transifex.com/oca/teams/23907/ja/)\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +383,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +428,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "表示名"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +520,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +711,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +733,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +805,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +856,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +883,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +897,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +910,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +925,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +938,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +959,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +977,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1014,12 @@ msgstr ""
 msgid "Partner"
 msgstr "パートナ"
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1215,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1231,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1277,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/ko.po b/account_credit_control/i18n/ko.po
index aad312fde..eff0761cc 100644
--- a/account_credit_control/i18n/ko.po
+++ b/account_credit_control/i18n/ko.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,29 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Korean (https://www.transifex.com/oca/teams/23907/ko/)\n"
+"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +383,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +428,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "표시 이름"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +520,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +711,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +733,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +805,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +856,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +883,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +897,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +910,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +925,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +938,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +959,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +977,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1014,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1215,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1231,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1277,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/lo.po b/account_credit_control/i18n/lo.po
index 3be758a2a..f321b380f 100644
--- a/account_credit_control/i18n/lo.po
+++ b/account_credit_control/i18n/lo.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,29 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Lao (https://www.transifex.com/oca/teams/23907/lo/)\n"
+"Language: lo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: lo\n"
 "Plural-Forms: nplurals=1; plural=0;\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +383,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +428,11 @@ msgstr ""
 msgid "Display Name"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +520,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +711,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +733,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +805,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +856,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +883,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +897,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +910,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +925,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +938,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +959,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +977,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1014,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1215,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1231,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1277,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/lt.po b/account_credit_control/i18n/lt.po
index 7ad5de420..c7b7b4eaa 100644
--- a/account_credit_control/i18n/lt.po
+++ b/account_credit_control/i18n/lt.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 # Viktoras Norkus <viktoras@bmx.lt>, 2018
@@ -13,24 +13,30 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: Viktoras Norkus <viktoras@bmx.lt>, 2018\n"
 "Language-Team: Lithuanian (https://www.transifex.com/oca/teams/23907/lt/)\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: lt\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -864,10 +870,13 @@ msgstr ""
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -876,9 +885,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -888,8 +899,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -899,10 +912,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -911,8 +927,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -922,11 +940,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -940,9 +961,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -955,15 +979,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -1250,7 +1279,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:216
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/lt_LT.po b/account_credit_control/i18n/lt_LT.po
index 35cea7d13..4e64cc40f 100644
--- a/account_credit_control/i18n/lt_LT.po
+++ b/account_credit_control/i18n/lt_LT.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,25 +11,32 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:23+0000\n"
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Lithuanian (Lithuania) (https://www.transifex.com/oca/teams/23907/lt_LT/)\n"
+"Language-Team: Lithuanian (Lithuania) (https://www.transifex.com/oca/"
+"teams/23907/lt_LT/)\n"
+"Language: lt_LT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: lt_LT\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +385,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +430,11 @@ msgstr ""
 msgid "Display Name"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +522,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +713,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +735,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +807,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +858,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +885,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +899,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +912,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +927,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +940,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +961,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +979,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1016,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1217,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1233,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1279,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/lv.po b/account_credit_control/i18n/lv.po
index 78572bd60..165bd9238 100644
--- a/account_credit_control/i18n/lv.po
+++ b/account_credit_control/i18n/lv.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,30 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/oca/teams/23907/lv/)\n"
+"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: lv\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+"2);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/mk.po b/account_credit_control/i18n/mk.po
index aa16bc310..d29e7e3fe 100644
--- a/account_credit_control/i18n/mk.po
+++ b/account_credit_control/i18n/mk.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,29 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Macedonian (https://www.transifex.com/oca/teams/23907/mk/)\n"
+"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +383,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +428,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Прикажи име"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +520,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +711,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +733,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +805,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +856,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +883,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +897,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +910,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +925,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +938,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +959,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +977,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1014,12 @@ msgstr ""
 msgid "Partner"
 msgstr "Партнер"
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1215,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1231,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1277,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/mn.po b/account_credit_control/i18n/mn.po
index 299140ac6..e000cd872 100644
--- a/account_credit_control/i18n/mn.po
+++ b/account_credit_control/i18n/mn.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,29 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Mongolian (https://www.transifex.com/oca/teams/23907/mn/)\n"
+"Language: mn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: mn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +383,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +428,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Дэлгэцийн Нэр"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +520,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +711,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +733,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +805,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +856,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +883,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +897,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +910,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +925,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +938,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +959,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +977,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1014,12 @@ msgstr ""
 msgid "Partner"
 msgstr "Харилцагч"
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1215,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1231,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1277,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/nb.po b/account_credit_control/i18n/nb.po
index e485034e0..dd9a39031 100644
--- a/account_credit_control/i18n/nb.po
+++ b/account_credit_control/i18n/nb.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,25 +11,31 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:23+0000\n"
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Norwegian Bokmål (https://www.transifex.com/oca/teams/23907/nb/)\n"
+"Language-Team: Norwegian Bokmål (https://www.transifex.com/oca/teams/23907/"
+"nb/)\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Visnings navn"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr "Partner"
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/nb_NO.po b/account_credit_control/i18n/nb_NO.po
index f3eefd47a..d15c5b5d9 100644
--- a/account_credit_control/i18n/nb_NO.po
+++ b/account_credit_control/i18n/nb_NO.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,25 +11,31 @@ msgstr ""
 "POT-Creation-Date: 2017-12-22 03:41+0000\n"
 "PO-Revision-Date: 2017-12-22 03:41+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Norwegian Bokmål (Norway) (https://www.transifex.com/oca/teams/23907/nb_NO/)\n"
+"Language-Team: Norwegian Bokmål (Norway) (https://www.transifex.com/oca/"
+"teams/23907/nb_NO/)\n"
+"Language: nb_NO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Vis navn"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/nl.po b/account_credit_control/i18n/nl.po
index ed576dbf3..8f3baddec 100644
--- a/account_credit_control/i18n/nl.po
+++ b/account_credit_control/i18n/nl.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 # Frank Schellenberg <opensource@schellenberg.nl>, 2017
@@ -13,32 +13,40 @@ msgstr ""
 "PO-Revision-Date: 2018-02-23 01:41+0000\n"
 "Last-Translator: Frank Schellenberg <opensource@schellenberg.nl>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/oca/teams/23907/nl/)\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
 msgstr ""
 "\n"
-"Volgens onze administratie hebben we geen betalingen ontvangen van onderstaande facturen ondanks twee eerder gestuurde aanmaningen.\n"
-"Het kan zijn dat deze brief en betaling elkaar kruisen, deze brief kunt u dan negeren. Zo niet, dan ontvangen we graag uw betaling.\n"
-"Als we de betaling niet binnen 5 dagen ontvangen, dan wordt het dossier overgedragen aan onze incassobureau.\n"
+"Volgens onze administratie hebben we geen betalingen ontvangen van "
+"onderstaande facturen ondanks twee eerder gestuurde aanmaningen.\n"
+"Het kan zijn dat deze brief en betaling elkaar kruisen, deze brief kunt u "
+"dan negeren. Zo niet, dan ontvangen we graag uw betaling.\n"
+"Als we de betaling niet binnen 5 dagen ontvangen, dan wordt het dossier "
+"overgedragen aan onze incassobureau.\n"
 "\n"
 "Als een betalingsregeling gewenst is, neem dan contact met ons op.\n"
 " Een openstaande posten lijst is voor het gemak bijgesloten.\n"
@@ -484,7 +492,8 @@ msgid ""
 msgstr ""
 "Concept regels moet worden beoordeeld.\n"
 "Genegeerde regels zijn regels welke we geen herinnering willen sturen.\n"
-"Concept en genegeerde regels zullen in de volgende berekening weer worden meegenomen."
+"Concept en genegeerde regels zullen in de volgende berekening weer worden "
+"meegenomen."
 
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_amount_due
@@ -557,8 +566,7 @@ msgstr "Opvolgingsverantwoordelijke"
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
-msgstr ""
-"Beleid waarvoor geen regels moeten worden aangemaakt of overbodig zijn"
+msgstr "Beleid waarvoor geen regels moeten worden aangemaakt of overbodig zijn"
 
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_run_line_ids
@@ -896,16 +904,21 @@ msgstr ""
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
 msgstr ""
-"Volgens onze administratie hebben we geen betaling van de onderstaande factuur ontvangen. \n"
-"Negeer deze kennisgeving als deze al is verzonden. Als dit niet het geval is, graag binnen 10 dagen verzorgen.\n"
+"Volgens onze administratie hebben we geen betaling van de onderstaande "
+"factuur ontvangen. \n"
+"Negeer deze kennisgeving als deze al is verzonden. Als dit niet het geval "
+"is, graag binnen 10 dagen verzorgen.\n"
 "\n"
 "Bij voorbaat dank voor de spoedige betaling van deze factuur. \n"
 "\n"
@@ -914,17 +927,21 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
 "  Best regards"
 msgstr ""
-"Volgens onze administratie hebben we geen betaling van de bijgesloten facturen ontvangen.<br>\n"
+"Volgens onze administratie hebben we geen betaling van de bijgesloten "
+"facturen ontvangen.<br>\n"
 "<br>\n"
-"Als deze al is verzonden, negeer deze melding dan. Zo niet, ga dan door met betaling binnen 10 dagen.<br>\n"
+"Als deze al is verzonden, negeer deze melding dan. Zo niet, ga dan door met "
+"betaling binnen 10 dagen.<br>\n"
 "<br>\n"
 "Bij voorbaat dank voor de spoedige betaling van deze facturen.<br>\n"
 "<br>\n"
@@ -933,15 +950,19 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
 "  Best regards"
 msgstr ""
-"Volgens onze administratie hebben we geen betaling van de bijgesloten facturen ontvangen.<br>\n"
-"Negeer deze kennisgeving als deze al is verzonden. Als dit niet het geval is, ga dan door met betaling binnen 10 dagen.<br>\n"
+"Volgens onze administratie hebben we geen betaling van de bijgesloten "
+"facturen ontvangen.<br>\n"
+"Negeer deze kennisgeving als deze al is verzonden. Als dit niet het geval "
+"is, ga dan door met betaling binnen 10 dagen.<br>\n"
 "<br>\n"
 "Bij voorbaat dank voor de spoedige betaling van de openstaande facturen<br>\n"
 "Met vriendelijke groeten,"
@@ -949,16 +970,21 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
 msgstr ""
-"Volgens onze administratie hebben we geen betaling van de onderstaande factuur ontvangen, ondanks onze eerste aanmaning.\n"
-"Als deze al is verzonden, negeer deze melding dan. Zo niet, ga dan door met betaling binnen 5 dagen.\n"
+"Volgens onze administratie hebben we geen betaling van de onderstaande "
+"factuur ontvangen, ondanks onze eerste aanmaning.\n"
+"Als deze al is verzonden, negeer deze melding dan. Zo niet, ga dan door met "
+"betaling binnen 5 dagen.\n"
 "\n"
 "Bij voorbaat dank voor de spoedige betaling van deze factuur.\n"
 "\n"
@@ -967,15 +993,19 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
 "  Best regards"
 msgstr ""
-"Volgens onze administratie hebben we geen betaling van de bijgesloten facturen ontvangen, ondanks onze eerste aanmaning.<br>\n"
-"Negeer deze kennisgeving als deze al is verzonden. Als dit niet het geval is, ga dan door met betaling binnen 5 dagen.<br>\n"
+"Volgens onze administratie hebben we geen betaling van de bijgesloten "
+"facturen ontvangen, ondanks onze eerste aanmaning.<br>\n"
+"Negeer deze kennisgeving als deze al is verzonden. Als dit niet het geval "
+"is, ga dan door met betaling binnen 5 dagen.<br>\n"
 "<br>\n"
 "Bij voorbaat dank voor de spoedige betaling van deze facturen.<br>\n"
 "<br>\n"
@@ -984,11 +1014,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -998,11 +1031,14 @@ msgid ""
 "  <br>\n"
 "  Best regards"
 msgstr ""
-"Volgens onze administratie hebben we geen betaling van de bijgesloten facturen ontvangen, ondanks onze eerste aanmaning.\n"
+"Volgens onze administratie hebben we geen betaling van de bijgesloten "
+"facturen ontvangen, ondanks onze eerste aanmaning.\n"
 "<br>\n"
 "<br>\n"
-"Als de betaling al is verzonden, negeert u deze kennisgeving. Als dit niet het geval is, gaat u verder met betaling.<br>\n"
-"Als uw betaling de komende 5 dagen niet is ontvangen, worden deze facturen uit handen gegeven aan ons <br>incassobureau.<br>\n"
+"Als de betaling al is verzonden, negeert u deze kennisgeving. Als dit niet "
+"het geval is, gaat u verder met betaling.<br>\n"
+"Als uw betaling de komende 5 dagen niet is ontvangen, worden deze facturen "
+"uit handen gegeven aan ons <br>incassobureau.<br>\n"
 "<br>\n"
 "   Als een betalingsregeling gewenst is, neem dan contact met ons op.<br>\n"
 "  Een openstaande posten lijst is voor het gemak bijgesloten.<br>\n"
@@ -1014,9 +1050,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -1025,9 +1064,12 @@ msgid ""
 "  <br>\n"
 "  Best regards"
 msgstr ""
-"Volgens onze administratie hebben we geen betaling van de bijgesloten facturen ontvangen, ondanks onze twee aanmaningen.<br>\n"
-"Als de betaling al is verzonden, negeer dan deze kennisgeving. Als dit niet het geval is, ga dan over tot betaling<br>\n"
-"Als de betaling de komende 5 dagen niet is ontvangen, worden deze facturen uit handen gegeven aan ons incassobureau.<br>\n"
+"Volgens onze administratie hebben we geen betaling van de bijgesloten "
+"facturen ontvangen, ondanks onze twee aanmaningen.<br>\n"
+"Als de betaling al is verzonden, negeer dan deze kennisgeving. Als dit niet "
+"het geval is, ga dan over tot betaling<br>\n"
+"Als de betaling de komende 5 dagen niet is ontvangen, worden deze facturen "
+"uit handen gegeven aan ons incassobureau.<br>\n"
 "<br>\n"
 " Als een betalingsregeling gewenst is, neem dan contact met ons op.<br>\n"
 " Een openstaande posten lijst is voor het gemak bijgesloten.<br>\n"
@@ -1039,25 +1081,34 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
 msgstr ""
-"Volgens onze administratie hebben we geen betaling van de onderstaande factuur ontvangen, ondanks een eerdere aanmaning.\n"
+"Volgens onze administratie hebben we geen betaling van de onderstaande "
+"factuur ontvangen, ondanks een eerdere aanmaning.\n"
 "\n"
-"             Als de betaling al is verzonden, negeer deze kennisgeving dan. Als dit niet het geval is, ga dan over tot betaling.\n"
-"             Als de betaling de volgende 5 dagen niet is ontvangen, word deze factuur uit handen gegeven aan ons incassobureau.\n"
+"             Als de betaling al is verzonden, negeer deze kennisgeving dan. "
+"Als dit niet het geval is, ga dan over tot betaling.\n"
+"             Als de betaling de volgende 5 dagen niet is ontvangen, word "
+"deze factuur uit handen gegeven aan ons incassobureau.\n"
 "\n"
-"             Als een betalingsregeling gewenst is, neem dan contact met ons op.\n"
+"             Als een betalingsregeling gewenst is, neem dan contact met ons "
+"op.\n"
 " Een openstaande posten lijst is voor het gemak bijgesloten.\n"
 " \n"
 " Bij voorbaat dank voor de verwachte samenwerking in deze.\n"
@@ -1116,7 +1167,8 @@ msgstr "Beleid \"<b>%s</b>\" heeft <b>%d aanmaningsregels berekend.</b><br/>"
 #: code:addons/account_credit_control/models/credit_control_run.py:119
 #, python-format
 msgid "Policy \"<b>%s</b>\" has not generated any Credit Control Lines.<br/>"
-msgstr "Aanmaningsbeleid \"<b>%s</b>\" heeft geen aanmaningsregels berekend.<br/>"
+msgstr ""
+"Aanmaningsbeleid \"<b>%s</b>\" heeft geen aanmaningsregels berekend.<br/>"
 
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_level_ids
diff --git a/account_credit_control/i18n/nl_BE.po b/account_credit_control/i18n/nl_BE.po
index c26f51d28..34f493afb 100644
--- a/account_credit_control/i18n/nl_BE.po
+++ b/account_credit_control/i18n/nl_BE.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,25 +11,31 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:23+0000\n"
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Dutch (Belgium) (https://www.transifex.com/oca/teams/23907/nl_BE/)\n"
+"Language-Team: Dutch (Belgium) (https://www.transifex.com/oca/teams/23907/"
+"nl_BE/)\n"
+"Language: nl_BE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: nl_BE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Schermnaam"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr "Relatie"
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/nl_NL.po b/account_credit_control/i18n/nl_NL.po
index c78858fdf..a8b34f22e 100644
--- a/account_credit_control/i18n/nl_NL.po
+++ b/account_credit_control/i18n/nl_NL.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # Frank Schellenberg <opensource@schellenberg.nl>, 2018
 msgid ""
@@ -11,33 +11,42 @@ msgstr ""
 "POT-Creation-Date: 2018-02-23 01:41+0000\n"
 "PO-Revision-Date: 2018-02-23 01:41+0000\n"
 "Last-Translator: Frank Schellenberg <opensource@schellenberg.nl>, 2018\n"
-"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n"
+"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/"
+"teams/23907/nl_NL/)\n"
+"Language: nl_NL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: nl_NL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
 msgstr ""
 "\n"
-"Volgens onze administratie hebben we geen betalingen ontvangen van onderstaande facturen ondanks twee eerder gestuurde aanmaningen.\n"
-"Het kan zijn dat deze brief en betaling elkaar kruisen, deze brief kunt u dan negeren. Zo niet, dan ontvangen we graag uw betaling.\n"
-"Als we de betaling niet binnen 5 dagen ontvangen, dan wordt het dossier overgedragen aan onze incassobureau.\n"
+"Volgens onze administratie hebben we geen betalingen ontvangen van "
+"onderstaande facturen ondanks twee eerder gestuurde aanmaningen.\n"
+"Het kan zijn dat deze brief en betaling elkaar kruisen, deze brief kunt u "
+"dan negeren. Zo niet, dan ontvangen we graag uw betaling.\n"
+"Als we de betaling niet binnen 5 dagen ontvangen, dan wordt het dossier "
+"overgedragen aan onze incassobureau.\n"
 "\n"
 "Als een betalingsregeling gewenst is, neem dan contact met ons op.\n"
 " Een openstaande posten lijst is voor het gemak bijgesloten.\n"
@@ -483,7 +492,8 @@ msgid ""
 msgstr ""
 "Concept regels moet worden beoordeeld.\n"
 "Genegeerde regels zijn regels welke we geen herinnering willen sturen.\n"
-"Concept en genegeerde regels zullen in de volgende berekening weer worden meegenomen."
+"Concept en genegeerde regels zullen in de volgende berekening weer worden "
+"meegenomen."
 
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_amount_due
@@ -556,8 +566,7 @@ msgstr "Opvolgingsverantwoordelijke"
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
-msgstr ""
-"Beleid waarvoor geen regels moeten worden aangemaakt of overbodig zijn"
+msgstr "Beleid waarvoor geen regels moeten worden aangemaakt of overbodig zijn"
 
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_run_line_ids
@@ -895,16 +904,21 @@ msgstr ""
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
 msgstr ""
-"Volgens onze administratie hebben we geen betaling van de onderstaande factuur ontvangen. \n"
-"Negeer deze kennisgeving als deze al is verzonden. Als dit niet het geval is, graag binnen 10 dagen verzorgen.\n"
+"Volgens onze administratie hebben we geen betaling van de onderstaande "
+"factuur ontvangen. \n"
+"Negeer deze kennisgeving als deze al is verzonden. Als dit niet het geval "
+"is, graag binnen 10 dagen verzorgen.\n"
 "\n"
 "Bij voorbaat dank voor de spoedige betaling van deze factuur. \n"
 "\n"
@@ -913,17 +927,21 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
 "  Best regards"
 msgstr ""
-"Volgens onze administratie hebben we geen betaling van de bijgesloten facturen ontvangen.<br>\n"
+"Volgens onze administratie hebben we geen betaling van de bijgesloten "
+"facturen ontvangen.<br>\n"
 "<br>\n"
-"Als deze al is verzonden, negeer deze melding dan. Zo niet, ga dan door met betaling binnen 10 dagen.<br>\n"
+"Als deze al is verzonden, negeer deze melding dan. Zo niet, ga dan door met "
+"betaling binnen 10 dagen.<br>\n"
 "<br>\n"
 "Bij voorbaat dank voor de spoedige betaling van deze facturen.<br>\n"
 "<br>\n"
@@ -932,15 +950,19 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
 "  Best regards"
 msgstr ""
-"Volgens onze administratie hebben we geen betaling van de bijgesloten facturen ontvangen.<br>\n"
-"Negeer deze kennisgeving als deze al is verzonden. Als dit niet het geval is, ga dan door met betaling binnen 10 dagen.<br>\n"
+"Volgens onze administratie hebben we geen betaling van de bijgesloten "
+"facturen ontvangen.<br>\n"
+"Negeer deze kennisgeving als deze al is verzonden. Als dit niet het geval "
+"is, ga dan door met betaling binnen 10 dagen.<br>\n"
 "<br>\n"
 "Bij voorbaat dank voor de spoedige betaling van de openstaande facturen<br>\n"
 "Met vriendelijke groeten,"
@@ -948,16 +970,21 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
 msgstr ""
-"Volgens onze administratie hebben we geen betaling van de onderstaande factuur ontvangen, ondanks onze eerste aanmaning.\n"
-"Als deze al is verzonden, negeer deze melding dan. Zo niet, ga dan door met betaling binnen 5 dagen.\n"
+"Volgens onze administratie hebben we geen betaling van de onderstaande "
+"factuur ontvangen, ondanks onze eerste aanmaning.\n"
+"Als deze al is verzonden, negeer deze melding dan. Zo niet, ga dan door met "
+"betaling binnen 5 dagen.\n"
 "\n"
 "Bij voorbaat dank voor de spoedige betaling van deze factuur.\n"
 "\n"
@@ -966,15 +993,19 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
 "  Best regards"
 msgstr ""
-"Volgens onze administratie hebben we geen betaling van de bijgesloten facturen ontvangen, ondanks onze eerste aanmaning.<br>\n"
-"Negeer deze kennisgeving als deze al is verzonden. Als dit niet het geval is, ga dan door met betaling binnen 5 dagen.<br>\n"
+"Volgens onze administratie hebben we geen betaling van de bijgesloten "
+"facturen ontvangen, ondanks onze eerste aanmaning.<br>\n"
+"Negeer deze kennisgeving als deze al is verzonden. Als dit niet het geval "
+"is, ga dan door met betaling binnen 5 dagen.<br>\n"
 "<br>\n"
 "Bij voorbaat dank voor de spoedige betaling van deze facturen.<br>\n"
 "<br>\n"
@@ -983,11 +1014,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -997,11 +1031,14 @@ msgid ""
 "  <br>\n"
 "  Best regards"
 msgstr ""
-"Volgens onze administratie hebben we geen betaling van de bijgesloten facturen ontvangen, ondanks onze eerste aanmaning.\n"
+"Volgens onze administratie hebben we geen betaling van de bijgesloten "
+"facturen ontvangen, ondanks onze eerste aanmaning.\n"
 "<br>\n"
 "<br>\n"
-"Als de betaling al is verzonden, negeert u deze kennisgeving. Als dit niet het geval is, gaat u verder met betaling.<br>\n"
-"Als uw betaling de komende 5 dagen niet is ontvangen, worden deze facturen uit handen gegeven aan ons <br>incassobureau.<br>\n"
+"Als de betaling al is verzonden, negeert u deze kennisgeving. Als dit niet "
+"het geval is, gaat u verder met betaling.<br>\n"
+"Als uw betaling de komende 5 dagen niet is ontvangen, worden deze facturen "
+"uit handen gegeven aan ons <br>incassobureau.<br>\n"
 "<br>\n"
 "   Als een betalingsregeling gewenst is, neem dan contact met ons op.<br>\n"
 "  Een openstaande posten lijst is voor het gemak bijgesloten.<br>\n"
@@ -1013,9 +1050,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -1024,9 +1064,12 @@ msgid ""
 "  <br>\n"
 "  Best regards"
 msgstr ""
-"Volgens onze administratie hebben we geen betaling van de bijgesloten facturen ontvangen, ondanks onze twee aanmaningen.<br>\n"
-"Als de betaling al is verzonden, negeer dan deze kennisgeving. Als dit niet het geval is, ga dan over tot betaling<br>\n"
-"Als de betaling de komende 5 dagen niet is ontvangen, worden deze facturen uit handen gegeven aan ons incassobureau.<br>\n"
+"Volgens onze administratie hebben we geen betaling van de bijgesloten "
+"facturen ontvangen, ondanks onze twee aanmaningen.<br>\n"
+"Als de betaling al is verzonden, negeer dan deze kennisgeving. Als dit niet "
+"het geval is, ga dan over tot betaling<br>\n"
+"Als de betaling de komende 5 dagen niet is ontvangen, worden deze facturen "
+"uit handen gegeven aan ons incassobureau.<br>\n"
 "<br>\n"
 " Als een betalingsregeling gewenst is, neem dan contact met ons op.<br>\n"
 " Een openstaande posten lijst is voor het gemak bijgesloten.<br>\n"
@@ -1038,25 +1081,34 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
 msgstr ""
-"Volgens onze administratie hebben we geen betaling van de onderstaande factuur ontvangen, ondanks een eerdere aanmaning.\n"
+"Volgens onze administratie hebben we geen betaling van de onderstaande "
+"factuur ontvangen, ondanks een eerdere aanmaning.\n"
 "\n"
-"             Als de betaling al is verzonden, negeer deze kennisgeving dan. Als dit niet het geval is, ga dan over tot betaling.\n"
-"             Als de betaling de volgende 5 dagen niet is ontvangen, word deze factuur uit handen gegeven aan ons incassobureau.\n"
+"             Als de betaling al is verzonden, negeer deze kennisgeving dan. "
+"Als dit niet het geval is, ga dan over tot betaling.\n"
+"             Als de betaling de volgende 5 dagen niet is ontvangen, word "
+"deze factuur uit handen gegeven aan ons incassobureau.\n"
 "\n"
-"             Als een betalingsregeling gewenst is, neem dan contact met ons op.\n"
+"             Als een betalingsregeling gewenst is, neem dan contact met ons "
+"op.\n"
 " Een openstaande posten lijst is voor het gemak bijgesloten.\n"
 " \n"
 " Bij voorbaat dank voor de verwachte samenwerking in deze.\n"
@@ -1115,7 +1167,8 @@ msgstr "Beleid \"<b>%s</b>\" heeft <b>%d aanmaningsregels berekend.</b><br/>"
 #: code:addons/account_credit_control/models/credit_control_run.py:119
 #, python-format
 msgid "Policy \"<b>%s</b>\" has not generated any Credit Control Lines.<br/>"
-msgstr "Aanmaningsbeleid \"<b>%s</b>\" heeft geen aanmaningsregels berekend.<br/>"
+msgstr ""
+"Aanmaningsbeleid \"<b>%s</b>\" heeft geen aanmaningsregels berekend.<br/>"
 
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_level_ids
diff --git a/account_credit_control/i18n/pl.po b/account_credit_control/i18n/pl.po
index a4939c893..688e026c1 100644
--- a/account_credit_control/i18n/pl.po
+++ b/account_credit_control/i18n/pl.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,31 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Polish (https://www.transifex.com/oca/teams/23907/pl/)\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n"
+"%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n"
+"%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +385,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +430,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Wyświetlana nazwa "
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +522,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +713,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +735,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +807,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +858,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +885,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +899,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +912,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +927,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +940,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +961,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +979,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1016,12 @@ msgstr ""
 msgid "Partner"
 msgstr "Partner"
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1217,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1233,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1279,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/pt.po b/account_credit_control/i18n/pt.po
index 6a04620ce..2d14dbd23 100644
--- a/account_credit_control/i18n/pt.po
+++ b/account_credit_control/i18n/pt.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 # Pedro Castro Silva <pedrocs@exo.pt>, 2017
@@ -13,24 +13,29 @@ msgstr ""
 "PO-Revision-Date: 2017-12-08 23:22+0000\n"
 "Last-Translator: Pedro Castro Silva <pedrocs@exo.pt>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/oca/teams/23907/pt/)\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -379,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -413,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Nome"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -500,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -680,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -690,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -757,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -796,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -812,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -824,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -835,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -847,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -858,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -876,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -891,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -923,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr "Parceiro"
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1118,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1129,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1163,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/pt_BR.po b/account_credit_control/i18n/pt_BR.po
index ee4519920..ad721348a 100644
--- a/account_credit_control/i18n/pt_BR.po
+++ b/account_credit_control/i18n/pt_BR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,25 +11,31 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:23+0000\n"
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/23907/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/"
+"teams/23907/pt_BR/)\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Nome para Mostrar"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr "Parceiro"
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/pt_PT.po b/account_credit_control/i18n/pt_PT.po
index 42cc2579c..e71f8ae29 100644
--- a/account_credit_control/i18n/pt_PT.po
+++ b/account_credit_control/i18n/pt_PT.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,25 +11,31 @@ msgstr ""
 "POT-Creation-Date: 2017-12-22 03:41+0000\n"
 "PO-Revision-Date: 2017-12-22 03:41+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/teams/23907/pt_PT/)\n"
+"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/"
+"teams/23907/pt_PT/)\n"
+"Language: pt_PT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Nome a exibir"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/ro.po b/account_credit_control/i18n/ro.po
index a1f9e57b3..fe39bf90a 100644
--- a/account_credit_control/i18n/ro.po
+++ b/account_credit_control/i18n/ro.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,30 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Romanian (https://www.transifex.com/oca/teams/23907/ro/)\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ro\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
+"2:1));\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Nume Afişat"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr "Partener"
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/ru.po b/account_credit_control/i18n/ru.po
index 75333b990..f0f3fb761 100644
--- a/account_credit_control/i18n/ru.po
+++ b/account_credit_control/i18n/ru.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,31 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Russian (https://www.transifex.com/oca/teams/23907/ru/)\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
+"%100>=11 && n%100<=14)? 2 : 3);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +385,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +430,11 @@ msgstr ""
 msgid "Display Name"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +522,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +713,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +735,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +807,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +858,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +885,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +899,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +912,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +927,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +940,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +961,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +979,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1016,12 @@ msgstr ""
 msgid "Partner"
 msgstr "Контрагент"
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1217,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1233,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1279,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/sk.po b/account_credit_control/i18n/sk.po
index 039c36ee1..796cf8606 100644
--- a/account_credit_control/i18n/sk.po
+++ b/account_credit_control/i18n/sk.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,29 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Slovak (https://www.transifex.com/oca/teams/23907/sk/)\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +383,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +428,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Zobraziť meno"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +520,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +711,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +733,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +805,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +856,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +883,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +897,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +910,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +925,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +938,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +959,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +977,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1014,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1215,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1231,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1277,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/sk_SK.po b/account_credit_control/i18n/sk_SK.po
index 60ce3f045..47cb7850e 100644
--- a/account_credit_control/i18n/sk_SK.po
+++ b/account_credit_control/i18n/sk_SK.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,25 +11,31 @@ msgstr ""
 "POT-Creation-Date: 2017-12-22 03:41+0000\n"
 "PO-Revision-Date: 2017-12-22 03:41+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Slovak (Slovakia) (https://www.transifex.com/oca/teams/23907/sk_SK/)\n"
+"Language-Team: Slovak (Slovakia) (https://www.transifex.com/oca/teams/23907/"
+"sk_SK/)\n"
+"Language: sk_SK\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/sl.po b/account_credit_control/i18n/sl.po
index b3c1fa690..90727c915 100644
--- a/account_credit_control/i18n/sl.po
+++ b/account_credit_control/i18n/sl.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,30 @@ msgstr ""
 "PO-Revision-Date: 2018-02-01 03:44+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: sl\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%100==4 ? 2 : 3);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -863,10 +869,13 @@ msgstr ""
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -875,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -887,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -898,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -910,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -921,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -939,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -954,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -1249,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:216
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/sr.po b/account_credit_control/i18n/sr.po
index d06575aa5..744105d73 100644
--- a/account_credit_control/i18n/sr.po
+++ b/account_credit_control/i18n/sr.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,30 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Serbian (https://www.transifex.com/oca/teams/23907/sr/)\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: sr\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/sr@latin.po b/account_credit_control/i18n/sr@latin.po
index 83d6ad1bd..ac0d00e29 100644
--- a/account_credit_control/i18n/sr@latin.po
+++ b/account_credit_control/i18n/sr@latin.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,25 +11,32 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:23+0000\n"
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Serbian (Latin) (https://www.transifex.com/oca/teams/23907/sr%40latin/)\n"
+"Language-Team: Serbian (Latin) (https://www.transifex.com/oca/teams/23907/sr"
+"%40latin/)\n"
+"Language: sr@latin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: sr@latin\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +385,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +430,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Ime za prikaz"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +522,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +713,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +735,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +807,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +858,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +885,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +899,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +912,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +927,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +940,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +961,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +979,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1016,12 @@ msgstr ""
 msgid "Partner"
 msgstr "Partner"
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1217,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1233,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1279,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/sv.po b/account_credit_control/i18n/sv.po
index 394795d9e..636281f76 100644
--- a/account_credit_control/i18n/sv.po
+++ b/account_credit_control/i18n/sv.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,29 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Swedish (https://www.transifex.com/oca/teams/23907/sv/)\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +383,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +428,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Visa namn"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +520,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +711,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +733,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +805,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +856,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +883,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +897,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +910,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +925,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +938,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +959,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +977,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1014,12 @@ msgstr ""
 msgid "Partner"
 msgstr "Företag"
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1215,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1231,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1277,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/th.po b/account_credit_control/i18n/th.po
index 2af6179f3..0f542dcfa 100644
--- a/account_credit_control/i18n/th.po
+++ b/account_credit_control/i18n/th.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,29 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Thai (https://www.transifex.com/oca/teams/23907/th/)\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: th\n"
 "Plural-Forms: nplurals=1; plural=0;\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +383,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +428,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "ชื่อที่ใช้แสดง"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +520,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +711,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +733,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +805,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +856,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +883,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +897,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +910,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +925,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +938,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +959,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +977,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1014,12 @@ msgstr ""
 msgid "Partner"
 msgstr "พาร์ทเนอร์"
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1215,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1231,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1277,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/tr.po b/account_credit_control/i18n/tr.po
index eda99a3b7..9e8c8fec2 100644
--- a/account_credit_control/i18n/tr.po
+++ b/account_credit_control/i18n/tr.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 # Ediz Duman <neps1192@gmail.com>, 2017
@@ -13,24 +13,29 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: Ediz Duman <neps1192@gmail.com>, 2017\n"
 "Language-Team: Turkish (https://www.transifex.com/oca/teams/23907/tr/)\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -379,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -413,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Görünen İsim"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -500,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -680,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -690,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -757,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -796,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -812,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -824,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -835,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -847,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -858,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -876,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -891,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -923,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr "Cari"
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1118,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1129,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1163,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/tr_TR.po b/account_credit_control/i18n/tr_TR.po
index b8dafeb93..174b64738 100644
--- a/account_credit_control/i18n/tr_TR.po
+++ b/account_credit_control/i18n/tr_TR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # Ediz Duman <neps1192@gmail.com>, 2017
 # OCA Transbot <transbot@odoo-community.org>, 2017
@@ -12,25 +12,31 @@ msgstr ""
 "POT-Creation-Date: 2017-12-22 03:41+0000\n"
 "PO-Revision-Date: 2017-12-22 03:41+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Turkish (Turkey) (https://www.transifex.com/oca/teams/23907/tr_TR/)\n"
+"Language-Team: Turkish (Turkey) (https://www.transifex.com/oca/teams/23907/"
+"tr_TR/)\n"
+"Language: tr_TR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: tr_TR\n"
 "Plural-Forms: nplurals=1; plural=0;\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -379,6 +385,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -413,6 +430,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Görünen ad"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -500,6 +522,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -680,6 +713,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -690,6 +735,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -757,6 +807,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -796,14 +858,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -812,9 +885,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -824,8 +899,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -835,10 +912,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -847,8 +927,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -858,11 +940,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -876,9 +961,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -891,15 +979,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -923,6 +1016,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1118,6 +1217,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1129,6 +1233,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1163,7 +1279,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/uk.po b/account_credit_control/i18n/uk.po
index 7002af99b..44fd0e0f2 100644
--- a/account_credit_control/i18n/uk.po
+++ b/account_credit_control/i18n/uk.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,30 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Ukrainian (https://www.transifex.com/oca/teams/23907/uk/)\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Назва для відображення"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/vi.po b/account_credit_control/i18n/vi.po
index 9a8bf796f..ddbc1bfeb 100644
--- a/account_credit_control/i18n/vi.po
+++ b/account_credit_control/i18n/vi.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,24 +12,29 @@ msgstr ""
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Vietnamese (https://www.transifex.com/oca/teams/23907/vi/)\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +383,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +428,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Tên hiển thị"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +520,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +711,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +733,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +805,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +856,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +883,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +897,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +910,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +925,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +938,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +959,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +977,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1014,12 @@ msgstr ""
 msgid "Partner"
 msgstr "Đối tác"
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1215,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1231,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1277,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/vi_VN.po b/account_credit_control/i18n/vi_VN.po
index b8c4232ab..c14d1a3f8 100644
--- a/account_credit_control/i18n/vi_VN.po
+++ b/account_credit_control/i18n/vi_VN.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,25 +11,31 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:23+0000\n"
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/oca/teams/23907/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/oca/"
+"teams/23907/vi_VN/)\n"
+"Language: vi_VN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/zh_CN.po b/account_credit_control/i18n/zh_CN.po
index 85b35b637..c5f28b66c 100644
--- a/account_credit_control/i18n/zh_CN.po
+++ b/account_credit_control/i18n/zh_CN.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,25 +11,31 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:23+0000\n"
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Chinese (China) (https://www.transifex.com/oca/teams/23907/zh_CN/)\n"
+"Language-Team: Chinese (China) (https://www.transifex.com/oca/teams/23907/"
+"zh_CN/)\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "Display Name"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr "业务伙伴"
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "
diff --git a/account_credit_control/i18n/zh_TW.po b/account_credit_control/i18n/zh_TW.po
index 2e8da676e..ab80dff9d 100644
--- a/account_credit_control/i18n/zh_TW.po
+++ b/account_credit_control/i18n/zh_TW.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_credit_control
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,25 +11,31 @@ msgstr ""
 "POT-Creation-Date: 2017-11-28 23:23+0000\n"
 "PO-Revision-Date: 2017-11-28 23:23+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Chinese (Taiwan) (https://www.transifex.com/oca/teams/23907/zh_TW/)\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/oca/teams/23907/"
+"zh_TW/)\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\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 invoice mentioned below 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"
+"            Our records indicate that we still have not received the payment "
+"of the invoice mentioned below 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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -378,6 +384,17 @@ msgstr ""
 msgid "Custom Message after details"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.customer_followup_tree
+msgid "Customer Followup"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_note
+msgid "Customer Payment Promise"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.report_credit_control_summary_document
 msgid "Date due"
@@ -412,6 +429,11 @@ msgstr ""
 msgid "Display Name"
 msgstr "顯示名稱"
 
+#. module: account_credit_control
+#: model:ir.ui.menu,name:account_credit_control.credit_control_manual_action_menu
+msgid "Do Manual Follow-Ups"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,field_description:account_credit_control.field_credit_control_policy_do_nothing
 msgid "Do nothing"
@@ -499,6 +521,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.partner_followup_form_view
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_responsible_id
+msgid "Follow-up Responsible"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_do_nothing
 msgid "For policies which should not generate lines or are obsolete"
@@ -679,6 +712,18 @@ msgstr ""
 msgid "Manual Credit Control Policy"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.actions.act_window,name:account_credit_control.action_customer_followup
+msgid "Manual Follow-Ups"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_credit_control_line_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_manual_followup
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_manual_followup
+msgid "Manual Followup"
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.ui.view,arch_db:account_credit_control.credit_control_run_form
 msgid "Manual Lines"
@@ -689,6 +734,11 @@ msgstr ""
 msgid "Manual change"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "Manual followup"
+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
@@ -756,6 +806,18 @@ msgstr ""
 msgid "New level to apply"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action
+msgid "Next Action"
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,field_description:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,field_description:account_credit_control.field_res_users_payment_next_action_date
+msgid "Next Action Date"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/wizard/credit_control_emailer.py:47
 #: code:addons/account_credit_control/wizard/credit_control_marker.py:59
@@ -795,14 +857,25 @@ msgstr ""
 msgid "Open amount"
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_responsible_id
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_responsible_id
+msgid ""
+"Optionally you can assign a user to this field, which will make him "
+"responsible for the action."
+msgstr ""
+
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
 #: 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 invoice mentioned below.\n"
-"            If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.\n"
+"Our records indicate that we have not received the payment of the invoice "
+"mentioned below.\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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -811,9 +884,11 @@ 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.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
 "  <br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -823,8 +898,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.<br>\n"
+"Our records indicate that we have not received the payment of the invoices "
+"mentioned in the attached document.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -834,10 +911,13 @@ 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 invoice mentioned below 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"
+"Our records indicate that we have not yet received the payment of the "
+"invoice mentioned below 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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -846,8 +926,10 @@ 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.<br>\n"
-"  If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.<br>\n"
+"Our records indicate that we have not yet received the payment of the "
+"invoices mentioned in the attached document despite our first reminder.<br>\n"
+"  If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 5 days.<br>\n"
 "  <br>\n"
 "  Thank you in advance for your anticipated cooperation in this matter.<br>\n"
 "  <br>\n"
@@ -857,11 +939,14 @@ 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"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our reminder.\n"
 "  <br>\n"
 "  <br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt<br>\n"
 "  collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
@@ -875,9 +960,12 @@ 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.<br>\n"
-"  If payment have already been sent, please disregard this notice. If not, please proceed with payment.<br>\n"
-"  If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.<br>\n"
+"Our records indicate that we still have not received the payment of the "
+"invoices mentioned in the attached document despite our two reminders.<br>\n"
+"  If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.<br>\n"
+"  If your payment has not been received in the next 5 days, your file will "
+"be transfered to our debt collection agency.<br>\n"
 "  <br>\n"
 "  Should you need us to arrange a payment plan for you, please advise.<br>\n"
 "  A customer account statement is enclosed for you convenience.<br>\n"
@@ -890,15 +978,20 @@ 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 mentioned below invoice despite our reminder.\n"
+"Our records indicate that we still have not received the payment of the "
+"mentioned below 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 collection agency.\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"
+"            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"
+"            Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
 "\n"
 "            Best regards\n"
 "        "
@@ -922,6 +1015,12 @@ msgstr ""
 msgid "Partner"
 msgstr "夥伴"
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_note
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_note
+msgid "Payment Note"
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_run.py:92
 #, python-format
@@ -1117,6 +1216,11 @@ msgstr ""
 msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.ui.view,arch_db:account_credit_control.credit_control_line_search
+msgid "The partner had a manual followup."
+msgstr ""
+
 #. module: account_credit_control
 #: code:addons/account_credit_control/models/credit_control_policy.py:246
 #, python-format
@@ -1128,6 +1232,18 @@ msgstr ""
 msgid "These lines are ready to send by email or by letter using the Actions."
 msgstr ""
 
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action
+msgid "This is the next action to be taken."
+msgstr ""
+
+#. module: account_credit_control
+#: model:ir.model.fields,help:account_credit_control.field_res_partner_payment_next_action_date
+#: model:ir.model.fields,help:account_credit_control.field_res_users_payment_next_action_date
+msgid "This is when the manual follow-up is needed."
+msgstr ""
+
 #. module: account_credit_control
 #: model:ir.model.fields,help:account_credit_control.field_credit_control_policy_account_ids
 msgid "This policy will be active only for the selected accounts"
@@ -1162,7 +1278,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr ""
 
 #. module: account_credit_control
-#: code:addons/account_credit_control/models/credit_control_line.py:214
+#: code:addons/account_credit_control/models/credit_control_line.py:217
 #, python-format
 msgid ""
 "You are not allowed to delete a credit control line that is not in draft "